[csw-devel] SF.net SVN: gar:[19153] csw/mgar/pkg/tcl85/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Sep 5 19:49:50 CEST 2012
Revision: 19153
http://gar.svn.sourceforge.net/gar/?rev=19153&view=rev
Author: dmichelsen
Date: 2012-09-05 17:49:49 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
tcl85/trunk: Rejuvenate more patches
Modified Paths:
--------------
csw/mgar/pkg/tcl85/trunk/Makefile
Added Paths:
-----------
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/tcl.m4.patch
Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 16:25:40 UTC (rev 19152)
+++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 17:49:49 UTC (rev 19153)
@@ -27,8 +27,9 @@
REN_TCLSH = tclsh8.5
PATCHDIR = $(WORKDIR)/$(DISTNAME)
-PATCHFILES = 0001-Enable-SONAME-in-library.patch
-PATCHFILES += tcl.m4.patch
+PATCHFILES += 0001-Enable-SONAME-in-library.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:
@@ -110,7 +111,7 @@
@# 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)
+ #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)
Added: 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 (rev 0)
+++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2012-09-05 17:49:49 UTC (rev 19153)
@@ -0,0 +1,59 @@
+From bb82b6ee8a1ed4bd1f3c0df9656d9554a38d18b7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 Sep 2012 11:44:36 -0500
+Subject: [PATCH] Fix linking issues and enable building on Solaris 9 and
+ earlier
+
+---
+ unix/tcl.m4 | 9 +++++----
+ 1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
+
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index cb31f50..84a738c 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -1961,6 +1961,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ ], [
+ do64bit_ok=yes
+ case $system in
++# Non functional check, m64/xarch depends on compiler not os version
+ SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*)
+ CFLAGS="$CFLAGS -m64"
+ LDFLAGS="$LDFLAGS -m64";;
+@@ -1979,7 +1980,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 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 i386" -o "$arch" = "i386"], [
+ AC_MSG_RESULT([yes])
+ MATH_LIBS="-lsunmath $MATH_LIBS"
+ AC_CHECK_HEADER(sunmath.h)
+@@ -2013,13 +2014,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ ], [
+ AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text])
+ 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}'
+ ])
+ ;;
+ 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/tcl.m4.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/tcl.m4.patch 2012-09-05 16:25:40 UTC (rev 19152)
+++ csw/mgar/pkg/tcl85/trunk/files/tcl.m4.patch 2012-09-05 17:49:49 UTC (rev 19153)
@@ -1,44 +0,0 @@
---- tcl8.5.7/unix/tcl.m4.orig 2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7/unix/tcl.m4 2010-02-07 05:15:17.410781569 +0100
-@@ -1933,6 +1933,7 @@
- ], [
- do64bit_ok=yes
- case $system in
-+# Non functional check, m64/xarch depends on compiler not os version
- SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*)
- CFLAGS="$CFLAGS -m64"
- LDFLAGS="$LDFLAGS -m64";;
-@@ -1951,7 +1952,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 i386" -o "$arch" = "i386"], [
- AC_MSG_RESULT([yes])
- MATH_LIBS="-lsunmath $MATH_LIBS"
- AC_CHECK_HEADER(sunmath.h)
-@@ -1989,13 +1990,13 @@
- ], [
- AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text])
- 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}'
- ])
- ;;
- UNIX_SV* | UnixWare-5*)
-@@ -2078,7 +2079,7 @@
-
- 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}'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
- ], [
- LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
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