SF.net SVN: gar:[22163] csw/mgar/pkg/tcl85/trunk

[lblume at users.sourceforge.net]

Revision: 22163
          http://gar.svn.sourceforge.net/gar/?rev=22163&view=rev
Author:   lblume
Date:     2013-10-08 08:30:56 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
tcl85/trunk: Switch back to Studio; Remove LDFLAGS patch that breaks testing; Dsiable using libsunmath in configure; some minor cleanup

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

Added Paths:
-----------
    csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch
    csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2013-10-07 23:33:04 UTC (rev 22162)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2013-10-08 08:30:56 UTC (rev 22163)
@@ -15,8 +15,6 @@
 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
-GARCOMPILER = GCC4
-
 VENDOR_URL = http://www.tcl.tk/
 LICENSE = license.terms
 
@@ -25,6 +23,8 @@
 #PATCHDIR = $(WORKDIR)/$(DISTNAME)
 #PATCHFILES += 0001-Enable-SONAME-in-library.patch
 #PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch
+#PATCHFILES += 0003_ld_lacks_LDFLAGS.patch
+PATCHFILES += 0004-disable-libsunmath.patch
 
 # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: 
 #
@@ -47,7 +47,6 @@
 PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.*
 # This dependency can not be tracked by checkpkg
 RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules
-RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules
 
 
@@ -71,10 +70,10 @@
 RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5
 
 # Enable 64 bits, but not for Solaris 9 x86
-BUILD64_5.9_sparc = 1
+BUILD64_5.9_sparc  = 1
 BUILD64_5.10_sparc = 1
-BUILD64_5.9_i386 =
-BUILD64_5.10_i386 = 1
+BUILD64_5.9_i386   =
+BUILD64_5.10_i386  = 1
 BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH))
 ISAEXEC = 1
 
@@ -85,10 +84,10 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --enable-threads
+# This is supposed to be needed for completeness, but what it does in configure
+# is really questionable. Should not break stuff, though.
 CONFIGURE_ARGS-64 += --enable-64bit
-CONFIGURE_ARGS-64-sparc += --enable-64bit-vis
 CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL)
-CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH)
 
 # DTrace support is currently broken, disable for now
 #  Text relocation remains                         referenced
@@ -128,6 +127,7 @@
 		-e '/^[^#]/s/-march=[^ ]* *//g' \
 		-e '/^[^#]/s/-Wall *//g' \
 		-e '/^[^#]/s/-pipe *//g' \
+		-e '/^[^#]/s/-KPIC/-fPIC/g' \
 		$(DESTDIR)$(libdir)/tclConfig.sh
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch	                        (rev 0)
+++ csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch	2013-10-08 08:30:56 UTC (rev 22163)
@@ -0,0 +1,12 @@
+index d7bd53b..6c5d750 100755
+--- a/unix/configure
++++ b/unix/configure
+@@ -8869,7 +8869,7 @@ fi
+     if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then
+ 
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
++        MAKE_LIB='${LDFLAGS} ${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+         if test "${SHLIB_SUFFIX}" = ".dll"; then
+ 
+             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'

Added: csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch	                        (rev 0)
+++ csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch	2013-10-08 08:30:56 UTC (rev 22163)
@@ -0,0 +1,12 @@
+index 6c5d750..3023fa5 100755
+--- a/unix/configure
++++ b/unix/configure
+@@ -8492,7 +8492,7 @@ else
+ 		arch=`isainfo`
+ 		echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5
+ echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6
+-		if test "$arch" = "amd64 i386"; then
++		if test "$arch" = "xxx"; then
+ 
+ 			echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6

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