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

[guengel at users.sourceforge.net]

Revision: 18412
          http://gar.svn.sourceforge.net/gar/?rev=18412&view=rev
Author:   guengel
Date:     2012-06-14 21:40:06 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
zlib/trunk: Merge amd64-pic branch into trunk (resolves zlib dynamic linking issue on amd64)

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

Property Changed:
----------------
    csw/mgar/pkg/zlib/trunk/


Property changes on: csw/mgar/pkg/zlib/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/zlib/branches/amd64-pic:18407-18411

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2012-06-14 21:08:17 UTC (rev 18411)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2012-06-14 21:40:06 UTC (rev 18412)
@@ -30,7 +30,6 @@
 PACKAGES += CSWlibz1
 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1
 PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1)
-RUNTIME_DEP_PKGS_CSWlibz1 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibz1 = CSWzlib
 
 PACKAGES += CSWlibz-dev
@@ -42,15 +41,10 @@
 
 EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium
 
-# Temporary switch to GCC, because the previous build resulted in a broken
-# library on amd64 as reported by Rafael.
-GARCOMPILER = GNU
-LD_ALTEXEC = /opt/csw/bin/gld
-EXTRA_EXPORTS = LD_ALTEXEC
-
 # # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9
-# EXTRA_CFLAGS_sparc = -xcode=pic32
-# EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH))
+EXTRA_CFLAGS_sparc = -xcode=pic13
+EXTRA_CFLAGS_i386 = -Kpic
+EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH))
 
 CONFIGURE_ARGS += --prefix=$(prefix)
 CONFIGURE_ARGS += --eprefix=$(exec_prefix)

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