diff options
Diffstat (limited to 'x11/tk/patches/patch-ac')
| -rw-r--r-- | x11/tk/patches/patch-ac | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index 7e941b3f491..d839980deae 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,16 +1,16 @@ -$NetBSD: patch-ac,v 1.4 2001/12/23 17:11:30 bjoern Exp $ +$NetBSD: patch-ac,v 1.5 2004/03/08 20:29:43 minskim Exp $ ---- tcl.m4.orig Sat Oct 20 02:24:40 2001 +--- tcl.m4.orig 2003-11-21 14:17:23.000000000 -0600 +++ tcl.m4 -@@ -602,6 +602,7 @@ +@@ -795,6 +795,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ + # Step 3: set configuration options based on system name and version. do64bit_ok=no - fullSrcDir=`cd $srcdir; pwd` + RPATH_FLAG="" EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -915,7 +916,6 @@ +@@ -1207,7 +1220,6 @@ dnl AC_CHECK_TOOL(AR, ar) AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.4 2001/12/23 17:11:30 bjoern Exp $ SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" -@@ -927,11 +927,19 @@ +@@ -1220,11 +1232,19 @@ dnl AC_CHECK_TOOL(AR, ar) #ifdef __ELF__ yes #endif @@ -40,18 +40,8 @@ $NetBSD: patch-ac,v 1.4 2001/12/23 17:11:30 bjoern Exp $ ) ], [ SHLIB_CFLAGS="" -@@ -1130,6 +1138,9 @@ - DL_LIBS="-ldl" - LDFLAGS="" - LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ TCL_LIB_VERSIONS_OK=nodots - ;; - SunOS-5*) - -@@ -1174,6 +1185,9 @@ - else +@@ -1519,6 +1539,9 @@ dnl AC_CHECK_TOOL(AR, ar) + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' @@ -60,7 +50,18 @@ $NetBSD: patch-ac,v 1.4 2001/12/23 17:11:30 bjoern Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -1652,7 +1666,11 @@ +@@ -1703,8 +1726,8 @@ dnl AC_CHECK_TOOL(AR, ar) + + if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then + LIB_SUFFIX=${SHARED_LIB_SUFFIX} +- MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' +- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' ++ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' ++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' + else + LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} + +@@ -2049,7 +2072,11 @@ AC_DEFUN(SC_PATH_X, [ for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then AC_MSG_RESULT($i) @@ -73,7 +74,7 @@ $NetBSD: patch-ac,v 1.4 2001/12/23 17:11:30 bjoern Exp $ x_libraries="$i" break fi -@@ -1661,7 +1679,11 @@ +@@ -2058,7 +2085,11 @@ AC_DEFUN(SC_PATH_X, [ if test "$x_libraries" = ""; then XLIBSW=-lX11 else |