darlinghq/cctools-port
1
0
Fork 0
mirror of https://github.com/darlinghq/cctools-port.git synced 2024-11-27 06:00:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from sezero/tapi-check

Browse Source 
fix and rewrite the tapi.h / libtapi support check
This commit is contained in:
Thomas Pöchtrager 2018-03-20 20:15:59 +01:00 committed by GitHub
commit f53c618639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
cctools/configure vendored
View File

@ -17571,11 +17571,14 @@ if test "x$enable_tapi_support" = "xyes"; then
if test "${with_libtapi+set}" = set; then :
withval=$with_libtapi; LIBTAPI_DIR=$with_libtapi
else
LIBTAPI_DIRECTORY=no
LIBTAPI_DIR=""
fi
if test "x$LIBTAPI_DIR" != "xno"; then
if test "x$LIBTAPI_DIR" = "xno"; then
LIBTAPI_DIR=""
fi
if test "x$LIBTAPI_DIR" != "x"; then
CXXFLAGS="$CXXFLAGS -isystem $LIBTAPI_DIR/include"
CPPFLAGS="$CPPFLAGS -isystem $LIBTAPI_DIR/include"
test -d "$LIBTAPI_DIR/lib" && LDFLAGS="$LDFLAGS -L$LIBTAPI_DIR/lib"
@ -17594,65 +17597,38 @@ if test "x$LIBTAPI_DIR" != "xno"; then
fi
TAPI_LIB=""
# This is awful but still better than messing around with C++
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN4tapi10APIVersion8getMajorEv in -ltapi" >&5
$as_echo_n "checking for _ZN4tapi10APIVersion8getMajorEv in -ltapi... " >&6; }
if ${ac_cv_lib_tapi__ZN4tapi10APIVersion8getMajorEv+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking tapi/tapi.h and libtapi support" >&5
$as_echo_n "checking tapi/tapi.h and libtapi support... " >&6; }
if ${cctools_cv_tapi_support+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltapi $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 _ZN4tapi10APIVersion8getMajorEv ();
int
main ()
{
return _ZN4tapi10APIVersion8getMajorEv ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_tapi__ZN4tapi10APIVersion8getMajorEv=yes
else
ac_cv_lib_tapi__ZN4tapi10APIVersion8getMajorEv=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_tapi__ZN4tapi10APIVersion8getMajorEv" >&5
$as_echo "$ac_cv_lib_tapi__ZN4tapi10APIVersion8getMajorEv" >&6; }
if test "x$ac_cv_lib_tapi__ZN4tapi10APIVersion8getMajorEv" = xyes; then :
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
for ac_header in tapi/tapi.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "tapi/tapi.h" "ac_cv_header_tapi_tapi_h" "$ac_includes_default"
if test "x$ac_cv_header_tapi_tapi_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_TAPI_TAPI_H 1
save_LIBS="$LIBS"
LIBS="$LIBS -ltapi"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <tapi/tapi.h>
int
main ()
{
return tapi::APIVersion::getMajor();
;
return 0;
}
_ACEOF
TAPI_LIB=-ltapi; TAPI_DEF=-DTAPI_SUPPORT
if ac_fn_cxx_try_link "$LINENO"; then :
cctools_cv_tapi_support=yes
else
cctools_cv_tapi_support=no
fi
done
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$save_LIBS"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -17661,12 +17637,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cctools_cv_tapi_support" >&5
$as_echo "$cctools_cv_tapi_support" >&6; }
if test "x$TAPI_LIB" == "x"; then
if test $cctools_cv_tapi_support = yes; then
TAPI_LIB=-ltapi
TAPI_DEF=-DTAPI_SUPPORT
else
if test "x$LIBTAPI_DIR" != "x"; then
as_fn_error $? "-- ERROR: Failed TAPI checks in $LIBTAPI_DIR" "$LINENO" 5
exit 1
fi
echo ""
@ -17676,6 +17655,8 @@ if test "x$TAPI_LIB" == "x"; then
sleep 2
fi
fi
### Check whether we want to use clang as assembler ###

31
cctools/configure.ac
View File

@ -342,9 +342,12 @@ if test "x$enable_tapi_support" = "xyes"; then
AC_ARG_WITH([libtapi],
AS_HELP_STRING([--with-libtapi],
[path to the apple tapi library]),
[LIBTAPI_DIR=$with_libtapi], [LIBTAPI_DIRECTORY=no])
[LIBTAPI_DIR=$with_libtapi], [LIBTAPI_DIR=""])
if test "x$LIBTAPI_DIR" != "xno"; then
if test "x$LIBTAPI_DIR" = "xno"; then
LIBTAPI_DIR=""
fi
if test "x$LIBTAPI_DIR" != "x"; then
CXXFLAGS="$CXXFLAGS -isystem $LIBTAPI_DIR/include"
CPPFLAGS="$CPPFLAGS -isystem $LIBTAPI_DIR/include"
test -d "$LIBTAPI_DIR/lib" && LDFLAGS="$LDFLAGS -L$LIBTAPI_DIR/lib"
@ -363,18 +366,24 @@ if test "x$LIBTAPI_DIR" != "xno"; then
fi
TAPI_LIB=""
# This is awful but still better than messing around with C++
AC_CHECK_LIB([tapi],[_ZN4tapi10APIVersion8getMajorEv],[
AC_CACHE_CHECK([tapi/tapi.h and libtapi support],[cctools_cv_tapi_support],
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([tapi/tapi.h], [TAPI_LIB=-ltapi; TAPI_DEF=-DTAPI_SUPPORT], [])
save_LIBS="$LIBS"
LIBS="$LIBS -ltapi"
AC_TRY_LINK([#include <tapi/tapi.h>],
[return tapi::APIVersion::getMajor();],
[cctools_cv_tapi_support=yes],
[cctools_cv_tapi_support=no])
LIBS="$save_LIBS"
AC_LANG_POP([C++])
], [])
AC_SUBST(TAPI_LIB)
AC_SUBST(TAPI_DEF)
)
if test "x$TAPI_LIB" == "x"; then
if test $cctools_cv_tapi_support = yes; then
TAPI_LIB=-ltapi
TAPI_DEF=-DTAPI_SUPPORT
else
if test "x$LIBTAPI_DIR" != "x"; then
AC_MSG_ERROR([-- ERROR: Failed TAPI checks in $LIBTAPI_DIR])
exit 1
fi
echo ""
@ -384,6 +393,8 @@ if test "x$TAPI_LIB" == "x"; then
sleep 2
fi
AC_SUBST(TAPI_LIB)
AC_SUBST(TAPI_DEF)
fi
### Check whether we want to use clang as assembler ###