summaryrefslogtreecommitdiff
path: root/lang/tcl/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl/patches')
-rw-r--r--lang/tcl/patches/patch-aa85
-rw-r--r--lang/tcl/patches/patch-ab35
-rw-r--r--lang/tcl/patches/patch-ac44
3 files changed, 164 insertions, 0 deletions
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
new file mode 100644
index 00000000000..20e8a6d69d5
--- /dev/null
+++ b/lang/tcl/patches/patch-aa
@@ -0,0 +1,85 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/08/24 19:53:33 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 @@
+ # "install" around; better to use the install-sh script that comes
+ # with the distribution, which is slower but guaranteed to work.
+
+-INSTALL = @srcdir@/install-sh -c
+-INSTALL_PROGRAM = ${INSTALL}
++INSTALL := ${LIBTOOL} --mode=install @srcdir@/install-sh -c
++INSTALL_PROGRAM = ${INSTALL} -s
+ INSTALL_DATA = ${INSTALL} -m 644
+
+ # The following specifies which Tcl executable to use for make targets
+@@ -178,8 +178,8 @@
+ # configure script. You shouldn't normally need to modify any of
+ # these definitions by hand.
+
+-STLIB_LD = @STLIB_LD@
+-SHLIB_LD = @SHLIB_LD@
++STLIB_LD = ${LIBTOOL} --mode=link @CC@
++SHLIB_LD = ${LIBTOOL} --mode=link @CC@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+
+ SHLIB_SUFFIX = @SHLIB_SUFFIX@
+@@ -198,7 +198,7 @@
+ TCL_LIB_FILE = @TCL_LIB_FILE@
+ #TCL_LIB_FILE = libtcl.a
+
+-TCL_LIB_FLAG = @TCL_LIB_FLAG@
++TCL_LIB_FLAG = libtcl83.la
+ #TCL_LIB_FLAG = -ltcl
+
+ TCL_EXP_FILE = @TCL_EXP_FILE@
+@@ -226,7 +226,8 @@
+ TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library
+
+ #CC = purify -best-effort @CC@
+-CC = @CC@
++CC = ${LIBTOOL} --mode=compile @CC@
++LD = ${LIBTOOL} --mode=link @CC@
+
+ #----------------------------------------------------------------
+ # The information below should be usable as is. The configure
+@@ -428,11 +429,11 @@
+
+
+ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+- ${CC} @LDFLAGS@ ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++ ${LD} @LDFLAGS@ ${TCLSH_OBJS} libtcl83.la ${LIBS} \
+ @TCL_LD_SEARCH_FLAGS@ -o tclsh
+
+ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
+- ${CC} @LDFLAGS@ ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++ ${LD} @LDFLAGS@ ${TCLTEST_OBJS} libtcl83.la ${LIBS} \
+ @TCL_LD_SEARCH_FLAGS@ -o tcltest
+
+
+@@ -522,7 +523,7 @@
+ chmod +x $(SRC_DIR)/install-sh; \
+ 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)
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
+ @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+@@ -646,7 +647,7 @@
+ makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
+
+ bp: $(UNIX_DIR)/bp.c
+- $(CC) $(CC_SWITCHES) $(UNIX_DIR)/bp.c -o bp
++ $(LD) $(CC_SWITCHES) $(UNIX_DIR)/bp.c -o bp
+
+ # Test binaries. The rules for tclTestInit.o and xtTestInit.o are
+ # complicated because they are compiled from tclAppInit.c. Can't use
+@@ -956,7 +957,7 @@
+
+ xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
+ @DL_OBJS@ ${BUILD_DLTEST}
+- ${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
++ ${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
+ @DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+ @TCL_LD_SEARCH_FLAGS@ -L/usr/openwin/lib -lXt -o xttest
+
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
new file mode 100644
index 00000000000..a528ef2b83c
--- /dev/null
+++ b/lang/tcl/patches/patch-ab
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
+--- configure.orig Tue Aug 8 15:17:11 2000
++++ configure Thu Aug 24 12:03:49 2000
+@@ -5070,8 +5070,8 @@
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS=""
+- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ LDFLAGS="-version-info 1:0"
++ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ echo $ac_n "checking for ELF""... $ac_c" 1>&6
+ echo "configure:5077: checking for ELF" >&5
+ cat > conftest.$ac_ext <<EOF
+@@ -5789,7 +5789,7 @@
+ if test "x$DL_OBJS" = "xtclLoadAout.o"; then
+ 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} -rpath ${PREFIX}/lib -version-info 1:0"
+ RANLIB=":"
+ fi
+ else
+@@ -5859,9 +5859,9 @@
+ #--------------------------------------------------------------------
+
+ if test "$prefix" != "$exec_prefix"; then
+- TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
++ TCL_PACKAGE_PATH="${exec_prefix}/lib/tcl ${prefix}/lib/tcl"
+ else
+- TCL_PACKAGE_PATH="${prefix}/lib"
++ TCL_PACKAGE_PATH="${prefix}/lib/tcl"
+ fi
+
+ #--------------------------------------------------------------------
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
new file mode 100644
index 00000000000..bbdbc47a5ce
--- /dev/null
+++ b/lang/tcl/patches/patch-ac
@@ -0,0 +1,44 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
+--- tclUnixInit.c.orig Mon Aug 7 17:31:12 2000
++++ tclUnixInit.c Thu Aug 24 14:24:13 2000
+@@ -22,6 +22,11 @@
+ # include <dlfcn.h>
+ # endif
+ #endif
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/utsname.h>
++#endif
+
+ /*
+ * The Init script (common to Windows and Unix platforms) is
+@@ -531,6 +536,11 @@
+ int unameOK;
+ char *user;
+ Tcl_DString ds;
++#if defined(__NetBSD__)
++ char machine_arch[SYS_NMLN];
++ int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
++ size_t len = sizeof(machine_arch);
++#endif
+
+ Tcl_SetVar(interp, "tclDefaultLibrary", defaultLibraryDir, TCL_GLOBAL_ONLY);
+ Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
+@@ -566,8 +576,16 @@
+ Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
+ TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
+ }
++#if defined(__NetBSD__)
++ if (sysctl(mib, sizeof(mib) / sizeof(int), machine_arch, &len, NULL, 0) < 0)
++ unameOK = 0;
++ else
++ Tcl_SetVar2(interp, "tcl_platform", "machine", machine_arch,
++ TCL_GLOBAL_ONLY);
++#else
+ Tcl_SetVar2(interp, "tcl_platform", "machine", name.machine,
+ TCL_GLOBAL_ONLY);
++#endif
+ }
+ #endif
+ if (!unameOK) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 03:56:40 +0000