From: Pietro C. <ga...@ga...> - 2013-05-16 07:22:26
|
On 2013-May-15, 13:15, Donald G Porter wrote: > > configure is a generated file. We wouldn't patch that, but would > patch the generating machinery. Fair enough. In addition to fixing the TCL_SHLIB_LD_EXTRAS definition, I have also removed support for long gone versions of FreeBSD and NetBSD. Please feel free to consider the two chunks separately. --- tcl.m4.orig 2013-05-16 09:19:55.000000000 +0200 +++ tcl.m4 2013-05-16 09:20:25.000000000 +0200 @@ -1481,32 +1481,6 @@ CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - NetBSD-1.*|FreeBSD-[[1-2]].*) - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - AS_IF([test $doRpath = yes], [ - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}']) - AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ - AC_EGREP_CPP(yes, [ -#ifdef __ELF__ - yes -#endif - ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)]) - AS_IF([test $tcl_cv_ld_elf = yes], [ - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' - ], [ - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' - ]) - - # Ancient FreeBSD doesn't handle version numbers with dots. - - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; OpenBSD-*) arch=`arch -s` case "$arch" in @@ -1558,9 +1532,8 @@ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' TCL_LIB_VERSIONS_OK=nodots ;; - NetBSD-*|FreeBSD-[[3-4]].*) - # FreeBSD 3.* and greater have ELF. - # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs + NetBSD-*) + # NetBSD has ELF and can use 'cc -shared' to build shared libs SHLIB_CFLAGS="-fPIC" SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' SHLIB_SUFFIX=".so" @@ -1589,7 +1562,7 @@ # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" - TCL_SHLIB_LD_EXTRAS="-soname \$[@]" + TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" Thanks, > > On 05/15/2013 11:22 AM, Pietro Cerutti wrote: > > Going with the flow, I thought I'd post a patch we use in FreeBSD that > > could be happily applied upstream... > > > > --- unix/configure.orig 2012-12-21 14:28:04.000000000 +0100 > > +++ unix/configure 2012-12-21 14:28:22.000000000 +0100 > > @@ -7913,7 +7913,7 @@ > > # This configuration from FreeBSD Ports. > > SHLIB_CFLAGS="-fPIC" > > SHLIB_LD="${CC} -shared" > > - TCL_SHLIB_LD_EXTRAS="-soname \$@" > > + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" > > SHLIB_SUFFIX=".so" > > DL_OBJS="tclLoadDl.o" > > DL_LIBS="" > > > > Thanks, > > > > > -- > | Don Porter Applied and Computational Mathematics Division | > | don...@ni... Information Technology Laboratory | > | http://math.nist.gov/~DPorter/ NIST | > |______________________________________________________________________| > > ------------------------------------------------------------------------------ > AlienVault Unified Security Management (USM) platform delivers complete > security visibility with the essential security capabilities. Easily and > efficiently configure, manage, and operate all of your security controls > from a single console and one unified framework. Download a free trial. > http://p.sf.net/sfu/alienvault_d2d > _______________________________________________ > Tcl-Core mailing list > Tcl...@li... > https://lists.sourceforge.net/lists/listinfo/tcl-core -- Pietro Cerutti ga...@ga... PGP Public Key: http://gahr.ch/pgp |