[csw-devel] SF.net SVN: gar:[4188] csw/mgar/pkg/zlib/trunk

[hson at users.sourceforge.net]

Revision: 4188
          http://gar.svn.sourceforge.net/gar/?rev=4188&view=rev
Author:   hson
Date:     2009-04-04 22:55:42 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
zlib: Patch configure to build shared lib on amd64

Modified Paths:
--------------
    csw/mgar/pkg/zlib/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/checksums
    csw/mgar/pkg/zlib/trunk/files/configure.diff

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2009-04-04 21:01:36 UTC (rev 4187)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2009-04-04 22:55:42 UTC (rev 4188)
@@ -30,7 +30,7 @@
 PATCHFILES += configure.diff
 
 BUILD64 = 1
-NO_ISAEXEC = 1
+#NO_ISAEXEC = 1
 
 CONFIGURE_ARGS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) 
 CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir)  --shared

Modified: csw/mgar/pkg/zlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/zlib/trunk/checksums	2009-04-04 21:01:36 UTC (rev 4187)
+++ csw/mgar/pkg/zlib/trunk/checksums	2009-04-04 22:55:42 UTC (rev 4188)
@@ -1,3 +1,3 @@
 dee233bf288ee795ac96a98cc2e369b6  download/zlib-1.2.3.tar.bz2
 f1b6f2e9b6ce5902d2e7d83728233532  download/Makefile.in.diff
-59755e3443f9a9c0374febf39663bf5f  download/configure.diff
+95c0edba1d5160ed41b871f2c83e813a  download/configure.diff

Modified: csw/mgar/pkg/zlib/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/configure.diff	2009-04-04 21:01:36 UTC (rev 4187)
+++ csw/mgar/pkg/zlib/trunk/files/configure.diff	2009-04-04 22:55:42 UTC (rev 4188)
@@ -1,5 +1,14 @@
 --- ../build-global/zlib-1.2.3/configure	2005-07-11 22:11:57.000000000 +0200
-+++ zlib-1.2.3/configure	2009-03-23 08:21:07.639754073 +0100
++++ zlib-1.2.3/configure	2009-04-01 00:31:48.271327549 +0200
+@@ -19,7 +19,7 @@
+ # an error.
+ 
+ LIBS=libz.a
+-LDFLAGS="-L. ${LIBS}"
++#LDFLAGS="-L. ${LIBS}"
+ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+ VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
+ VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
 @@ -29,7 +29,7 @@
  exec_prefix=${exec_prefix-'${prefix}'}
  libdir=${libdir-'${exec_prefix}/lib'}
@@ -9,3 +18,23 @@
  shared_ext='.so'
  shared=0
  gcc=0
+@@ -132,9 +132,9 @@
+   SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+              CFLAGS=${CFLAGS-"-O3"}
+              LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+-  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
++  SunOS\ 5*) SFLAGS="-KPIC $CFLAGS"
+              CFLAGS=${CFLAGS-"-fast -xcg89"}
+-             LDSHARED=${LDSHARED-"cc -G"};;
++             LDSHARED=${LDSHARED-"cc -G $LDFLAGS"};;
+   SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+              CFLAGS=${CFLAGS-"-O2"}
+              LDSHARED=${LDSHARED-"ld"};;
+@@ -187,6 +187,7 @@
+ if test $shared -eq 0; then
+   LDSHARED="$CC"
+   echo Building static library $LIBS version $VER with $CC.
++  LDFLAGS="-L. ${LIBS}"
+ else
+   LDFLAGS="-L. ${SHAREDLIBV}"
+ fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.