diff options
Diffstat (limited to 'lang/tcl/patches/patch-aa')
| -rw-r--r-- | lang/tcl/patches/patch-aa | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa index 02792c4ae18..d4458f75334 100644 --- a/lang/tcl/patches/patch-aa +++ b/lang/tcl/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $ +$NetBSD: patch-aa,v 1.18 2007/10/13 11:41:44 adam Exp $ ---- unix/Makefile.in.orig 2006-10-19 19:26:15.000000000 +0200 +--- unix/Makefile.in.orig 2007-09-21 19:07:02.000000000 +0200 +++ unix/Makefile.in @@ -185,8 +185,8 @@ SHELL = /bin/sh INSTALL_STRIP_PROGRAM = -s @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $ #TCL_LIB_FILE = libtcl.a # Generic lib name used in rules that apply to tcl and tk -@@ -266,8 +267,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest +@@ -267,8 +268,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 @@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $ # Flags to be passed to installManPage to control whether the manpages # should be compressed and linked with softlinks -@@ -463,7 +465,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NO +@@ -469,7 +471,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NO all: binaries libraries doc @@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $ libraries: -@@ -471,7 +473,7 @@ doc: +@@ -477,7 +479,7 @@ doc: # The following target is configured by autoconf to generate either # a shared library or non-shared library for Tcl. @@ -59,18 +59,18 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $ rm -f $@ @MAKE_LIB@ -@@ -491,8 +493,8 @@ tclLibObjs: +@@ -497,8 +499,8 @@ tclLibObjs: objs: ${OBJS} -tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} -- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ +- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ +tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE} -+ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ ++ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ ${CC_SEARCH_FLAGS} -o tclsh # Resetting the LIB_RUNTIME_DIR below is required so that -@@ -500,11 +502,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} +@@ -506,11 +508,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. @@ -79,12 +79,12 @@ $NetBSD: patch-aa,v 1.17 2006/11/02 17:41:23 adam Exp $ $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd` tcltest-real: -- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ -+ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ +- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ ++ ${LD} ${CFLAGS} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ ${CC_SEARCH_FLAGS} -o tcltest # Note, in the target below TCL_LIBRARY needs to be set or else -@@ -1101,7 +1103,7 @@ tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMac +@@ -1118,7 +1120,7 @@ $(DTRACE_OBJ): $(DTRACE_SRC) $(TCL_OBJS) xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \ @DL_OBJS@ ${BUILD_DLTEST} |