[csw-devel] SF.net SVN: gar:[19192] csw/mgar/pkg/tcl85/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Sep 12 14:26:08 CEST 2012


Revision: 19192
          http://gar.svn.sourceforge.net/gar/?rev=19192&view=rev
Author:   dmichelsen
Date:     2012-09-12 12:26:07 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
tcl85/trunk: Overall cleanup

Modified Paths:
--------------
    csw/mgar/pkg/tcl85/trunk/Makefile
    csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch

Removed Paths:
-------------
    csw/mgar/pkg/tcl85/trunk/files/configure.patch
    csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff
    csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch
    csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2012-09-12 10:17:19 UTC (rev 19191)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2012-09-12 12:26:07 UTC (rev 19192)
@@ -19,19 +19,12 @@
 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_TCLSH = tclsh8.5
 
-REN_LIBTCL  = libtcl8.5.so
-REN_TCLSH   = tclsh8.5
-
 PATCHDIR = $(WORKDIR)/$(DISTNAME)
 #PATCHFILES += 0001-Enable-SONAME-in-library.patch
-PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch
+#PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch
 
-# PATCHFILES += tcl-dtrace.patch
-
 # 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
@@ -66,14 +59,14 @@
 # This is correct, the soname with *.so is really the one to use
 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename
 
-PACKAGES += CSWtcl8-tclmodules
-SPKG_DESC_CSWtcl8-tclmodules = Modules common to TCL 8.x
-PKGFILES_CSWtcl8-tclmodules += $(libdir)/tcl8/.*
-
 # This is to find zoneinfo
 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl
 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl
 
+PACKAGES += CSWtcl8-tclmodules
+SPKG_DESC_CSWtcl8-tclmodules = Modules common to TCL 8.x
+PKGFILES_CSWtcl8-tclmodules += $(libdir)/tcl8/.*
+
 PACKAGES += CSWtcl-dev
 SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files
 # Indeed, the *.so is the real library and belongs to CSWlibtcl8-5
@@ -110,26 +103,9 @@
 
 include gar/category.mk
 
-DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
-
-pre-configure-modulated:
-	@echo " ==> Regenerating build tools..."
-	(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-modulated:
-	@# Need to manually create symlink to latest version - it will be handled by alternatives
 	@echo Creating tclsh link
 	ln -s $(REN_TCLSH) $(DESTDIR)$(bindir)/tclsh
-	#cd $(DESTDIR)$(libdir) && mv $(REN_LIBTCL) $(REN_LIBTCL).0 && ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL)
 	perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(libdir)/tclConfig.sh
 	perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(mandir)/man1/tclsh.1
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch	2012-09-12 10:17:19 UTC (rev 19191)
+++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch	2012-09-12 12:26:07 UTC (rev 19192)
@@ -40,20 +40,10 @@
  			SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";;
  		esac
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    ])
  	    ;;
  	UNIX_SV* | UnixWare-5*)
-@@ -2104,7 +2105,7 @@ dnl # preprocessing tests use only CPPFLAGS.
- 
-     AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
-         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='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
-         AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
-             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
-             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
 -- 
 1.7.11.3
 

Deleted: csw/mgar/pkg/tcl85/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/configure.patch	2012-09-12 10:17:19 UTC (rev 19191)
+++ csw/mgar/pkg/tcl85/trunk/files/configure.patch	2012-09-12 12:26:07 UTC (rev 19192)
@@ -1,36 +0,0 @@
---- tcl8.5.7/unix/configure.orig	2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7/unix/configure	2010-02-07 05:09:00.015791294 +0100
-@@ -8475,7 +8475,7 @@
- 		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" = "amd64 i386" -o "$arch" = "i386"; then
- 
- 			echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -8679,13 +8679,13 @@
- fi
- 
- 		case $system in
--		    SunOS-5.[1-9][0-9]*)
-+		    SunOS-5.[1-9][0-9]*|SunOS-5.[7-9])
- 			SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";;
- 		    *)
- 			SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";;
- 		esac
- 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
--		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
-+		LD_SEARCH_FLAGS='-L ${LIB_RUNTIME_DIR} -R ${LIB_RUNTIME_DIR}'
- 
- fi
- 
-@@ -8855,7 +8855,7 @@
-     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='${SHLIB_LD} -o $@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
-         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
- 
- else

Deleted: csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff	2012-09-12 10:17:19 UTC (rev 19191)
+++ csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff	2012-09-12 12:26:07 UTC (rev 19192)
@@ -1,60 +0,0 @@
-diff -Naur tcl8.5.7.orig/unix/configure tcl8.5.7.patched/unix/configure
---- tcl8.5.7.orig/unix/configure	2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7.patched/unix/configure	2009-08-19 17:28:51.563281904 +0200
-@@ -8424,7 +8424,7 @@
- 
- 
- else
--  if test "$arch" = "amd64 i386"; then
-+  if test "$arch" = "amd64"; then
- 
- 		    if test "$GCC" = yes; then
- 
-@@ -8475,7 +8475,7 @@
- 		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" = "amd64" -o "$arch" = "i386"; then
- 
- 			echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -8658,7 +8658,7 @@
- 			#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
- 
- else
--  if test "$arch" = "amd64 i386"; then
-+  if test "$arch" = "amd64"; then
- 
- 			SHLIB_LD="$SHLIB_LD -m64 -static-libgcc"
- 
-diff -Naur tcl8.5.7.orig/unix/tcl.m4 tcl8.5.7.patched/unix/tcl.m4
---- tcl8.5.7.orig/unix/tcl.m4	2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7.patched/unix/tcl.m4	2009-08-19 17:30:12.073868365 +0200
-@@ -1920,7 +1920,7 @@
- 			# Solaris 64 uses this as well
- 			#LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64"
- 		    ])
--		], [AS_IF([test "$arch" = "amd64 i386"], [
-+		], [AS_IF([test "$arch" = "amd64"], [
- 		    AS_IF([test "$GCC" = yes], [
- 			case $system in
- 			    SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*)
-@@ -1951,7 +1951,7 @@
- 	    AS_IF([test "$GCC" = yes],[use_sunmath=no],[
- 		arch=`isainfo`
- 		AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control])
--		AS_IF([test "$arch" = "amd64 i386"], [
-+		AS_IF([test "$arch" = "amd64" -o "$arch" = "i386"], [
- 			AC_MSG_RESULT([yes])
- 			MATH_LIBS="-lsunmath $MATH_LIBS"
- 			AC_CHECK_HEADER(sunmath.h)
-@@ -1982,7 +1982,7 @@
- 			# path, remove so name and append 'sparcv9'
- 			#v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..."
- 			#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
--		    ], [AS_IF([test "$arch" = "amd64 i386"], [
-+		    ], [AS_IF([test "$arch" = "amd64"], [
- 			SHLIB_LD="$SHLIB_LD -m64 -static-libgcc"
- 		    ])])
- 		])

Deleted: csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch	2012-09-12 10:17:19 UTC (rev 19191)
+++ csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch	2012-09-12 12:26:07 UTC (rev 19192)
@@ -1,72 +0,0 @@
---- a/generic/tclDTrace.d
-+++ b/generic/tclDTrace.d
-@@ -24,7 +24,7 @@ provider tcl {
-      *		arg1: number of arguments		(int)
-      *		arg2: array of proc argument objects	(Tcl_Obj**)
-      */
--    probe proc__entry(char* name, int objc, Tcl_Obj **objv);
-+    probe proc__entry(char* name, int objc, struct Tcl_Obj **objv);
-     /*
-      *	tcl*:::proc-return probe
-      *	    triggered immediately after proc bytecode execution
-@@ -40,7 +40,7 @@ provider tcl {
-      *		arg2: proc result			(string)
-      *		arg3: proc result object		(Tcl_Obj*)
-      */
--    probe proc__result(char* name, int code, char* result, Tcl_Obj *resultobj);
-+    probe proc__result(char* name, int code, char* result, struct Tcl_Obj *resultobj);
-     /*
-      *	tcl*:::proc-args probe
-      *	    triggered before proc-entry probe, gives access to string
-@@ -73,7 +73,7 @@ provider tcl {
-      *		arg1: number of arguments		(int)
-      *		arg2: array of command argument objects	(Tcl_Obj**)
-      */
--    probe cmd__entry(char* name, int objc, Tcl_Obj **objv);
-+    probe cmd__entry(char* name, int objc, struct Tcl_Obj **objv);
-     /*
-      *	tcl*:::cmd-return probe
-      *	    triggered immediately after commmand execution
-@@ -89,7 +89,7 @@ provider tcl {
-      *		arg2: command result			(string)
-      *		arg3: command result object		(Tcl_Obj*)
-      */
--    probe cmd__result(char* name, int code, char* result, Tcl_Obj *resultobj);
-+    probe cmd__result(char* name, int code, char* result, struct Tcl_Obj *resultobj);
-     /*
-      *	tcl*:::cmd-args probe
-      *	    triggered before cmd-entry probe, gives access to string
-@@ -122,7 +122,7 @@ provider tcl {
-      *		arg1: depth of stack			(int)
-      *		arg2: top of stack			(Tcl_Obj**)
-      */
--    probe inst__start(char* name, int depth, Tcl_Obj **stack);
-+    probe inst__start(char* name, int depth, struct Tcl_Obj **stack);
-     /*
-      *	tcl*:::inst-done probe
-      *	    triggered immediately after execution of a bytecode
-@@ -130,7 +130,7 @@ provider tcl {
-      *		arg1: depth of stack			(int)
-      *		arg2: top of stack			(Tcl_Obj**)
-      */
--    probe inst__done(char* name, int depth, Tcl_Obj **stack);
-+    probe inst__done(char* name, int depth, struct Tcl_Obj **stack);
- 
-     /***************************** obj probes ******************************/
-     /*
-@@ -138,13 +138,13 @@ provider tcl {
-      *	    triggered immediately after a new Tcl_Obj has been created
-      *		arg0: object created			(Tcl_Obj*)
-      */
--    probe obj__create(Tcl_Obj* obj);
-+    probe obj__create(struct Tcl_Obj* obj);
-     /*
-      *	tcl*:::obj-free probe
-      *	    triggered immediately before a Tcl_Obj is freed
-      *		arg0: object to be freed		(Tcl_Obj*)
-      */
--    probe obj__free(Tcl_Obj* obj);
-+    probe obj__free(struct Tcl_Obj* obj);
- 
-     /***************************** tcl probes ******************************/
-     /*

Deleted: csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch	2012-09-12 10:17:19 UTC (rev 19191)
+++ csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch	2012-09-12 12:26:07 UTC (rev 19192)
@@ -1,11 +0,0 @@
---- ../build-isa-sparcv8-garversion-8.5.8/tcl8.5.8/generic/tclInt.h	2009-10-18 13:21:38.000000000 +0200
-+++ tcl8.5.8/generic/tclInt.h	2010-03-19 19:06:24.590674715 +0100
-@@ -60,7 +60,7 @@
- #else
- #include <string.h>
- #endif
--#ifdef STDC_HEADERS
-+#if defined(STDC_HEADERS) || defined(__sun)
- #include <stddef.h>
- #else
- typedef int ptrdiff_t;

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