Tk Source Code

Artifact [10bbae8e]
Login

Artifact 10bbae8e9a2d5425d4b25e44b7186e8c5c469fd2:

Attachment "rpath.diff" to ticket [2534237f] added by egavilan 2009-01-25 08:47:24.
--- unix/tcl.m4.orig	2009-01-24 22:56:10.000000000 -0200
+++ unix/tcl.m4	2009-01-24 23:05:59.000000000 -0200
@@ -2392,6 +2392,13 @@
 	    XLIBSW=-lX11
 	else
 	    XLIBSW="-L$x_libraries -lX11"
+	    # NetBSD systems needs to use rpath to find the libraries at runtime
+	    # as described in http://www.netbsd.org/docs/elf.html
+	    case $system in
+	    NetBSD-*)
+	    	XLIBSW="-L$x_libraries -lX11 -Wl,-rpath=$x_libraries"
+		;;
+	    esac
 	fi
     fi
     if test "$XLIBSW" = nope ; then

--- unix/Makefile.in.orig	2009-01-24 23:13:25.000000000 -0200
+++ unix/Makefile.in	2009-01-24 23:15:30.000000000 -0200
@@ -153,7 +153,7 @@
 # Linker switch(es) to use to link with the X11 library archive (the
 # configure script will try to set this value automatically, but you
 # can override it).
-X11_LIB_SWITCHES	= @XLIBSW@ $(XFT_LIBS)
+X11_LIB_SWITCHES	= $(XFT_LIBS) @XLIBSW@
 
 
 # To turn off the security checks that disallow incoming sends when