SF.net SVN: gar:[22184] csw/mgar/pkg/tcl85/trunk
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Wed Oct 9 09:54:24 CEST 2013
Revision: 22184
http://gar.svn.sourceforge.net/gar/?rev=22184&view=rev
Author: lblume
Date: 2013-10-09 07:54:23 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
tcl85/trunk: Admit defeat, reinstate sunmath on x86; remove old patch files
Modified Paths:
--------------
csw/mgar/pkg/tcl85/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch
csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch
csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch
csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch
Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 07:11:20 UTC (rev 22183)
+++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 07:54:23 UTC (rev 22184)
@@ -20,16 +20,13 @@
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 += 0003_ld_lacks_LDFLAGS.patch
-PATCHFILES += 0004-disable-libsunmath.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
# # with sunmath to get floating point rounding control
+#
+# I think it's not really needed on recent Solaris 10, but it also appears
+# to be a pain to remove, so I'll just let it be.
PACKAGES = CSWtcl
SPKG_DESC_CSWtcl = Tcl programming language 8.5
@@ -47,9 +44,10 @@
PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.*
# This dependency can not be tracked by checkpkg
RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules
+RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386 += CSWsunmath
+RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH))
CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules
-
# This is correct, the soname with *.so is really the one to use
CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename
Deleted: csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch 2013-10-09 07:11:20 UTC (rev 22183)
+++ csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch 2013-10-09 07:54:23 UTC (rev 22184)
@@ -1,40 +0,0 @@
-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/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 2013-10-09 07:11:20 UTC (rev 22183)
+++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2013-10-09 07:54:23 UTC (rev 22184)
@@ -1,62 +0,0 @@
-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}'
- ])
- ;;
- UNIX_SV* | UnixWare-5*)
---
-1.7.11.3
-
-diff --git a/unix/configure b/unix/configure
-index 753f7c0..5810fc3 100755
---- a/unix/configure
-+++ b/unix/configure
-@@ -8599,7 +8599,7 @@ else
- 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
Deleted: csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch 2013-10-09 07:11:20 UTC (rev 22183)
+++ csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch 2013-10-09 07:54:23 UTC (rev 22184)
@@ -1,12 +0,0 @@
-index d7bd53b..6c5d750 100755
---- a/unix/configure
-+++ b/unix/configure
-@@ -8869,7 +8869,7 @@ fi
- 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='${LDFLAGS} ${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
- if test "${SHLIB_SUFFIX}" = ".dll"; then
-
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
Deleted: csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch
===================================================================
--- csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch 2013-10-09 07:11:20 UTC (rev 22183)
+++ csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch 2013-10-09 07:54:23 UTC (rev 22184)
@@ -1,12 +0,0 @@
-index 6c5d750..3023fa5 100755
---- a/unix/configure
-+++ b/unix/configure
-@@ -8492,7 +8492,7 @@ else
- 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" = "xxx"; then
-
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
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