[Lunar-commits] <moonbase> zlib: Cleaned up -fPIC hacks

[Stefan Wold]

commit d42e8d97936f26b5168a81007b612f46e7e9dc67
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sat Jun 23 12:44:09 2012 +0200

    zlib: Cleaned up -fPIC hacks
    
    - zlib -fPIC bug was fixed in 2006
    - Removed BUILD.x86_64 since it isn't required anymore
---
 archive/zlib/BUILD        |    6 ------
 archive/zlib/BUILD.x86_64 |   20 --------------------
 2 files changed, 26 deletions(-)

diff --git a/archive/zlib/BUILD b/archive/zlib/BUILD
index 543ef3a..6ada34b 100644
--- a/archive/zlib/BUILD
+++ b/archive/zlib/BUILD
@@ -9,12 +9,6 @@
                --libdir=/lib  \
                --shared       &&
 
-  # This fixes a bug in zlib's configure script that fails to set
-  # CFLAGS properly when CFLAGS is passed to it and --shared is set
-  if [ "`arch`" = "alpha" ]; then
-      sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile
-  fi  &&
-
   default_make  &&
 
   # for systems without /bin -> /usr/bin symlink
diff --git a/archive/zlib/BUILD.x86_64 b/archive/zlib/BUILD.x86_64
deleted file mode 100644
index c8ecd13..0000000
--- a/archive/zlib/BUILD.x86_64
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-
-  sedit "s:\${libdir}/pkgconfig:/usr/lib/pkgconfig:" Makefile.in  &&
-
-  unset CFLAGS &&
-
-  prepare_install &&
-
-  ./configure --prefix=/usr  &&
-  sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile  &&
-  make  &&
-  make install  &&
-
-  ./configure --prefix=/usr --libdir=/lib --shared  &&
-  sedit 's/^CFLAGS *=/CFLAGS=-fPIC /' Makefile  &&
-  make  &&
-  make install  &&
-  rm /lib/libz.a
-
-) > $C_FIFO 2>&1