[csw-devel] SF.net SVN: gar:[15571] csw/mgar/pkg/tcl/trunk

[igalic at users.sourceforge.net]

Revision: 15571
          http://gar.svn.sourceforge.net/gar/?rev=15571&view=rev
Author:   igalic
Date:     2011-09-08 14:20:22 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
tcl: Fix soname patch.
Add separate dependency for -i386 - the only ISA which needs CSWsunmath
It was supposed to be post-install-modulated, not post-install

Modified Paths:
--------------
    csw/mgar/pkg/tcl/trunk/Makefile
    csw/mgar/pkg/tcl/trunk/checksums
    csw/mgar/pkg/tcl/trunk/files/soname.diff

Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile	2011-09-08 11:44:46 UTC (rev 15570)
+++ csw/mgar/pkg/tcl/trunk/Makefile	2011-09-08 14:20:22 UTC (rev 15571)
@@ -34,10 +34,15 @@
 PACKAGES += CSWtcl-dev
 PACKAGES += CSWtcl-doc
 
-RUNTIME_DEP_PKGS_CSWtcl         += CSWsunmath
-RUNTIME_DEP_PKGS_CSWtcl         += CSWlibtcl8-5-0
-RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWtcl-dev     += CSWlibtcl8-5-0
+# The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: 
+#
+#              # On Solaris 5.x i386 with the sunpro compiler we need to link
+#              # with sunmath to get floating point rounding control
+#
+RUNTIME_DEP_PKGS_CSWtcl-i386          = CSWsunmath
+RUNTIME_DEP_PKGS_CSWtcl              += CSWlibtcl8-5-0
+RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath
+RUNTIME_DEP_PKGS_CSWtcl-dev          += CSWlibtcl8-5-0
 
 SPKG_DESC_CSWtcl          = $(DESCRIPTION)
 SPKG_DESC_CSWlibtcl8-5-0  = $(DESCRIPTION), libraries
@@ -51,6 +56,7 @@
 ARCHALL_CSWtcl-doc = 1 
 
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/tclConfig.sh
+CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/tclConfig.sh
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tclConfig.sh
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tclsh.1
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n
@@ -95,7 +101,7 @@
 		ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) )
 	@$(MAKECOOKIE)
 
-post-install:
+post-install-modulated:
 	@# Need to manually create symlink to latest version
 	@echo Creating tclsh link
 	@ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh

Modified: csw/mgar/pkg/tcl/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl/trunk/checksums	2011-09-08 11:44:46 UTC (rev 15570)
+++ csw/mgar/pkg/tcl/trunk/checksums	2011-09-08 14:20:22 UTC (rev 15571)
@@ -2,5 +2,5 @@
 cc9b1bd7ddf8e27e97ef464806885349  tcl.m4.patch
 a08eaf8467c0631937067c1948dd326b  tcl8.5.10-src.tar.gz
 3c9c100904b6ba774a679ad7f2b4a036  tclInt.h.patch
-b9693a35219197fb1675fbdefb88c44f  soname.diff
 1dea9df5cd9579dce4746cf5d428aa1a  tcl-dtrace.patch
+1d6c493907986871a90c7c9612520ffd  soname.diff

Modified: csw/mgar/pkg/tcl/trunk/files/soname.diff
===================================================================
--- csw/mgar/pkg/tcl/trunk/files/soname.diff	2011-09-08 11:44:46 UTC (rev 15570)
+++ csw/mgar/pkg/tcl/trunk/files/soname.diff	2011-09-08 14:20:22 UTC (rev 15571)
@@ -10,14 +10,13 @@
  	    DL_LIBS="-ldl"
 --- tcl8.5.10/unix/Makefile.in	2011-06-23 15:18:36.000000000 +0200
 +++ tcl8.5.10/unix/Makefile.in	2011-09-07 17:12:48.393545884 +0200
-@@ -719,7 +719,10 @@
+@@ -719,7 +719,9 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@@INSTALL_LIB@
 -	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
 +	mv "$(LIB_INSTALL_DIR)"/$(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
 +	ln -sf $(LIB_FILE).0 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+	ln -sf "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 ./
 +	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@

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