From 354cc826b10ab9050974a0ff0b9ff6d931258287 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 19 Aug 2003 22:56:24 +0000 Subject: [PATCH] fixed zlib to finally build both a static and dynamic version git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1130 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/base/zlib/zlib.conf | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 117061f12..d8a7499b7 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -16,6 +16,7 @@ get deleted during a Cleanup ...) (#46) - changed apache's default datadir from /opt/apache/share to /var/opt/apache/ (#40) + - fixed zlib to finally build both a static and dynamic version *) 2003-08-18 (2.0.0-camp - 2.0.0-rc1) diff --git a/package/base/zlib/zlib.conf b/package/base/zlib/zlib.conf index ccf9cd033..24c47e8b3 100644 --- a/package/base/zlib/zlib.conf +++ b/package/base/zlib/zlib.conf @@ -21,11 +21,16 @@ # --- ROCK-COPYRIGHT-NOTE-END --- zlib_pm() { - cp zlib.3 $root/$prefix/share/man/man3/ - cp algorithm.txt $docdir + # craete a static version + make libz.a + cp -v libz.a $root/$prefix/lib/ + [ ! -d $root/$prefix/share/man/man3 ] && \ + mkdir -p $root/$prefix/share/man/man3 + cp -v zlib.3 $root/$prefix/share/man/man3/ + cp -v algorithm.txt $docdir } -#var_append confopt " " "--shared" +var_insert confopt " " "--shared" var_insert CC_WRAPPER_INSERT " " "-fPIC" hook_add preconf 3 "unset AR" hook_add postmake 3 "zlib_pm"