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

[lblume at users.sourceforge.net]

Revision: 21920
          http://gar.svn.sourceforge.net/gar/?rev=21920&view=rev
Author:   lblume
Date:     2013-09-14 15:36:09 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
zlib/trunk: bump version to 1.2.8; update patch; change explanation of -xcode

Modified Paths:
--------------
    csw/mgar/pkg/zlib/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch

Removed Paths:
-------------
    csw/mgar/pkg/zlib/trunk/files/configure.diff

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2013-09-14 15:31:01 UTC (rev 21919)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2013-09-14 15:36:09 UTC (rev 21920)
@@ -1,7 +1,7 @@
 #: $Id$
 
 NAME = zlib
-VERSION = 1.2.7
+VERSION = 1.2.8
 GARTYPE = v2
 
 DESCRIPTION = Zlib data compression library
@@ -20,11 +20,11 @@
 MASTER_SITES  = http://zlib.net/
 MASTER_SITES += $(SF_MIRROR)
 SF_PROJECT = libpng
-DISTFILES  = $(DISTNAME).tar.bz2
+DISTFILES  = $(DISTNAME).tar.xz
 DISTFILES += COPYING
 
 PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch
-PATCHFILES += configure.diff
+PATCHFILES += 0004-remove-fast-from-configure.patch
 
 PACKAGES += CSWlibz1
 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1
@@ -40,9 +40,10 @@
 
 EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium
 
-# # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9
+# http://docs.oracle.com/cd/E19205-01/819-5267/bkbaq/index.html
+# http://unix.derkeiler.com/Newsgroups/comp.unix.solaris/2005-12/msg01281.html
 EXTRA_CFLAGS_sparc = -xcode=pic13
-EXTRA_CFLAGS_i386 = -Kpic
+EXTRA_CFLAGS_i386 = -KPIC
 EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH))
 
 CONFIGURE_ARGS += --prefix=$(prefix)

Modified: csw/mgar/pkg/zlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/zlib/trunk/checksums	2013-09-14 15:31:01 UTC (rev 21919)
+++ csw/mgar/pkg/zlib/trunk/checksums	2013-09-14 15:36:09 UTC (rev 21920)
@@ -1 +1 @@
-2ab442d169156f34c379c968f3f482dd  zlib-1.2.7.tar.bz2
+28f1205d8dd2001f26fec1e8c2cebe37  zlib-1.2.8.tar.xz

Copied: csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch (from rev 21918, csw/mgar/pkg/zlib/trunk/files/configure.diff)
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch	                        (rev 0)
+++ csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch	2013-09-14 15:36:09 UTC (rev 21920)
@@ -0,0 +1,14 @@
+index b77a8a8..cb4872a 100755
+--- a/configure
++++ b/configure
+@@ -267,8 +267,8 @@ else
+              LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
+   SunOS\ 5* | solaris*)
+          LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
+-         SFLAGS=${CFLAGS-"-fast -KPIC"}
+-         CFLAGS=${CFLAGS-"-fast"}
++         SFLAGS=${CFLAGS-"-KPIC"}
++         CFLAGS=${CFLAGS-""}
+          if test $build64 -eq 1; then
+              # old versions of SunPRO/Workshop/Studio don't support -m64,
+              # but newer ones do.  Check for it.

Deleted: csw/mgar/pkg/zlib/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/configure.diff	2013-09-14 15:31:01 UTC (rev 21919)
+++ csw/mgar/pkg/zlib/trunk/files/configure.diff	2013-09-14 15:36:09 UTC (rev 21920)
@@ -1,27 +0,0 @@
---- zlib-1.2.4/configure.orig	2010-03-12 16:06:14.000000000 +0100
-+++ zlib-1.2.4/configure	2010-03-19 03:56:46.336725066 +0100
-@@ -29,7 +29,7 @@
- exec_prefix=${exec_prefix-'${prefix}'}
- libdir=${libdir-'${exec_prefix}/lib'}
- includedir=${includedir-'${prefix}/include'}
--mandir=${mandir-'${prefix}/share/man'}
-+#mandir=${mandir-'${prefix}/share/man'}
- shared_ext='.so'
- shared=0
- gcc=0
-@@ -154,11 +154,11 @@
-   SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"}
-          case `(uname -m || echo unknown) 2>/dev/null` in
-          i86*)
--             SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
--             CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
-+             SFLAGS="${CFLAGS} -KPIC -L."
-+             CFLAGS=${CFLAGS} ;;
-          *)
--             SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
--             CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
-+             SFLAGS="${CFLAGS} -KPIC -L."
-+             CFLAGS=${CFLAGS} ;;
-          esac ;;
-   SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
-              CFLAGS=${CFLAGS-"-O2"}

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