Revision: 15556
http://gar.svn.sourceforge.net/gar/?rev=15556&view=rev
Author: igalic
Date: 2011-09-07 19:46:45 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
upgrade to latest Tcl 8.5
try to split package sensibly.
Make sure the lib has a SONAME
Modified Paths:
--------------
csw/mgar/pkg/tcl/trunk/Makefile
csw/mgar/pkg/tcl/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tcl/trunk/files/soname.diff
Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile 2011-09-07 19:33:38 UTC (rev 15555)
+++ csw/mgar/pkg/tcl/trunk/Makefile 2011-09-07 19:46:45 UTC (rev 15556)
@@ -1,5 +1,5 @@
NAME = tcl
-VERSION = 8.5.8
+VERSION = 8.5.10
CATEGORIES = lang
DESCRIPTION = Tcl programming language
@@ -10,23 +10,8 @@
MASTER_SITES = $(SF_MIRRORS)
DISTNAME = $(NAME)$(VERSION)
DISTFILES = $(DISTNAME)-src.tar.gz
+DISTFILES += soname.diff
-WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
-
-RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath
-
-# Fix for finding libsunmath on i386 and amd64
-PATCHFILES = configure.patch
-PATCHFILES += tcl.m4.patch
-PATCHFILES += tclInt.h.patch
-
-PATCHDIR = $(WORKDIR)/$(DISTNAME)
-
-CHECKPKG_OVERRIDES_CSWtcl +=
file-with-bad-content|/export/medusa|root/opt/csw/lib/libtclstub8.4.a
-CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2
-CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWsunmath
-CHECKPKG_OVERRIDES_CSWtcl +=
file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tcl
-
# We define upstream file regex so we can be notifed of new upstream software
release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894
UPSTREAM_USE_SF = 1
@@ -35,32 +20,76 @@
VENDOR_URL = http://www.tcl.tk/
LICENSE = license.terms
+
+## Fix for finding libsunmath on i386 and amd64
+#PATCHFILES = configure.patch
+#PATCHFILES += tcl.m4.patch
+#PATCHFILES += tclInt.h.patch
+
+REN_LIBTCL = libtcl8.5.so
+
+PATCHDIR = $(WORKDIR)/$(DISTNAME)
+PATCHFILES = soname.diff
+
+PACKAGES = CSWtcl
+PACKAGES += CSWlibtcl8-5
+PACKAGES += CSWtcl-dev
+CATALOGNAME_CSWtcl = tcl
+CATALOGNAME_CSWlibtcl8-5 = libtcl8_5
+CATALOGNAME_CSWtcl = tcl_dev
+
+RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath
+RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWsunmath
+
+SPKG_DESC_CSWtcl = $(DESCRIPTION)
+SPKG_DESC_CSWlibtcl8-5 = $(DESCRIPTION), libraries
+SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files
+
+PKGFILES_CSWtcl = $(bindir)/*
+PKGFILES_CSWtcl += $(mandir)/man1/.*
+PKGFILES_CSWlibtcl8-5 = $(call baseisadirs,$(libdir),[^/]*\.so)
+PKGFILES_CSWtcl-dev = $(PKGFILES_DEVEL)
+
BUILD64 = 1
-NOISAEXEC = 1
INCLUDE_FLAGS =
-CONFIGURE_ARGS = $(DIRPATHS)
+WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-threads
+#CONFIGURE_ARGS += --enable-dtrace
+
INSTALL_ARGS = install install-private-headers install-tzdata install-msgs
# tk need the static tclstub library for some reason
MERGE_EXCLUDE_STATICLIBS =
+TEST_TARGET = test
+
+# this is only temporaryly
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
include gar/category.mk
+
# CFLAGS := $(filter-out -I%,$(CFLAGS))
DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
pre-configure-modulated:
@echo " ==> Regenerating build tools..."
- @(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf)
+ @(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf
-if )
@$(MAKECOOKIE)
+pre-test-modulated:
+ @# Need to manually create symlink to latest version
+ @echo Creating symlinks for libtcl8.5.so
+ @(cd $(WORKSRC) ; \
+ mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \
+ ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) )
+ @$(MAKECOOKIE)
+
post-install-isa-sparcv8:
- @# Install legacy libs
- @echo Installing legacy files
- @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz |
tar xf -)
@# Need to manually create symlink to latest version
@echo Creating tclsh link
@ln -s tclsh8.5 $(INSTALLISADIR)/$(bindir)/tclsh
@@ -73,9 +102,6 @@
@$(MAKECOOKIE)
post-install-isa-i386:
- @# Install legacy libs
- @echo Installing legacy files
- @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz |
tar xf -)
@# Need to manually create symlink to latest version
@echo Creating tclsh link
@ln -s tclsh8.5 $(INSTALLISADIR)/$(bindir)/tclsh
Modified: csw/mgar/pkg/tcl/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl/trunk/checksums 2011-09-07 19:33:38 UTC (rev 15555)
+++ csw/mgar/pkg/tcl/trunk/checksums 2011-09-07 19:46:45 UTC (rev 15556)
@@ -1,4 +1,5 @@
dc8664f3dc92693aaaad68785e4426ae configure.patch
cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch
-7f123e53b3daaaba2478d3af5a0752e3 tcl8.5.8-src.tar.gz
+a08eaf8467c0631937067c1948dd326b tcl8.5.10-src.tar.gz
3c9c100904b6ba774a679ad7f2b4a036 tclInt.h.patch
+b9693a35219197fb1675fbdefb88c44f soname.diff
Added: csw/mgar/pkg/tcl/trunk/files/soname.diff
===================================================================
--- csw/mgar/pkg/tcl/trunk/files/soname.diff (rev 0)
+++ csw/mgar/pkg/tcl/trunk/files/soname.diff 2011-09-07 19:46:45 UTC (rev
15556)
@@ -0,0 +1,24 @@
+--- 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,10 @@
+ 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@
+ @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
