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

[dmichelsen at users.sourceforge.net]

Revision: 19152
          http://gar.svn.sourceforge.net/gar/?rev=19152&view=rev
Author:   dmichelsen
Date:     2012-09-05 16:25:40 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
tcl85/trunk: Rejuvenate patches, remove legacy binary libs

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

Added Paths:
-----------
    csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch

Removed Paths:
-------------
    csw/mgar/pkg/tcl85/trunk/files/8.4.i386.tar.xz
    csw/mgar/pkg/tcl85/trunk/files/8.4.sparc.tar.xz
    csw/mgar/pkg/tcl85/trunk/files/soname.diff

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2012-09-05 13:45:46 UTC (rev 19151)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2012-09-05 16:25:40 UTC (rev 19152)
@@ -27,7 +27,7 @@
 REN_TCLSH   = tclsh8.5
 
 PATCHDIR = $(WORKDIR)/$(DISTNAME)
-PATCHFILES  = soname.diff
+PATCHFILES  = 0001-Enable-SONAME-in-library.patch
 PATCHFILES += tcl.m4.patch
 # PATCHFILES += tcl-dtrace.patch
 
@@ -95,7 +95,7 @@
 
 pre-configure-modulated:
 	@echo " ==> Regenerating build tools..."
-	#(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if )
+	(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if )
 	@$(MAKECOOKIE)
 
 pre-test-modulated:

Added: csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch	                        (rev 0)
+++ csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch	2012-09-05 16:25:40 UTC (rev 19152)
@@ -0,0 +1,40 @@
+From ceab3487bb09c08ca527ca41d94bea68f1370ac7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 Sep 2012 15:55:32 +0200
+Subject: [PATCH] Enable SONAME in library
+
+---
+ unix/Makefile.in |    4 +++-
+ unix/tcl.m4      |    1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index a527bf0..3659916 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -722,7 +722,9 @@ install-binaries: binaries
+ 	    fi
+ 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
+ 	@@INSTALL_LIB@
+-	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
++	@mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
++	@ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
++	@chmod 555 "$(DLL_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)/"
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index 3974753..cb31f50 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -1989,6 +1989,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 			use_sunmath=no
+ 		])
+ 	    ])
++	    TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0"
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-- 
+1.7.10.3
+

Deleted: csw/mgar/pkg/tcl85/trunk/files/8.4.i386.tar.xz
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/tcl85/trunk/files/8.4.sparc.tar.xz
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/tcl85/trunk/files/soname.diff
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/soname.diff	2012-09-05 13:45:46 UTC (rev 19151)
+++ csw/mgar/pkg/tcl85/trunk/files/soname.diff	2012-09-05 16:25:40 UTC (rev 19152)
@@ -1,23 +0,0 @@
---- 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 @@
- 	    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)
-+	@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.