From d71e6de243cdda3f4241a08cdc81f36012b775a6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 26 Oct 2008 00:38:12 +0200 Subject: [PATCH] zlib: also install the static lib. --HG-- extra : convert_revision : a3b5a20480ac8d515b085c2399a3ab1ff517afee --- templates/zlib-fix-build.diff | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/zlib-fix-build.diff b/templates/zlib-fix-build.diff index 830efc939c..86c6b065bd 100644 --- a/templates/zlib-fix-build.diff +++ b/templates/zlib-fix-build.diff @@ -1,5 +1,5 @@ ---- configure.orig 2008-10-22 16:47:11.902294688 +0200 -+++ configure 2008-10-22 16:47:24.958840636 +0200 +--- configure.orig 2008-10-26 00:36:04.000000000 +0200 ++++ configure 2008-10-26 00:36:46.000000000 +0200 @@ -169,20 +169,9 @@ SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} @@ -9,8 +9,8 @@ - if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && - test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then CFLAGS="$SFLAGS" - LIBS="$SHAREDLIBV" - echo Building shared library $SHAREDLIBV with $CC. +- LIBS="$SHAREDLIBV" +- echo Building shared library $SHAREDLIBV with $CC. - elif test -z "$old_cc" -a -z "$old_cflags"; then - echo No shared library support. - shared=0; @@ -18,6 +18,8 @@ - echo 'No shared library support; try without defining CC and CFLAGS' - shared=0; - fi ++ LIBS="libz.a $SHAREDLIBV" ++ echo Building static and shared library $SHAREDLIBV with $CC. fi if test $shared -eq 0; then LDSHARED="$CC"