mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Joshua Root
d78a701353
Also disable opportunistic use of libb2 and ossp-uuid. Closes: https://trac.macports.org/ticket/68182
371 lines
9.9 KiB
Diff
371 lines
9.9 KiB
Diff
--- configure.orig 2023-10-03 00:29:10
|
|
+++ configure 2023-10-03 04:11:25
|
|
@@ -11314,367 +11314,6 @@
|
|
|
|
have_uuid=missing
|
|
|
|
-for ac_header in uuid.h
|
|
-do :
|
|
- ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
|
|
-if test "x$ac_cv_header_uuid_h" = xyes; then :
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_UUID_H 1
|
|
-_ACEOF
|
|
-
|
|
- for ac_func in uuid_create uuid_enc_be
|
|
-do :
|
|
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
- have_uuid=yes
|
|
- LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
|
|
- LIBUUID_LIBS=${LIBUUID_LIBS-""}
|
|
-
|
|
-fi
|
|
-done
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
-
|
|
-if test "x$have_uuid" = xmissing; then :
|
|
-
|
|
-
|
|
-pkg_failed=no
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUUID" >&5
|
|
-$as_echo_n "checking for LIBUUID... " >&6; }
|
|
-
|
|
-if test -n "$LIBUUID_CFLAGS"; then
|
|
- pkg_cv_LIBUUID_CFLAGS="$LIBUUID_CFLAGS"
|
|
- elif test -n "$PKG_CONFIG"; then
|
|
- if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid >= 2.20\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "uuid >= 2.20") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }; then
|
|
- pkg_cv_LIBUUID_CFLAGS=`$PKG_CONFIG --cflags "uuid >= 2.20" 2>/dev/null`
|
|
- test "x$?" != "x0" && pkg_failed=yes
|
|
-else
|
|
- pkg_failed=yes
|
|
-fi
|
|
- else
|
|
- pkg_failed=untried
|
|
-fi
|
|
-if test -n "$LIBUUID_LIBS"; then
|
|
- pkg_cv_LIBUUID_LIBS="$LIBUUID_LIBS"
|
|
- elif test -n "$PKG_CONFIG"; then
|
|
- if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid >= 2.20\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "uuid >= 2.20") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }; then
|
|
- pkg_cv_LIBUUID_LIBS=`$PKG_CONFIG --libs "uuid >= 2.20" 2>/dev/null`
|
|
- test "x$?" != "x0" && pkg_failed=yes
|
|
-else
|
|
- pkg_failed=yes
|
|
-fi
|
|
- else
|
|
- pkg_failed=untried
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-if test $pkg_failed = yes; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-
|
|
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
- _pkg_short_errors_supported=yes
|
|
-else
|
|
- _pkg_short_errors_supported=no
|
|
-fi
|
|
- if test $_pkg_short_errors_supported = yes; then
|
|
- LIBUUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid >= 2.20" 2>&1`
|
|
- else
|
|
- LIBUUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid >= 2.20" 2>&1`
|
|
- fi
|
|
- # Put the nasty error message in config.log where it belongs
|
|
- echo "$LIBUUID_PKG_ERRORS" >&5
|
|
-
|
|
-
|
|
- save_CFLAGS=$CFLAGS
|
|
-save_CPPFLAGS=$CPPFLAGS
|
|
-save_LDFLAGS=$LDFLAGS
|
|
-save_LIBS=$LIBS
|
|
-
|
|
-
|
|
- CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
|
|
- LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
|
|
- for ac_header in uuid/uuid.h
|
|
-do :
|
|
- ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
|
|
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_UUID_UUID_H 1
|
|
-_ACEOF
|
|
-
|
|
- py_check_lib_save_LIBS=$LIBS
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
|
|
-$as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
|
|
-if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-luuid $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 uuid_generate_time ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return uuid_generate_time ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- ac_cv_lib_uuid_uuid_generate_time=yes
|
|
-else
|
|
- ac_cv_lib_uuid_uuid_generate_time=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_uuid_uuid_generate_time" >&5
|
|
-$as_echo "$ac_cv_lib_uuid_uuid_generate_time" >&6; }
|
|
-if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
|
|
- have_uuid=yes
|
|
-fi
|
|
-
|
|
-LIBS=$py_check_lib_save_LIBS
|
|
-
|
|
- py_check_lib_save_LIBS=$LIBS
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
|
|
-$as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
|
|
-if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-luuid $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 uuid_generate_time_safe ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return uuid_generate_time_safe ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- ac_cv_lib_uuid_uuid_generate_time_safe=yes
|
|
-else
|
|
- ac_cv_lib_uuid_uuid_generate_time_safe=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_uuid_uuid_generate_time_safe" >&5
|
|
-$as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
|
|
-if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
|
|
- have_uuid=yes
|
|
- $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-LIBS=$py_check_lib_save_LIBS
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
- if test "x$have_uuid" = xyes; then :
|
|
-
|
|
- LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
|
|
- LIBUUID_LIBS=${LIBUUID_LIBS-"-luuid"}
|
|
-
|
|
-fi
|
|
-
|
|
-CFLAGS=$save_CFLAGS
|
|
-CPPFLAGS=$save_CPPFLAGS
|
|
-LDFLAGS=$save_LDFLAGS
|
|
-LIBS=$save_LIBS
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-elif test $pkg_failed = untried; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-
|
|
- save_CFLAGS=$CFLAGS
|
|
-save_CPPFLAGS=$CPPFLAGS
|
|
-save_LDFLAGS=$LDFLAGS
|
|
-save_LIBS=$LIBS
|
|
-
|
|
-
|
|
- CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
|
|
- LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
|
|
- for ac_header in uuid/uuid.h
|
|
-do :
|
|
- ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
|
|
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_UUID_UUID_H 1
|
|
-_ACEOF
|
|
-
|
|
- py_check_lib_save_LIBS=$LIBS
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
|
|
-$as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
|
|
-if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-luuid $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 uuid_generate_time ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return uuid_generate_time ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- ac_cv_lib_uuid_uuid_generate_time=yes
|
|
-else
|
|
- ac_cv_lib_uuid_uuid_generate_time=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_uuid_uuid_generate_time" >&5
|
|
-$as_echo "$ac_cv_lib_uuid_uuid_generate_time" >&6; }
|
|
-if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
|
|
- have_uuid=yes
|
|
-fi
|
|
-
|
|
-LIBS=$py_check_lib_save_LIBS
|
|
-
|
|
- py_check_lib_save_LIBS=$LIBS
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
|
|
-$as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
|
|
-if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-luuid $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 uuid_generate_time_safe ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return uuid_generate_time_safe ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- ac_cv_lib_uuid_uuid_generate_time_safe=yes
|
|
-else
|
|
- ac_cv_lib_uuid_uuid_generate_time_safe=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_uuid_uuid_generate_time_safe" >&5
|
|
-$as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
|
|
-if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
|
|
- have_uuid=yes
|
|
- $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-LIBS=$py_check_lib_save_LIBS
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
- if test "x$have_uuid" = xyes; then :
|
|
-
|
|
- LIBUUID_CFLAGS=${LIBUUID_CFLAGS-""}
|
|
- LIBUUID_LIBS=${LIBUUID_LIBS-"-luuid"}
|
|
-
|
|
-fi
|
|
-
|
|
-CFLAGS=$save_CFLAGS
|
|
-CPPFLAGS=$save_CPPFLAGS
|
|
-LDFLAGS=$save_LDFLAGS
|
|
-LIBS=$save_LIBS
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-else
|
|
- LIBUUID_CFLAGS=$pkg_cv_LIBUUID_CFLAGS
|
|
- LIBUUID_LIBS=$pkg_cv_LIBUUID_LIBS
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
-
|
|
- have_uuid=yes
|
|
- $as_echo "#define HAVE_UUID_H 1" >>confdefs.h
|
|
-
|
|
- $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
|
|
-
|
|
-
|
|
-fi
|
|
-
|
|
-fi
|
|
|
|
if test "x$have_uuid" = xmissing; then :
|
|
|