mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
a5861b89df
- change tr to ${TR}
lang/tcl84 only:
- sync MASTER_SITES with other tcl ports
- change sysctl to ${SYSCTL}
Suggested by: stas
Approved by: garga (mentor)
46 lines
1.5 KiB
Plaintext
46 lines
1.5 KiB
Plaintext
--- configure.orig Thu Apr 20 16:42:21 2006
|
|
+++ configure Mon May 1 17:31:03 2006
|
|
@@ -2560,7 +2560,7 @@
|
|
LDFLAGS_ORIG="$LDFLAGS"
|
|
TCL_EXPORT_FILE_SUFFIX=""
|
|
UNSHARED_LIB_SUFFIX=""
|
|
- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
|
|
+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
|
|
ECHO_VERSION='`echo ${VERSION}`'
|
|
TCL_LIB_VERSIONS_OK=ok
|
|
CFLAGS_DEBUG=-g
|
|
@@ -3384,25 +3384,26 @@
|
|
FreeBSD-*)
|
|
# FreeBSD 3.* and greater have ELF.
|
|
SHLIB_CFLAGS="-fPIC"
|
|
- SHLIB_LD="ld -Bshareable -x"
|
|
+ SHLIB_LD="${CC} -shared"
|
|
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
|
|
SHLIB_LD_LIBS='${LIBS}'
|
|
SHLIB_SUFFIX=".so"
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS=""
|
|
- LDFLAGS="$LDFLAGS -export-dynamic"
|
|
+ LDFLAGS=""
|
|
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
|
|
if test "${TCL_THREADS}" = "1" ; then
|
|
- # The -pthread needs to go in the CFLAGS, not LIBS
|
|
+ # The -pthread needs to go in the LDFLAGS, not LIBS
|
|
LIBS=`echo $LIBS | sed s/-pthread//`
|
|
- CFLAGS="$CFLAGS -pthread"
|
|
- LDFLAGS="$LDFLAGS -pthread"
|
|
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
|
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
|
|
fi
|
|
case $system in
|
|
- FreeBSD-3.*)
|
|
+ FreeBSD-*)
|
|
# FreeBSD-3 doesn't handle version numbers with dots.
|
|
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
|
|
TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
esac
|