luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify OpenBSD shared lib handling

This commit is contained in:
Brad Smith 2022-08-05 23:03:35 -04:00 committed by Tim Edwards
parent e4f6926ac0
commit 0bfb7c80d3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/configure vendored
View File

@ -8116,7 +8116,7 @@ fi
LDDL_FLAGS="-shared ${LIB_SPECS}" LDDL_FLAGS="-shared ${LIB_SPECS}"
;; ;;
*-netbsd*|*-openbsd*) *-netbsd*)
# Not available on all versions: check for include file. # Not available on all versions: check for include file.
ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
if test "x$ac_cv_header_dlfcn_h" = xyes; then : if test "x$ac_cv_header_dlfcn_h" = xyes; then :
@ -8132,6 +8132,11 @@ fi
fi fi
;; ;;
*-openbsd*)
SHLIB_CFLAGS="-fPIC"
LDDL_FLAGS="-shared ${LIB_SPEC}"
;;
*-nextstep*) *-nextstep*)
LDDL_FLAGS="-nostdlib -r" LDDL_FLAGS="-nostdlib -r"
;; ;;

7
scripts/configure.in
View File

@ -1643,7 +1643,7 @@ if test $usingTcl ; then
LDDL_FLAGS="-shared ${LIB_SPECS}" LDDL_FLAGS="-shared ${LIB_SPECS}"
;; ;;
*-netbsd*|*-openbsd*) *-netbsd*)
# Not available on all versions: check for include file. # Not available on all versions: check for include file.
AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no) AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
if test "$test_ok" = yes; then if test "$test_ok" = yes; then
@ -1652,6 +1652,11 @@ if test $usingTcl ; then
fi fi
;; ;;
*-openbsd*)
SHLIB_CFLAGS="-fPIC"
LDDL_FLAGS="-shared ${LIB_SPEC}"
;;
*-nextstep*) *-nextstep*)
LDDL_FLAGS="-nostdlib -r" LDDL_FLAGS="-nostdlib -r"
;; ;;