diff options
| author | jwise <jwise@pkgsrc.org> | 2000-09-01 16:20:47 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2000-09-01 16:20:47 +0000 |
| commit | a14829cb4f7884290467876ea3b79dba2323425f (patch) | |
| tree | 428492eb06934f89c5b939bb030b0e4d245c6198 /lang | |
| parent | 24194345b9506995d2ac14c1be4645ffbe127ae9 (diff) | |
| download | pkgsrc-a14829cb4f7884290467876ea3b79dba2323425f.tar.gz | |
Since the configure script comes up with different shared lib suffixes on
different versions/platforms of NetBSD, use
$(TCL_LIB_FILE:C/\.so.*/.la/)
instead of
$(TCL_LIB_FILE:.so=.la)
to derive the libtool archive name from the shared library name.
From Frederick Bruckman, addresses PR pkg/10924.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl/files/patch-sum | 7 | ||||
| -rw-r--r-- | lang/tcl/patches/patch-aa | 4 | ||||
| -rw-r--r-- | lang/tcl/patches/patch-ab | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/lang/tcl/files/patch-sum b/lang/tcl/files/patch-sum index 5a65df9e9b8..ab34cc237c0 100644 --- a/lang/tcl/files/patch-sum +++ b/lang/tcl/files/patch-sum @@ -1,5 +1,4 @@ -$NetBSD: patch-sum,v 1.4 2000/08/29 18:27:44 jwise Exp $ +$NetBSD: patch-sum,v 1.5 2000/09/01 16:20:47 jwise Exp $ -MD5 (patch-aa) = b1eb7d53df863592cbf1b0aecd3e7c7c -MD5 (patch-ab) = c0c72f16a2536788a610785d3d7ed222 -MD5 (patch-ac) = 6d7acb944f0ffc6111cd9a250b4ecea2 +MD5 (patch-aa) = 4e74e788c15c257293ca4aa4b81b365e +MD5 (patch-ab) = afbb4d55085117146c566c6f4b840793 diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa index 81f0402cee1..0719b8168c4 100644 --- a/lang/tcl/patches/patch-aa +++ b/lang/tcl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2000/08/29 15:13:44 jwise Exp $ +$NetBSD: patch-aa,v 1.3 2000/09/01 16:20:47 jwise Exp $ --- Makefile.in.orig Tue Aug 8 15:17:11 2000 +++ Makefile.in Thu Aug 24 12:01:11 2000 @@ -161,8 +161,8 @@ @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2000/08/29 15:13:44 jwise Exp $ fi @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @$(INSTALL_DATA) $(TCL_LIB_FILE:.so=.la) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) ++ @$(INSTALL_DATA) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index b66f28c8ebd..68bfba17f36 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2000/08/29 20:23:59 jwise Exp $ +$NetBSD: patch-ab,v 1.6 2000/09/01 16:20:47 jwise Exp $ --- configure.orig Tue Aug 8 15:17:11 2000 +++ configure Tue Aug 29 14:15:41 2000 @@ -5789,7 +5789,7 @@ @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2000/08/29 20:23:59 jwise Exp $ MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}" else - MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" -+ MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE:.so=.la} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0" ++ MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0" RANLIB=":" fi else |