diff options
| -rw-r--r-- | cmake/StaticBuild.cmake | 2 | ||||
| -rwxr-xr-x | contrib/packages/deb/ubuntu-precise/debian/rules | 1 | ||||
| -rwxr-xr-x | contrib/packages/deb/ubuntu-trusty/debian/rules | 1 | ||||
| -rw-r--r-- | contrib/packages/rpm/el6/SPECS/tigervnc.spec | 1 | ||||
| -rw-r--r-- | contrib/packages/rpm/sle11/SPECS/tigervnc.spec | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 4ef29056..5800a078 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -34,7 +34,7 @@ if(BUILD_STATIC) set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls -ltasn1") if(NETTLE_LIBRARY) - set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp") + set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp -lcrypt32") endif() if(GCRYPT_LIBRARY) set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lgcrypt -lgpg-error") diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules index b338f725..29f5632f 100755 --- a/contrib/packages/deb/ubuntu-precise/debian/rules +++ b/contrib/packages/deb/ubuntu-precise/debian/rules @@ -51,6 +51,7 @@ config-stamp: -DOPTION_BUILD_EXAMPLES=off \ -DOPTION_USE_SYSTEM_LIBPNG=on;make) cmake -G"Unix Makefiles" \ + -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=/usr \ -DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2 diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules index f9f731b1..515cf2fa 100755 --- a/contrib/packages/deb/ubuntu-trusty/debian/rules +++ b/contrib/packages/deb/ubuntu-trusty/debian/rules @@ -58,6 +58,7 @@ config-stamp: ./configure --enable-shared=no --enable-cairo --enable-cp936 \ --with-optim="$(CFLAGS) $(XCFLAGS)" --libdir=$(libdir);make) cmake -G"Unix Makefiles" \ + -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=/usr \ -DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2 diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec index 5df424de..11b39f62 100644 --- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec @@ -181,6 +181,7 @@ make %{?_smp_mflags} popd %{cmake28} -G"Unix Makefiles" \ + -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.2 diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec index 5258a9f7..ddf93101 100644 --- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec @@ -275,6 +275,7 @@ popd # Build all tigervnc cmake -G"Unix Makefiles" \ + -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DJPEG_INCLUDE_DIR=%{static_lib_buildroot}%{_includedir} \ |