- fix build on FreeBSD 13-CURRENT
PR: 232502 Submitted by: Kai
This commit is contained in:
parent
afe7379fae
commit
d0a9b751ca
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=482754
4 changed files with 24 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- makedefs.orig 2018-03-07 00:46:20 UTC
|
--- makedefs.orig 2018-08-12 21:35:37 UTC
|
||||||
+++ makedefs
|
+++ makedefs
|
||||||
@@ -296,6 +296,15 @@ case "$SYSTEM.$RELEASE" in
|
@@ -298,6 +298,24 @@ case "$SYSTEM.$RELEASE" in
|
||||||
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
||||||
: ${PLUGIN_LD="${CC} -shared"}
|
: ${PLUGIN_LD="${CC} -shared"}
|
||||||
;;
|
;;
|
||||||
|
@ -12,6 +12,15 @@
|
||||||
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
|
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
|
||||||
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
||||||
+ : ${PLUGIN_LD="${CC} -shared"}
|
+ : ${PLUGIN_LD="${CC} -shared"}
|
||||||
|
+ ;;
|
||||||
|
+ FreeBSD.13*) SYSTYPE=FREEBSD13
|
||||||
|
+ : ${CC=cc}
|
||||||
|
+ : ${SHLIB_SUFFIX=.so}
|
||||||
|
+ : ${SHLIB_CFLAGS=-fPIC}
|
||||||
|
+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
|
||||||
|
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
|
||||||
|
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
||||||
|
+ : ${PLUGIN_LD="${CC} -shared"}
|
||||||
+ ;;
|
+ ;;
|
||||||
DragonFly.*) SYSTYPE=DRAGONFLY
|
DragonFly.*) SYSTYPE=DRAGONFLY
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|
||||||
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
|
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
|
||||||
- || defined(FREEBSD11) \
|
- || defined(FREEBSD11) \
|
||||||
+ || defined(FREEBSD11) || defined(FREEBSD12) \
|
+ || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \
|
||||||
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|
||||||
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|
||||||
|| defined(OPENBSD5) || defined(OPENBSD6) \
|
|| defined(OPENBSD5) || defined(OPENBSD6) \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- makedefs.orig 2016-05-15 16:39:11 UTC
|
--- makedefs.orig 2018-02-03 17:20:46 UTC
|
||||||
+++ makedefs
|
+++ makedefs
|
||||||
@@ -272,6 +272,24 @@ case "$SYSTEM.$RELEASE" in
|
@@ -287,6 +287,33 @@ case "$SYSTEM.$RELEASE" in
|
||||||
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
||||||
: ${PLUGIN_LD="${CC} -shared"}
|
: ${PLUGIN_LD="${CC} -shared"}
|
||||||
;;
|
;;
|
||||||
|
@ -21,6 +21,15 @@
|
||||||
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
|
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
|
||||||
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
||||||
+ : ${PLUGIN_LD="${CC} -shared"}
|
+ : ${PLUGIN_LD="${CC} -shared"}
|
||||||
|
+ ;;
|
||||||
|
+ FreeBSD.13*) SYSTYPE=FREEBSD13
|
||||||
|
+ : ${CC=cc}
|
||||||
|
+ : ${SHLIB_SUFFIX=.so}
|
||||||
|
+ : ${SHLIB_CFLAGS=-fPIC}
|
||||||
|
+ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
|
||||||
|
+ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
|
||||||
|
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
|
||||||
|
+ : ${PLUGIN_LD="${CC} -shared"}
|
||||||
+ ;;
|
+ ;;
|
||||||
DragonFly.*) SYSTYPE=DRAGONFLY
|
DragonFly.*) SYSTYPE=DRAGONFLY
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|
||||||
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|
||||||
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
|
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
|
||||||
+ || defined(FREEBSD11) || defined(FREEBSD12) \
|
+ || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \
|
||||||
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|
||||||
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|
||||||
|| defined(OPENBSD5) || defined(OPENBSD6) \
|
|| defined(OPENBSD5) || defined(OPENBSD6) \
|
||||||
|
|
Loading…
Reference in a new issue