mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 01:38:07 -04:00
74 lines
2.4 KiB
Plaintext
74 lines
2.4 KiB
Plaintext
--- pkgs/sqlite3.8.0/configure.orig Tue Aug 27 18:50:58 2013
|
|
+++ pkgs/sqlite3.8.0/configure Fri Apr 18 10:59:17 2014
|
|
@@ -6473,7 +6473,6 @@ fi
|
|
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
fi
|
|
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
|
|
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
|
|
$as_echo_n "checking for ELF... " >&6; }
|
|
if ${tcl_cv_ld_elf+:} false; then :
|
|
@@ -6518,7 +6517,7 @@ fi
|
|
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
|
TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
- NetBSD-*|FreeBSD-[3-4].*)
|
|
+ Minix-*|NetBSD-*|FreeBSD-[3-4].*)
|
|
# FreeBSD 3.* and greater have ELF.
|
|
# NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
|
|
SHLIB_CFLAGS="-fPIC"
|
|
@@ -6547,17 +6546,17 @@ fi
|
|
;;
|
|
esac
|
|
;;
|
|
- FreeBSD-*)
|
|
+ FreeBSD-*|DragonFly-*)
|
|
# 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"
|
|
LDFLAGS=""
|
|
if test $doRpath = yes; then :
|
|
|
|
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
|
|
+ LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}'
|
|
fi
|
|
if test "${TCL_THREADS}" = "1"; then :
|
|
|
|
@@ -6567,10 +6566,10 @@ fi
|
|
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
|
|
fi
|
|
# Version numbers are dot-stripped by system policy.
|
|
- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
|
|
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
|
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
|
|
- TCL_LIB_VERSIONS_OK=nodots
|
|
+# TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
|
|
+# UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
|
|
+# SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
|
|
+# TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
Darwin-*)
|
|
CFLAGS_OPTIMIZE="-Os"
|
|
@@ -7134,7 +7133,7 @@ fi
|
|
BSD/OS*) ;;
|
|
CYGWIN_*) ;;
|
|
IRIX*) ;;
|
|
- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
|
|
+ Minix-*|NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
|
|
Darwin-*) ;;
|
|
SCO_SV-3.2*) ;;
|
|
windows) ;;
|
|
@@ -8465,6 +8464,8 @@ do
|
|
case $ac_option in
|
|
# Handling of the options.
|
|
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
|
+ : Avoid regenerating within pkgsrc
|
|
+ exit 0
|
|
ac_cs_recheck=: ;;
|
|
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
|
$as_echo "$ac_cs_version"; exit ;;
|