diff options
| author | marino <marino@pkgsrc.org> | 2012-08-22 22:05:05 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-22 22:05:05 +0000 |
| commit | e2df4b646f4b90718a86c3a006a7420bbe5f094e (patch) | |
| tree | 039de5c60a7a45bd80d97d08329638c3f1d33276 /x11/tk/patches | |
| parent | bd9a921bcc91b11b31c071e2f3cd5716de81d3bd (diff) | |
| download | pkgsrc-e2df4b646f4b90718a86c3a006a7420bbe5f094e.tar.gz | |
x11/tk: Ensure tkConfig.sh has embedded rpath
The version of the new tk package had some problems.
- The x11 paths weren't coming through
- The tkConfig.sh utility was missing runpath definition for TK_LIB_SPEC
- Threading was automatically selected
The X11 problem was fixed with addition CONFIGURE_ARGS
The runpath for TK_LIB_SPEC was added in the configure patch
An options.mk file was added based on the tcl version.
Problems found and fixes suggested by he@
Diffstat (limited to 'x11/tk/patches')
| -rw-r--r-- | x11/tk/patches/patch-unix_configure | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure index a98f50a328b..40d008b2309 100644 --- a/x11/tk/patches/patch-unix_configure +++ b/x11/tk/patches/patch-unix_configure @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $ +$NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:05:06 marino Exp $ --- unix/configure.orig 2012-07-25 16:45:53.000000000 +0000 +++ unix/configure @@ -78,7 +78,25 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $ fi -@@ -11383,11 +11377,7 @@ _ACEOF +@@ -10358,7 +10352,7 @@ echo $ECHO_N "checking for X11 libraries + if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then + echo "$as_me:$LINENO: result: $i" >&5 + echo "${ECHO_T}$i" >&6 +- XLIBSW="-L$i -lX11" ++ XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11" + x_libraries="$i" + break + fi +@@ -10367,7 +10361,7 @@ echo "${ECHO_T}$i" >&6 + if test "$x_libraries" = ""; then + XLIBSW=-lX11 + else +- XLIBSW="-L$x_libraries -lX11" ++ XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11" + fi + fi + if test "$XLIBSW" = nope ; then +@@ -11383,18 +11377,14 @@ _ACEOF else # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" @@ -91,6 +109,14 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $ TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}" + else + WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}" + fi +- TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" ++ TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}" + fi + + # Support for building the Aqua resource files @@ -11422,11 +11412,7 @@ fi eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" eval "TK_STUB_LIB_DIR=${libdir}" |