diff options
| author | jlam <jlam> | 2001-05-24 02:58:15 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-05-24 02:58:15 +0000 |
| commit | fa20ea6756eb6aa683d64cd9c5a7177f2f64d1df (patch) | |
| tree | 495393ace765a7734b3aaeaf29ee8f22ac6f3075 /lang/tcl/patches/patch-af | |
| parent | b799506e8a71184226e7026bb269197240e5aa1e (diff) | |
| download | pkgsrc-fa20ea6756eb6aa683d64cd9c5a7177f2f64d1df.tar.gz | |
Fix the installed tclConfig.sh so it's possible to use its values to generate
a shared library that depends on libtcl83.so. The TCL_SHLIB_LD command was
set to the incorrect value for ELF platforms, relying on "ld" which doesn't
understand the -Wl,... options it receives via ${TCL_LIB_SPEC}. Patch the
configure script to set TCL_SHLIB_LD to the proper value on NetBSD systems
depending on whether they are ELF or a.out, and also modify TCL_LIB_SPEC
to include -Wl,-rpath,... or -R... accordingly.
Bump version number to 8.3.2nb2.
Diffstat (limited to 'lang/tcl/patches/patch-af')
| -rw-r--r-- | lang/tcl/patches/patch-af | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af new file mode 100644 index 00000000000..9c9af8da547 --- /dev/null +++ b/lang/tcl/patches/patch-af @@ -0,0 +1,47 @@ +$NetBSD: patch-af,v 1.1 2001/05/24 02:58:16 jlam Exp $ + +--- tcl.m4.orig Tue Aug 8 15:17:11 2000 ++++ tcl.m4 +@@ -595,6 +595,7 @@ + + do64bit_ok=no + fullSrcDir=`cd $srcdir; pwd` ++ TCL_LIB_SPEC_RPATH="" + EXTRA_CFLAGS="" + TCL_EXPORT_FILE_SUFFIX="" + UNSHARED_LIB_SUFFIX="" +@@ -794,24 +795,29 @@ + AC_CHECK_HEADER(dlfcn.h, [ + # NetBSD/SPARC needs -fPIC, -fpic will not do. + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" +- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + AC_MSG_CHECKING(for ELF) + AC_EGREP_CPP(yes, [ + #ifdef __ELF__ + yes + #endif +- ], ++ ], [ + AC_MSG_RESULT(yes) +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', ++ SHLIB_LD='${TCL_CC} -shared -Wl,-x' ++ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ TCL_LIB_SPEC_RPATH='-Wl,-rpath,${exec_prefix}/lib' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ ], [ + AC_MSG_RESULT(no) ++ SHLIB_LD="ld -Bshareable -x" ++ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' ++ TCL_LIB_SPEC_RPATH='-R${exec_prefix}/lib' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' +- ) ++ ]) + ], [ + SHLIB_CFLAGS="" + SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" |