diff options
Diffstat (limited to 'x11-toolkits/tk84/files/patch-aa')
| -rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 79 |
1 files changed, 36 insertions, 43 deletions
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index 9938b28f6787..1f33895446d2 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,48 +1,41 @@ ---- configure.orig Fri Apr 30 08:27:45 1999 -+++ configure Mon May 10 00:20:26 1999 -@@ -956,14 +956,14 @@ - withval="$with_tcl" - TCL_BIN_DIR=$withval +--- configure.orig Fri Aug 13 18:06:14 1999 ++++ configure Sat Sep 4 15:22:21 1999 +@@ -1756,7 +1756,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -1788,14 +1788,19 @@ + echo "$ac_t""yes" 1>&6 + + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else -- TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl8.1 - fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } - fi --if test ! -f $TCL_BIN_DIR/Makefile; then -- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } -+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then -+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } - fi - - #-------------------------------------------------------------------- -@@ -1004,6 +1004,8 @@ - CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE - EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS + echo "$ac_t""no" 1>&6 +@@ -2266,6 +2271,7 @@ + echo "$ac_t""no" 1>&6 + fi +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} -+ - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - # If Tcl and Tk are installed in different places, adjust the library -@@ -2450,8 +2452,8 @@ - if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then - TK_SHARED_BUILD=1 - TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" -- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX} -- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}" -+ TK_LIB_FILE=${TK_LIB_FILE} -+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}" - RANLIB=":" + LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" -@@ -2729,6 +2731,7 @@ - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g - s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_DBGX@%$TCL_DBGX%g - s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g |