Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb75ed95

Browse files
authored
gh-128354: Consistently use LIBS over LDFLAGS in library build checks (#128359)
1 parent4974bbd commitb75ed95

File tree

2 files changed

+41
-43
lines changed

2 files changed

+41
-43
lines changed

‎configure‎

Lines changed: 24 additions & 25 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3701,7 +3701,7 @@ AS_VAR_IF([have_uuid], [missing], [
37013701
],[
37023702
WITH_SAVE_ENV([
37033703
CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
3704-
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
3704+
LIBS="$LIBS $LIBUUID_LIBS"
37053705
AC_CHECK_HEADERS([uuid/uuid.h],[
37063706
PY_CHECK_LIB([uuid],[uuid_generate_time],[have_uuid=yes])
37073707
PY_CHECK_LIB([uuid],[uuid_generate_time_safe],
@@ -3971,7 +3971,7 @@ AS_VAR_IF([have_libffi], [missing], [
39713971
PKG_CHECK_MODULES([LIBFFI],[libffi],[have_libffi=yes],[
39723972
WITH_SAVE_ENV([
39733973
CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
3974-
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
3974+
LIBS="$LIBS $LIBFFI_LIBS"
39753975
AC_CHECK_HEADER([ffi.h],[
39763976
AC_CHECK_LIB([ffi],[ffi_call],[
39773977
have_libffi=yes
@@ -4005,8 +4005,8 @@ AS_VAR_IF([have_libffi], [yes], [
40054005
AS_VAR_IF([ac_cv_lib_dl_dlopen],[yes],[AS_VAR_APPEND([LIBFFI_LIBS],[" -ldl"])])
40064006
40074007
WITH_SAVE_ENV([
4008-
CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
4009-
LDFLAGS="$LIBFFI_LIBS $LDFLAGS"
4008+
CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
4009+
LIBS="$LIBS $LIBFFI_LIBS"
40104010
40114011
PY_CHECK_FUNC([ffi_prep_cif_var],[@%:@include <ffi.h>])
40124012
PY_CHECK_FUNC([ffi_prep_closure_loc],[@%:@include <ffi.h>])
@@ -4021,9 +4021,8 @@ AS_VAR_IF([have_libffi], [yes], [
40214021
#
40224022
AC_CACHE_CHECK([libffi has complex type support],[ac_cv_ffi_complex_double_supported],
40234023
[WITH_SAVE_ENV([
4024-
CPPFLAGS="$LIBFFI_CFLAGS $CPPFLAGS"
4025-
LDFLAGS="$LIBFFI_LIBS $LDFLAGS"
4026-
LIBS="$LIBFFI_LIBS $LIBS"
4024+
CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
4025+
LIBS="$LIBS $LIBFFI_LIBS"
40274026
AC_RUN_IFELSE([AC_LANG_SOURCE([[
40284027
#include <complex.h>
40294028
#include <ffi.h>
@@ -4086,8 +4085,8 @@ AS_VAR_IF(
40864085

40874086
AS_VAR_IF([with_system_libmpdec],[yes],
40884087
[WITH_SAVE_ENV([
4089-
CPPFLAGS="$LIBMPDEC_CFLAGS $CPPFLAGS"
4090-
LIBS="$LIBMPDEC_LIBS $LIBS"
4088+
CPPFLAGS="$CPPFLAGS $LIBMPDEC_CFLAGS"
4089+
LIBS="$LIBS $LIBMPDEC_LIBS"
40914090
40924091
AC_LINK_IFELSE([
40934092
AC_LANG_PROGRAM([
@@ -4220,7 +4219,7 @@ WITH_SAVE_ENV([
42204219
dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
42214220
dnl hence CPPFLAGS instead of CFLAGS.
42224221
CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
4223-
LIBS="$LIBSQLITE3_LIBS $LIBS"
4222+
LIBS="$LIBS $LIBSQLITE3_LIBS"
42244223
42254224
AC_CHECK_HEADER([sqlite3.h],[
42264225
have_sqlite3=yes
@@ -4323,7 +4322,7 @@ AS_CASE([$ac_sys_system],
43234322

43244323
WITH_SAVE_ENV([
43254324
CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
4326-
LIBS="$TCLTK_LIBS $LDFLAGS"
4325+
LIBS="$LIBS $TCLTK_LIBS"
43274326
43284327
AC_LINK_IFELSE([
43294328
AC_LANG_PROGRAM([
@@ -4365,7 +4364,7 @@ AC_ARG_VAR([GDBM_CFLAGS], [C compiler flags for gdbm])
43654364
AC_ARG_VAR([GDBM_LIBS],[additional linker flags for gdbm])
43664365
WITH_SAVE_ENV([
43674366
CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
4368-
LDFLAGS="$GDBM_LIBS $LDFLAGS"
4367+
LIBS="$LIBS $GDBM_LIBS"
43694368
AC_CHECK_HEADERS([gdbm.h],[
43704369
AC_CHECK_LIB([gdbm],[gdbm_open],[
43714370
have_gdbm=yes
@@ -5310,7 +5309,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
53105309
],[
53115310
WITH_SAVE_ENV([
53125311
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
5313-
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
5312+
LIBS="$LIBS $ZLIB_LIBS"
53145313
AC_CHECK_HEADERS([zlib.h],[
53155314
PY_CHECK_LIB([z],[gzread],[have_zlib=yes],[have_zlib=no])
53165315
],[have_zlib=no])
@@ -5334,7 +5333,7 @@ PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
53345333
PKG_CHECK_MODULES([BZIP2],[bzip2],[have_bzip2=yes],[
53355334
WITH_SAVE_ENV([
53365335
CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
5337-
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
5336+
LIBS="$LIBS $BZIP2_LIBS"
53385337
AC_CHECK_HEADERS([bzlib.h],[
53395338
AC_CHECK_LIB([bz2],[BZ2_bzCompress],[have_bzip2=yes],[have_bzip2=no])
53405339
],[have_bzip2=no])
@@ -5348,7 +5347,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
53485347
PKG_CHECK_MODULES([LIBLZMA],[liblzma],[have_liblzma=yes],[
53495348
WITH_SAVE_ENV([
53505349
CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
5351-
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
5350+
LIBS="$LIBS $LIBLZMA_LIBS"
53525351
AC_CHECK_HEADERS([lzma.h],[
53535352
AC_CHECK_LIB([lzma],[lzma_easy_encoder],[have_liblzma=yes],[have_liblzma=no])
53545353
],[have_liblzma=no])
@@ -6342,7 +6341,7 @@ AS_VAR_IF([with_readline], [readline], [
63426341
],[
63436342
WITH_SAVE_ENV([
63446343
CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
6345-
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
6344+
LIBS="$LIBS $LIBREADLINE_LIBS"
63466345
AC_CHECK_HEADERS([readline/readline.h],[
63476346
AC_CHECK_LIB([readline],[readline],[
63486347
LIBREADLINE=readline
@@ -6363,7 +6362,7 @@ AS_VAR_IF([with_readline], [edit], [
63636362
],[
63646363
WITH_SAVE_ENV([
63656364
CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
6366-
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
6365+
LIBS="$LIBS $LIBEDIT_LIBS"
63676366
AC_CHECK_HEADERS([editline/readline.h],[
63686367
AC_CHECK_LIB([edit],[readline],[
63696368
LIBREADLINE=edit
@@ -6387,7 +6386,7 @@ AS_VAR_IF([with_readline], [no], [
63876386
63886387
WITH_SAVE_ENV([
63896388
CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
6390-
LIBS="$READLINE_LIBS $LIBS"
6389+
LIBS="$LIBS $READLINE_LIBS"
63916390
LIBS_SAVE=$LIBS
63926391
63936392
m4_define([readline_includes],[

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp