[csw-devel] SF.net SVN: gar:[15596] csw/mgar/pkg/tcl84/trunk

igalic at users.sourceforge.net igalic at users.sourceforge.net
Fri Sep 9 21:49:46 CEST 2011 

Revision: 15596
          http://gar.svn.sourceforge.net/gar/?rev=15596&view=rev
Author:   igalic
Date:     2011-09-09 19:49:46 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
tcl84: fix up soname patch
Fix install targets
fix ALTERNATIVE/S.

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

Modified: csw/mgar/pkg/tcl84/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl84/trunk/Makefile	2011-09-09 16:07:55 UTC (rev 15595)
+++ csw/mgar/pkg/tcl84/trunk/Makefile	2011-09-09 19:49:46 UTC (rev 15596)
@@ -8,7 +8,7 @@
 
 SF_PROJ = tcl
 MASTER_SITES = $(SF_MIRRORS)
-DISTNAME = $(NAME)$(VERSION)
+DISTNAME = $(SF_PROJ)$(VERSION)
 DISTFILES  = $(DISTNAME)-src.tar.gz
 
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894
@@ -17,16 +17,11 @@
 VENDOR_URL = http://www.tcl.tk/
 LICENSE = license.terms
 
-## Fix for finding libsunmath on i386 and amd64
-#PATCHFILES  = configure.patch
-#PATCHFILES += tclInt.h.patch
-
 REN_LIBTCL  = libtcl8.4.so
 REN_TCLSH   = tclsh8.4
 
 PATCHDIR = $(WORKDIR)/$(DISTNAME)
 PATCHFILES  = soname.diff
-PATCHFILES += tcl.m4.patch
 PATCHFILES += tcl-dtrace.patch
 
 PACKAGES  = CSWtcl
@@ -36,28 +31,15 @@
 
 ALTERNATIVES_PRIO = 840
 
-# 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               = CSWtcl8-4
-RUNTIME_DEP_PKGS_CSWtcl8-4-i386       = CSWsunmath
-RUNTIME_DEP_PKGS_CSWtcl8-4           += CSWlibtcl8-4-0
-RUNTIME_DEP_PKGS_CSWtcl8-4           += $(RUNTIME_DEP_PKGS_CSWtcl8-4-$(GARCH))
-RUNTIME_DEP_PKGS_CSWlibtcl8-4-0-i386 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWlibtcl8-4-0      += $(RUNTIME_DEP_PKGS_CSWlibtcl8-4-0-$(GARCH))
-RUNTIME_DEP_PKGS_CSWtcl8-4-dev       += CSWlibtcl8-4-0
+RUNTIME_DEP_PKGS_CSWtcl         = CSWtcl8-4
+RUNTIME_DEP_PKGS_CSWtcl8-4      = CSWlibtcl8-4-0
+RUNTIME_DEP_PKGS_CSWtcl8-4-dev  = CSWlibtcl8-4-0
 
 SPKG_DESC_CSWtcl          = $(DESCRIPTION), backwards compatibility package
 SPKG_DESC_CSWtcl8-4       = $(DESCRIPTION)
 SPKG_DESC_CSWlibtcl8-4-0  = $(DESCRIPTION), libraries
 SPKG_DESC_CSWtcl8-4-dev   = $(DESCRIPTION), development files
 
-SPKG_DESC_CSWtcl          = $(DESCRIPTION)
-SPKG_DESC_CSWlibtcl8-4-0  = $(DESCRIPTION), libraries
-SPKG_DESC_CSWtcl-dev      = $(DESCRIPTION), development files
-
 PKGFILES_CSWlibtcl8-4-0   = $(call pkgfiles_lib,libtcl8.4.so.0)
 PKGFILES_CSWtcl8-4-dev    = $(PKGFILES_DEVEL)
 # Make sure CSWtcl remains empty, it's just for backwards compatibility:
@@ -65,8 +47,8 @@
 
 
 ALTERNATIVES_CSWtcl8-4 += tcl8_4
-ALTERNATIVES_tc8_4     += $(bindir)/tclsh $(ALTERNATIVES_PRIO)
-ALTERNATIVES_tc8_4     += $(libdir)/tclConfig.sh
+ALTERNATIVE_tcl8_4     += $(bindir)/tclsh $(ALTERNATIVES_PRIO)
+ALTERNATIVE_tcl8_4     += $(libdir)/tclConfig.sh $(ALTERNATIVES_PRIO)
 
 BUILD64 = 1
 
@@ -74,11 +56,12 @@
 
 WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
 
+includedir = $(prefix)/include/$(NAME)
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-threads
 CONFIGURE_ARGS += --enable-dtrace
 
-INSTALL_ARGS = install install-private-headers install-tzdata install-msgs
+INSTALL_ARGS = install install-private-headers
 
 # tk need the static tclstub library for some reason
 MERGE_EXCLUDE_STATICLIBS =
@@ -87,7 +70,6 @@
 
 include gar/category.mk
 
-
 # CFLAGS := $(filter-out -I%,$(CFLAGS))
 DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
 

Modified: csw/mgar/pkg/tcl84/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl84/trunk/checksums	2011-09-09 16:07:55 UTC (rev 15595)
+++ csw/mgar/pkg/tcl84/trunk/checksums	2011-09-09 19:49:46 UTC (rev 15596)
@@ -1,6 +1,5 @@
 dc8664f3dc92693aaaad68785e4426ae  configure.patch
-cc9b1bd7ddf8e27e97ef464806885349  tcl.m4.patch
-a08eaf8467c0631937067c1948dd326b  tcl8.5.10-src.tar.gz
 3c9c100904b6ba774a679ad7f2b4a036  tclInt.h.patch
 1dea9df5cd9579dce4746cf5d428aa1a  tcl-dtrace.patch
-1d6c493907986871a90c7c9612520ffd  soname.diff
+ade2c033a7b545ee108f3fdfeb629fcf  tcl8.4.19-src.tar.gz
+10ae65cdcd10dc7a4ba7d84f5d7c2338  soname.diff

Modified: csw/mgar/pkg/tcl84/trunk/files/soname.diff
===================================================================
--- csw/mgar/pkg/tcl84/trunk/files/soname.diff	2011-09-09 16:07:55 UTC (rev 15595)
+++ csw/mgar/pkg/tcl84/trunk/files/soname.diff	2011-09-09 19:49:46 UTC (rev 15596)
@@ -1,23 +1,34 @@
---- tcl8.5.10/unix/tcl.m4	2011-06-23 15:18:36.000000000 +0200
-+++ tcl8.5.10/unix/tcl.m4	2011-09-07 17:11:05.737368554 +0200
-@@ -1968,6 +1968,7 @@
- 			use_sunmath=no
- 		])
- 	    ])
-+	    TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0"
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    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,9 @@
+diff -ur tcl8.4.19/unix/Makefile.in tcl8.4.19-solfix/unix/Makefile.in
+--- tcl8.4.19/unix/Makefile.in	2008-04-17 22:29:49.000000000 +0200
++++ tcl8.4.19-solfix/unix/Makefile.in	2011-09-09 20:20:12.621101557 +0200
+@@ -207,7 +207,7 @@
+ SHLIB_LD		= @SHLIB_LD@
+ SHLIB_CFLAGS		= @SHLIB_CFLAGS@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
+-TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
++TCL_SHLIB_LD_EXTRAS     = @TCL_SHLIB_LD_EXTRAS@
+ 
+ SHLIB_SUFFIX		= @SHLIB_SUFFIX@
+ #SHLIB_SUFFIX		=
+@@ -634,7 +634,9 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@@INSTALL_LIB@
--	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
+-	@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)
 +	@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@
- 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
+ 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+diff -ur tcl8.4.19/unix/tcl.m4 tcl8.4.19-solfix/unix/tcl.m4
+--- tcl8.4.19/unix/tcl.m4	2008-04-17 22:29:49.000000000 +0200
++++ tcl8.4.19-solfix/unix/tcl.m4	2011-09-09 20:21:56.672149153 +0200
+@@ -1843,6 +1843,7 @@
+ 	    # symbols when dynamically loaded into tclsh.
+ 
+ 	    SHLIB_LD_LIBS='${LIBS}'
++	    TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0"
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"

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

More information about the devel mailing list