diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-01-11 21:59:01 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-01-11 21:59:01 +0000 |
| commit | ffd4bb9140067d07e92786462399b7770e7c9028 (patch) | |
| tree | 32aad6a2fe209a7f677d509a43d4a2f31b81df65 /release | |
| parent | d28792b404a7e28e6c00dcec71b8e8b83c480ef3 (diff) | |
| download | tigervnc-ffd4bb9140067d07e92786462399b7770e7c9028.tar.gz tigervnc-ffd4bb9140067d07e92786462399b7770e7c9028.zip | |
Use static system libz.a so Xvnc doesn't depend on libz.so.1. As a result, we don't need to build the included zlib anymore.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3943 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'release')
| -rwxr-xr-x | release/build-compat-linux | 5 | ||||
| -rwxr-xr-x | release/build-compat-linux-m32 | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/release/build-compat-linux b/release/build-compat-linux index f343508f..6a7bcc5c 100755 --- a/release/build-compat-linux +++ b/release/build-compat-linux @@ -27,10 +27,15 @@ ln -fs `gcc $CFLAGS -print-file-name=libstdc++.a` ./xorg.build/lib if [ -f ./xorg.build/lib/libcrypto.a ]; then rm -f ./xorg.build/lib/libcrypto.a fi +if [ -f ./xorg.build/lib/libz.a ]; then + rm -f ./xorg.build/lib/libz.a +fi if [ "`uname -m`" = "x86_64" ]; then ln -fs /usr/lib64/libcrypto.a ./xorg.build/lib + ln -fs /usr/lib64/libz.a ./xorg.build/lib else ln -fs /usr/lib/libcrypto.a ./xorg.build/lib + ln -fs /usr/lib/libz.a ./xorg.build/lib fi . build-xorg-7.4 $1 -static popd diff --git a/release/build-compat-linux-m32 b/release/build-compat-linux-m32 index 0e43c858..f691c29c 100755 --- a/release/build-compat-linux-m32 +++ b/release/build-compat-linux-m32 @@ -29,6 +29,10 @@ ln -fs `gcc $CFLAGS -print-file-name=libstdc++.a` ./xorg.build/lib if [ -f ./xorg.build/lib/libcrypto.a ]; then rm -f ./xorg.build/lib/libcrypto.a fi +if [ -f ./xorg.build/lib/libz.a ]; then + rm -f ./xorg.build/lib/libz.a +fi ln -fs /usr/lib/libcrypto.a ./xorg.build/lib +ln -fs /usr/lib/libz.a ./xorg.build/lib . build-xorg-7.4 $1 -static --host i686-pc-linux-gnu popd |