Revision: 8373
http://gar.svn.sourceforge.net/gar/?rev=8373&view=rev
Author: hson
Date: 2010-02-07 11:58:17 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
tcl: Fixes for amd64 build
Modified Paths:
--------------
csw/mgar/pkg/tcl/trunk/Makefile
csw/mgar/pkg/tcl/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tcl/trunk/files/configure.patch
csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch
Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile 2010-02-07 11:38:08 UTC (rev 8372)
+++ csw/mgar/pkg/tcl/trunk/Makefile 2010-02-07 11:58:17 UTC (rev 8373)
@@ -12,9 +12,10 @@
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
+# Fix for finding libsunmath on i386 and amd64
+PATCHFILES += configure.patch
+PATCHFILES += tcl.m4.patch
+
PATCHDIR = $(WORKDIR)/$(DISTNAME)
SPKG_SOURCEURL = http://www.tcl.tk/
@@ -29,6 +30,8 @@
WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
+LICENSE = license.terms
+
INCLUDE_FLAGS =
CONFIGURE_ARGS = $(DIRPATHS)
@@ -40,3 +43,8 @@
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)
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/tcl/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl/trunk/checksums 2010-02-07 11:38:08 UTC (rev 8372)
+++ csw/mgar/pkg/tcl/trunk/checksums 2010-02-07 11:58:17 UTC (rev 8373)
@@ -1,2 +1,3 @@
-8c1bdbe43c9337c01287d074803d9767 download/patch-libsunmath-amd64.diff
-f70ad8f78b5e4a9f792fe101f22b125f download/tcl8.5.7-src.tar.gz
+dc8664f3dc92693aaaad68785e4426ae configure.patch
+cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch
+f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz
Added: csw/mgar/pkg/tcl/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/tcl/trunk/files/configure.patch
(rev 0)
+++ csw/mgar/pkg/tcl/trunk/files/configure.patch 2010-02-07 11:58:17 UTC
(rev 8373)
@@ -0,0 +1,36 @@
+--- 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
Added: csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch
===================================================================
--- csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch (rev 0)
+++ csw/mgar/pkg/tcl/trunk/files/tcl.m4.patch 2010-02-07 11:58:17 UTC (rev
8373)
@@ -0,0 +1,44 @@
+--- 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.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
