[csw-devel] SF.net SVN: gar:[19219] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 19219
          http://gar.svn.sourceforge.net/gar/?rev=19219&view=rev
Author:   dmichelsen
Date:     2012-09-17 13:42:17 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
mGAR v2: Add default linker map for Solaris 10u8, direct linkage and ignore extra libs

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk

Added Paths:
-----------
    csw/mgar/gar/v2/lib/map.solaris10u8

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-09-17 13:31:31 UTC (rev 19218)
+++ csw/mgar/gar/v2/gar.conf.mk	2012-09-17 13:42:17 UTC (rev 19219)
@@ -690,6 +690,12 @@
 RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install)
 endif
 
+LINKER_MAP_RELEASE ?= solaris10u8
+
+LINKER_MAPS ?= $(foreach MAP,$(LINKER_MAP_RELEASE) $(EXTRA_LINKER_MAPS),-M $(abspath $(GARDIR)/lib/map.$(LINKER_MAP_RELEASE)))
+LINKER_DIRECT ?= -B direct
+LINKER_IGNORE ?= -z ignore
+
 # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one
 # with $ISALIST if it exists in RUNPATH_ISALIST, then append remaining dirs from RUNPATH_ISALIST
 RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS)
@@ -720,7 +726,7 @@
 SOS12U2_LD_OPTIONS = $(EXTRA_SOS12U2_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12U3_LD_OPTIONS = $(EXTRA_SOS12U3_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 
-LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS))
+LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS))
 
 # 1. Make sure everything works fine for SOS12
 # 2. Allow us to use programs we just built. This is a bit complicated,

Copied: csw/mgar/gar/v2/lib/map.solaris10u8 (from rev 19072, csw/mgar/pkg/krb5-lib/trunk/mapfile)
===================================================================
--- csw/mgar/gar/v2/lib/map.solaris10u8	                        (rev 0)
+++ csw/mgar/gar/v2/lib/map.solaris10u8	2012-09-17 13:42:17 UTC (rev 19219)
@@ -0,0 +1,7 @@
+# Stick to Solaris 10u8
+#   http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301
+libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5;
+#  http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers
+libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2;
+# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers
+libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1;

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