diff options
Diffstat (limited to 'x11/tk/patches')
| -rw-r--r-- | x11/tk/patches/patch-aa | 80 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ab | 41 |
2 files changed, 121 insertions, 0 deletions
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa new file mode 100644 index 00000000000..eba016b234c --- /dev/null +++ b/x11/tk/patches/patch-aa @@ -0,0 +1,80 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/08/29 16:16:07 jwise Exp $ +--- Makefile.in.orig Mon Aug 28 23:29:09 2000 ++++ Makefile.in Mon Aug 28 23:34:09 2000 +@@ -76,7 +76,7 @@ + # The directory containing the Tcl sources and headers appropriate + # for this version of Tk ("srcdir" will be replaced or has already + # been replaced by the configure script): +-TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic ++TCL_GENERIC_DIR = ${PREFIX}/include/tcl/generic + + # The directory containing the Tcl library archive file appropriate + # for this version of Tk: +@@ -154,8 +154,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 +@@ -203,7 +203,7 @@ + # libraries. See configure.in for a description of what it means. + # The values of the symbolis normally set by the configure script. + +-SHLIB_LD = @SHLIB_LD@ ++SHLIB_LD = ${LIBTOOL} --mode=link @CC@ + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + + # Additional search flags needed to find the various shared libraries +@@ -233,11 +233,12 @@ + # either. + #---------------------------------------------------------------- + +-CC = @CC@ ++CC = ${LIBTOOL} --mode=compile @CC@ ++LD = ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib + + CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ + -I${UNIX_DIR} -I${GENERIC_DIR} \ +--I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \ ++-I${BMAP_DIR} -I${TCL_GENERIC_DIR} -I${PREFIX}/include ${X11_INCLUDES} \ + ${AC_FLAGS} ${PROTO_FLAGS} \ + ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} + +@@ -389,7 +390,7 @@ + + + wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) +- $(CC) @LDFLAGS@ $(WISH_OBJS) \ ++ $(LD) @LDFLAGS@ $(WISH_OBJS) \ + @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish + +@@ -400,12 +401,12 @@ + make tcltest + + tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE) +- ${CC} @LDFLAGS@ $(TKTEST_OBJS) \ ++ ${LD} @LDFLAGS@ $(TKTEST_OBJS) \ + @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest + + xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) +- ${CC} @LDFLAGS@ test.o tkTest.o tkSquare.o \ ++ ${LD} @LDFLAGS@ test.o tkTest.o tkSquare.o \ + @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest + +@@ -456,7 +457,7 @@ + chmod +x $(UNIX_DIR)/mkLinks; \ + fi + @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" +- @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) ++ @$(INSTALL_DATA) $(TK_LIB_FILE:.so=.la) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) + @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab new file mode 100644 index 00000000000..c90efc4081a --- /dev/null +++ b/x11/tk/patches/patch-ab @@ -0,0 +1,41 @@ +$NetBSD: patch-ab,v 1.1.1.1 2000/08/29 16:16:07 jwise Exp $ +--- configure.orig Tue Aug 8 15:19:32 2000 ++++ configure Tue Aug 29 10:06:15 2000 +@@ -3338,7 +3338,7 @@ + for i in $dirs ; do + if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then + echo "$ac_t""$i" 1>&6 +- XLIBSW="-L$i -lX11" ++ XLIBSW="-L$i -Wl,-R$i -lX11" + x_libraries="$i" + break + fi +@@ -3347,7 +3347,7 @@ + if test "$x_libraries" = ""; then + XLIBSW=-lX11 + else +- XLIBSW="-L$x_libraries -lX11" ++ XLIBSW="-L$x_libraries -Wl,-R$x_libraries -lX11" + fi + fi + if test "$XLIBSW" = nope ; then +@@ -4088,7 +4088,7 @@ + if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then + TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" + TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} +- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}" ++ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:.so=.la} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS} -version-info 1:0" + RANLIB=":" + + # TCL_STUB_FLAGS="-DUSE_TCL_STUBS" +@@ -4114,8 +4114,8 @@ + else + eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + fi +- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" +- TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" ++ TK_BUILD_LIB_SPEC=libtk83.la ++ TK_LIB_SPEC="-L${exec_prefix}/lib -Wl,R${exec_prefix}/lib ${TK_LIB_FLAG}" + TK_BUILD_EXP_FILE="" + TK_EXP_FILE="" + else |