Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-45847: Don't override user overrides for CFLAGS/LIBS (GH-29967) #29967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 8, 2021
Merged

bpo-45847: Don't override user overrides for CFLAGS/LIBS (GH-29967) #29967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
790bf15
bpo-45847: Don't override user overrides for CFLAGS/LIBS
tiran Dec 7, 2021
f77e1ff
Only set LIBUUID flags on success
tiran Dec 8, 2021
4aec1ea
Strict failure on missing dependencies, too
tiran Dec 8, 2021
4cc2fe1
Allow users to set empty flags
tiran Dec 8, 2021
f02fae3
More defaults
tiran Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only set LIBUUID flags on success
  • Loading branch information
@tiran
tiran committed Dec 8, 2021
commit f77e1ff84333df4e52474e27c89e71296cf8795b
16 changes: 12 additions & 4 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10612,8 +10612,6 @@ fi
echo "$LIBUUID_PKG_ERRORS" >&5


LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
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"
Expand Down Expand Up @@ -10731,6 +10729,12 @@ LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS


if test "x$have_uuid" = xyes; then :

LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}

fi

fi

Expand All @@ -10742,8 +10746,6 @@ elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }

LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
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"
Expand Down Expand Up @@ -10861,6 +10863,12 @@ LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS


if test "x$have_uuid" = xyes; then :

LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}

fi

fi

Expand Down
6 changes: 4 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2961,8 +2961,6 @@ AS_VAR_IF([have_uuid], [missing], [
AC_DEFINE([HAVE_UUID_H], [1])
AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
], [
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
AC_CHECK_HEADERS([uuid/uuid.h], [
WITH_SAVE_ENV(
[AC_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
Expand All @@ -2973,6 +2971,10 @@ AS_VAR_IF([have_uuid], [missing], [
AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
])
])
AS_VAR_IF([have_uuid], [yes], [
LIBUUID_CFLAGS=${LIBUUID_CFLAGS:-""}
LIBUUID_LIBS=${LIBUUID_LIBS:-"-luuid"}
])
])
]
)
Expand Down