[csw-devel] SF.net SVN: gar:[7027] csw/mgar/pkg/tcl/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 29 17:29:58 CET 2009
Revision: 7027
http://gar.svn.sourceforge.net/gar/?rev=7027&view=rev
Author: dmichelsen
Date: 2009-10-29 16:29:58 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
tcp: Add patch for 64 bit compilcation, may need more work
Modified Paths:
--------------
csw/mgar/pkg/tcl/trunk/Makefile
csw/mgar/pkg/tcl/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff
Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile 2009-10-29 16:28:17 UTC (rev 7026)
+++ csw/mgar/pkg/tcl/trunk/Makefile 2009-10-29 16:29:58 UTC (rev 7027)
@@ -12,6 +12,11 @@
DISTNAME = $(GARNAME)$(GARVERSION)
DISTFILES = $(DISTNAME)-src.tar.gz
+# Patch to use libsunmath on x86 from
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1839067&group_id=10894&atid=110894
+PATCHFILES = patch-libsunmath-amd64.diff
+PATCHDIR = $(WORKDIR)/$(DISTNAME)
+
SPKG_SOURCEURL = http://www.tcl.tk/
# We define upstream file regex so we can be notifed of new upstream software release
Modified: csw/mgar/pkg/tcl/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl/trunk/checksums 2009-10-29 16:28:17 UTC (rev 7026)
+++ csw/mgar/pkg/tcl/trunk/checksums 2009-10-29 16:29:58 UTC (rev 7027)
@@ -1 +1,2 @@
+8c1bdbe43c9337c01287d074803d9767 download/patch-libsunmath-amd64.diff
f70ad8f78b5e4a9f792fe101f22b125f download/tcl8.5.7-src.tar.gz
Added: csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff
===================================================================
--- csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff (rev 0)
+++ csw/mgar/pkg/tcl/trunk/files/patch-libsunmath-amd64.diff 2009-10-29 16:29:58 UTC (rev 7027)
@@ -0,0 +1,60 @@
+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"
+ ])])
+ ])
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