mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-18 06:21:18 +02:00
78 lines
2.8 KiB
Plaintext
78 lines
2.8 KiB
Plaintext
--- ./configure.orig 2007-09-21 20:07:02.000000000 +0300
|
|
+++ ./configure 2010-10-08 00:55:03.000000000 +0300
|
|
@@ -3434,28 +3434,29 @@
|
|
FreeBSD-*)
|
|
# FreeBSD 3.* and greater have ELF.
|
|
SHLIB_CFLAGS="-fPIC"
|
|
- SHLIB_LD="ld -Bshareable -x"
|
|
+# SHLIB_LD="ld -Bshareable -x"
|
|
+ SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
|
|
SHLIB_LD_LIBS='${LIBS}'
|
|
- SHLIB_SUFFIX=".so"
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS=""
|
|
- LDFLAGS="$LDFLAGS -export-dynamic"
|
|
+ SHLIB_SUFFIX=".so"
|
|
+
|
|
+# LDFLAGS="$LDFLAGS -export-dynamic"
|
|
+# CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
+# LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
|
|
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
|
|
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
|
|
if test "${TCL_THREADS}" = "1" ; then
|
|
# The -pthread needs to go in the CFLAGS, not LIBS
|
|
LIBS=`echo $LIBS | sed s/-pthread//`
|
|
CFLAGS="$CFLAGS -pthread"
|
|
LDFLAGS="$LDFLAGS -pthread"
|
|
fi
|
|
- case $system in
|
|
- FreeBSD-3.*)
|
|
- # 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'
|
|
- TCL_LIB_VERSIONS_OK=nodots
|
|
- ;;
|
|
- esac
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+# SHARED_LIB_SUFFIX='\$\{DBGX\}.so'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
+ LDFLAGS="$LDFLAGS -export-dynamic"
|
|
;;
|
|
Darwin-*)
|
|
CFLAGS_OPTIMIZE="-Os"
|
|
@@ -9150,7 +9151,7 @@
|
|
DBGX='${TCL_DBGX}'
|
|
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
|
|
|
|
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
|
|
+TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
|
|
PRIVATE_INCLUDE_DIR='$(includedir)'
|
|
HTML_DIR='$(DISTDIR)/html'
|
|
|
|
@@ -9242,9 +9243,9 @@
|
|
eval libdir="$libdir"
|
|
if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
|
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
|
- TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
|
|
+ TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
|
|
else
|
|
- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
|
|
+ TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
|
|
fi
|
|
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
|
|
TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
|
|
@@ -9298,9 +9299,9 @@
|
|
eval "TCL_STUB_LIB_DIR=${libdir}"
|
|
|
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
|
- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
|
|
+ TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
|
|
else
|
|
- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
|
|
+ TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
|
|
fi
|
|
|
|
TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
|