Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BFD support on OpenBSD

master
Sébastien Hinderer 2019-11-22 15:47:07 +01:00
parent d3ea75e831
commit 69316099b0
4 changed files with 38 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -450,7 +450,7 @@ OCaml 4.10.0
- #8843, #8841: fix use of off_t on 32-bit systems.
(Stephen Dolan, report by Richard Jones, review by Xavier Leroy)
- #8947: fix/improve support for the BFD library
- #8947, #9134: fix/improve support for the BFD library
(Sébastien Hinderer, review by Damien Doligez)
- #8951: let make's default target build the compiler

70
configure vendored
View File

@ -15954,6 +15954,13 @@ if test x"$with_bfd" != "xno"; then :
fi
if test -z "$BFD_LIB_DIR"; then :
BFD_LIB_DIR="/opt/local/lib"
fi ;; #(
*-*openbsd*) :
if test -z "$BFD_INCLUDE_DIR"; then :
BFD_INCLUDE_DIR="/usr/local/include"
fi
if test -z "$BFD_LIB_DIR"; then :
BFD_LIB_DIR="/usr/local/lib"
fi ;; #(
*) :
;;
@ -16012,13 +16019,14 @@ if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
fi
if test -z "$bfd_ldlibs"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
unset ac_cv_lib_bfd_bfd_openr
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbfd -ldl $LIBS"
LIBS="-lbfd -liberty $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -16049,18 +16057,19 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
bfd_ldlibs="-lbfd -ldl"
bfd_ldlibs="-lbfd -liberty"
fi
fi
if test -z "$bfd_ldlibs"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
unset ac_cv_lib_bfd_bfd_openr
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbfd -ldl -liberty $LIBS"
LIBS="-lbfd -liberty -lz $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -16091,18 +16100,19 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
bfd_ldlibs="-lbfd -ldl -liberty"
bfd_ldlibs="-lbfd -liberty -lz"
fi
fi
if test -z "$bfd_ldlibs"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
unset ac_cv_lib_bfd_bfd_openr
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbfd -ldl -liberty -lz $LIBS"
LIBS="-lbfd -liberty -lz -lintl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -16133,49 +16143,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
bfd_ldlibs="-lbfd -ldl -liberty -lz"
fi
fi
if test -z "$bfd_ldlibs"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbfd -ldl -liberty -lz -lintl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char bfd_openr ();
int
main ()
{
return bfd_openr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bfd_bfd_openr=yes
else
ac_cv_lib_bfd_bfd_openr=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
bfd_ldlibs="-lbfd -ldl -liberty -lz -lintl"
bfd_ldlibs="-lbfd -liberty -lz -lintl"
fi
fi

26
configure.ac
View File

@ -1496,7 +1496,12 @@ AS_IF([test x"$with_bfd" != "xno"],
[AS_IF([test -z "$BFD_INCLUDE_DIR"],
[BFD_INCLUDE_DIR="/opt/local/include"])
AS_IF([test -z "$BFD_LIB_DIR"],
[BFD_LIB_DIR="/opt/local/lib"])])
[BFD_LIB_DIR="/opt/local/lib"])],
[*-*openbsd*],
[AS_IF([test -z "$BFD_INCLUDE_DIR"],
[BFD_INCLUDE_DIR="/usr/local/include"])
AS_IF([test -z "$BFD_LIB_DIR"],
[BFD_LIB_DIR="/usr/local/lib"])])
AS_IF([test -n "$BFD_INCLUDE_DIR"],
[bfd_cppflags="-I$BFD_INCLUDE_DIR"])
AS_IF([test -n "$BFD_LIB_DIR"],
@ -1509,17 +1514,18 @@ AS_IF([test x"$with_bfd" != "xno"],
[bfd_ldlibs=""
AC_CHECK_LIB([bfd], [bfd_openr], [bfd_ldlibs="-lbfd"])
AS_IF([test -z "$bfd_ldlibs"],
[AC_CHECK_LIB([bfd], [bfd_openr], [bfd_ldlibs="-lbfd -ldl"], [], [-ldl])])
[unset ac_cv_lib_bfd_bfd_openr
AC_CHECK_LIB([bfd], [bfd_openr],
[bfd_ldlibs="-lbfd -liberty"], [], [-liberty])])
AS_IF([test -z "$bfd_ldlibs"],
[AC_CHECK_LIB([bfd], [bfd_openr],
[bfd_ldlibs="-lbfd -ldl -liberty"], [], [-ldl -liberty])])
[unset ac_cv_lib_bfd_bfd_openr
AC_CHECK_LIB([bfd], [bfd_openr],
[bfd_ldlibs="-lbfd -liberty -lz"], [], [-liberty -lz])])
AS_IF([test -z "$bfd_ldlibs"],
[AC_CHECK_LIB([bfd], [bfd_openr],
[bfd_ldlibs="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])])
AS_IF([test -z "$bfd_ldlibs"],
[AC_CHECK_LIB([bfd], [bfd_openr],
[bfd_ldlibs="-lbfd -ldl -liberty -lz -lintl"], [],
[-ldl -liberty -lz -lintl])])
[unset ac_cv_lib_bfd_bfd_openr
AC_CHECK_LIB([bfd], [bfd_openr],
[bfd_ldlibs="-lbfd -liberty -lz -lintl"], [],
[-liberty -lz -lintl])])
AS_IF([test -n "$bfd_ldlibs"],
[bfd_available=true
AC_DEFINE([HAS_LIBBFD])])])

2
tools/ci/inria/main
View File

@ -112,6 +112,8 @@ case $NODE_NAME in
ocaml-ppc-64)
CCOMP="CC='gcc -m64'"
OCAML_CONFIGURE_OPTIONS=;;
ocaml-openbsd-64)
OCAML_CONFIGURE_OPTIONS='--with-bfd'
esac
#########################################################################