[pkgsrc/trunk]: pkgsrc/lang/tcl Fix up some Makefile logic that got broken by...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/tcl Fix up some Makefile logic that got broken by...
From: danw <danw%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:51:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d26b1fa1172
branches:  trunk
changeset: 472399:3d26b1fa1172
user:      danw <danw%pkgsrc.org@localhost>
date:      Fri Apr 09 23:37:28 2004 +0000

description:
Fix up some Makefile logic that got broken by the libtool patches (and
prevented it from building on some platforms). Ensure that the built
library is named libtcl84 (as opposed to libtcl8.4) on all platforms.

diffstat:

 lang/tcl/Makefile         |   21 +------
 lang/tcl/PLIST            |    6 +-
 lang/tcl/buildlink2.mk    |    7 +-
 lang/tcl/buildlink3.mk    |    7 +-
 lang/tcl/distinfo         |    6 +-
 lang/tcl/patches/patch-aa |   51 +++++++++++++---
 lang/tcl/patches/patch-ab |  142 ++++++++++++++++++---------------------------
 7 files changed, 114 insertions(+), 126 deletions(-)

diffs (truncated from 643 to 300 lines):

diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/Makefile
--- a/lang/tcl/Makefile Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/Makefile Fri Apr 09 23:37:28 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/03/25 22:49:14 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/09 23:37:28 danw Exp $
 #
 
 DISTNAME=              tcl8.4.6-src
 PKGNAME=               tcl-8.4.6
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -25,8 +25,6 @@
 
 INSTALL_TARGET=                install
 
-PLIST_SUBST+=          SHLIB_SUFX="${SHLIB_SUFX}"
-
 # Initially install the man pages into ${WRKDIR}/man, as we need a staged
 # install to avoid overwriting existing manpages in ${PREFIX}/man.
 #
@@ -38,14 +36,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+=          SHLIB_CMT="@comment "
-SHLIB_SUFX=            dylib
-.else
-PLIST_SUBST+=          SHLIB_CMT=""
-SHLIB_SUFX=            la
-.endif
-
 # NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
 # tickled by the Tcl code that manifests in code generation problems.
 #
@@ -71,13 +61,6 @@
        ${RM} -f mkLinks.tmp;                                           \
        ${CHMOD} +x mkLinks;
 
-pre-install:
-       cd ${WRKSRC}; for file in                                       \
-               tclUnixInit.o libtcl84.so tclsh;                        \
-       do                                                              \
-               ${TOUCH} $${file};                                      \
-       done
-
 post-install:
        cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
        ${RM} -rf ${WRKDIR}/man
diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/PLIST
--- a/lang/tcl/PLIST    Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/PLIST    Fri Apr 09 23:37:28 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/08 19:55:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/09 23:37:28 danw Exp $
 bin/tclsh
 bin/tclsh8.4
 include/tcl.h
@@ -17,8 +17,8 @@
 include/tcl/unix/tclUnixPort.h
 include/tclDecls.h
 include/tclPlatDecls.h
-${SHLIB_CMT}lib/libtcl84.a
-lib/libtcl84.${SHLIB_SUFX}
+lib/libtcl84.a
+lib/libtcl84.la
 lib/libtcl84.so
 lib/libtcl84.so.1
 lib/libtcl84.so.1.0
diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/buildlink2.mk
--- a/lang/tcl/buildlink2.mk    Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/buildlink2.mk    Fri Apr 09 23:37:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/04/09 23:37:28 danw Exp $
 
 .if !defined(TCL_BUILDLINK2_MK)
 TCL_BUILDLINK2_MK=     # defined
@@ -17,10 +17,11 @@
 BUILDLINK_FILES.tcl+=  lib/libtcl84.*
 BUILDLINK_FILES.tcl+=  lib/libtclstub84.*
 
-# Make "-ltcl" resolve into "-ltcl84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
+# need to patch so many Makefiles.
 #
 BUILDLINK_TRANSFORM+=  l:tcl:tcl84
+BUILDLINK_TRANSFORM+=  l:tcl8.4:tcl84
 
 BUILDLINK_TARGETS+=    tcl-buildlink
 
diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/buildlink3.mk
--- a/lang/tcl/buildlink3.mk    Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/buildlink3.mk    Fri Apr 09 23:37:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/25 22:45:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/04/09 23:37:28 danw Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=    ${TCL_BUILDLINK3_MK}+
@@ -16,10 +16,11 @@
 
 BUILDLINK_FILES.tcl=   bin/tclsh*
 #
-# Make "-ltcl" resolve into "-ltcl84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
+# need to patch so many Makefiles.
 #
 BUILDLINK_TRANSFORM+=  l:tcl:tcl84
+BUILDLINK_TRANSFORM+=  l:tcl8.4:tcl84
 
 TCLCONFIG_SH?=         ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 
diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/distinfo
--- a/lang/tcl/distinfo Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/distinfo Fri Apr 09 23:37:28 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2004/03/25 22:49:14 jlam Exp $
+$NetBSD: distinfo,v 1.22 2004/04/09 23:37:28 danw Exp $
 
 SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
 Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
-SHA1 (patch-aa) = 5a8d4d6a14c3520cb9f46e65d826ee85f48b2c5b
-SHA1 (patch-ab) = 3032c2b97e69260827f9fec27553557572b9bdb4
+SHA1 (patch-aa) = c23a611dd51dd030f6c77578eb455aa3d63d5c08
+SHA1 (patch-ab) = 7b5dc8c937fedf43042a558f7afdec2a93ba3a62
 SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
 SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
 SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/patches/patch-aa
--- a/lang/tcl/patches/patch-aa Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/patches/patch-aa Fri Apr 09 23:37:28 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2004/04/09 23:37:28 danw Exp $
 
 --- Makefile.in.orig   Mon Mar  1 18:58:59 2004
 +++ Makefile.in
@@ -22,18 +22,24 @@
  INSTALL_LIBRARY               = ${INSTALL}
  INSTALL_DATA          = ${INSTALL} -m 644
  
-@@ -190,8 +190,8 @@ TCL_EXE                    = tclsh
- # configure script.  You shouldn't normally need to modify any of
+@@ -191,7 +191,7 @@ TCL_EXE                    = tclsh
  # these definitions by hand.
  
--STLIB_LD              = @STLIB_LD@
+ STLIB_LD              = @STLIB_LD@
 -SHLIB_LD              = @SHLIB_LD@
-+STLIB_LD              = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
 +SHLIB_LD              = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_CFLAGS          = @SHLIB_CFLAGS@
  SHLIB_LD_FLAGS                = @SHLIB_LD_FLAGS@
  SHLIB_LD_LIBS         = @SHLIB_LD_LIBS@
-@@ -254,8 +254,9 @@ DLTEST_DIR         = @TCL_SRC_DIR@/unix/dltest
+@@ -217,6 +217,7 @@ BUILD_DLTEST               = @BUILD_DLTEST@
+ #BUILD_DLTEST         =
+ 
+ TCL_LIB_FILE          = @TCL_LIB_FILE@
++TCL_LA_FILE           = ${TCL_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TCL_LIB_FILE         = libtcl.a
+ 
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -254,8 +255,9 @@ DLTEST_DIR         = @TCL_SRC_DIR@/unix/dltest
  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library
  
@@ -44,16 +50,41 @@
  
  # Flags to be passed to mkLinks to control whether the manpages
  # should be compressed and linked with softlinks
-@@ -474,7 +475,7 @@ objs: ${OBJS}
+@@ -445,7 +447,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
+ 
+ all: binaries libraries doc
+ 
+-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
++binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+ 
+ libraries:
+ 
+@@ -453,7 +455,7 @@ doc:
+ 
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tcl.
+-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
++${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE}
+       rm -f $@
+       @MAKE_LIB@
+ 
+@@ -473,8 +475,8 @@ tclLibObjs:
+ objs: ${OBJS}
  
  
- tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
 -      ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
 +      ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
                ${CC_SEARCH_FLAGS} -o tclsh
  
  # Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -486,7 +487,7 @@ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE}
+@@ -482,11 +484,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ # burned into its ld search path. This keeps tcltest from
+ # picking up an already installed version of the Tcl library.
+ 
+-tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
++tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST}
        $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
  
  tcltest-real:
@@ -62,7 +93,7 @@
                ${CC_SEARCH_FLAGS} -o tcltest
  
  # Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1054,7 +1055,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+@@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
        @DL_OBJS@ ${BUILD_DLTEST}
diff -r b6b88860cc61 -r 3d26b1fa1172 lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Fri Apr 09 23:20:49 2004 +0000
+++ b/lang/tcl/patches/patch-ab Fri Apr 09 23:37:28 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
+$NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
 
 --- configure.orig     Mon Mar  1 18:58:59 2004
 +++ configure
-@@ -5613,6 +5613,7 @@ fi
+@@ -5613,12 +5613,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,6 +10,13 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
+     TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
+     ECHO_VERSION='`echo ${VERSION}`'
+-    TCL_LIB_VERSIONS_OK=ok
++    TCL_LIB_VERSIONS_OK=nodots
+     CFLAGS_DEBUG=-g
+     CFLAGS_OPTIMIZE=-O
+     if test "$GCC" = "yes" ; then
 @@ -5682,7 +5683,7 @@ fi
            SHLIB_SUFFIX=".so"
  
@@ -113,19 +120,16 @@
            CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
            LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
            SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -6037,7 +6038,10 @@ fi
+@@ -6037,7 +6038,7 @@ fi
            CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
            LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
            EXTRA_CFLAGS=""
 -          LDFLAGS=""
 +          LD_FLAGS=""
-+          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+          TCL_LIB_VERSIONS_OK=nodots
            ;;
        IRIX-6.*)
            SHLIB_CFLAGS=""
-@@ -6050,7 +6054,7 @@ fi
+@@ -6050,7 +6051,7 @@ fi
            LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
            if test "$GCC" = "yes" ; then
                EXTRA_CFLAGS="-mabi=n32"
@@ -134,20 +138,16 @@
            else
                case $system in
                    IRIX-6.3)
-@@ -6061,8 +6065,11 @@ fi
+@@ -6061,7 +6062,7 @@ fi
                        EXTRA_CFLAGS="-n32"
                        ;;
                esac
 -              LDFLAGS="-n32"
 +              LD_FLAGS="-n32"
            fi
-+          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+          TCL_LIB_VERSIONS_OK=nodots
            ;;
        IRIX64-6.*)
-           SHLIB_CFLAGS=""
-@@ -6071,7 +6078,7 @@ fi
+@@ -6071,7 +6072,7 @@ fi
            SHLIB_SUFFIX=".so"
            DL_OBJS="tclLoadDl.o"
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/smlnj Update to smlnj-110.45.
Next by Date: [pkgsrc/trunk]: pkgsrc/biology/chemtool Disable gnome support explicitly. Ot...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/smlnj Update to smlnj-110.45.
Next by Thread: [pkgsrc/trunk]: pkgsrc/biology/chemtool Disable gnome support explicitly. Ot...
Indexes:
Home | Main Index | Thread Index | Old Index