luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Remove --disable-znodelete options

Browse Source 
There is no reason to disable this linker flags, and we are not going to
add this option in our meson build system, so remove it from autotools
too to be on par. If anyone complains with a valid use-case we can add
them back.

Keeping -Bsymbolc for now because it is used for refdbg and Debian has a
package that build glib with that flag.

https://bugzilla.gnome.org/show_bug.cgi?id=788771
This commit is contained in:
Xavier Claessens 2018-04-24 16:35:05 -04:00
parent fe9457dedd
commit 9d12af9ef8
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
configure.ac
View File

@ -3441,27 +3441,25 @@ dnl we also try to check for the --fatal-warnings linker flag if
dnl auto-detecting.
dnl
AC_ARG_ENABLE([znodelete],
[AS_HELP_STRING([--disable-znodelete],
[avoid linking with -z,nodelete])],,
[SAVED_CFLAGS="${CFLAGS}" SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
AC_MSG_CHECKING([for --fatal-warnings linker flag])
CFLAGS="${SAVED_CFLAGS} ${shared_flag:- -shared}"
LDFLAGS=-Wl,--fatal-warnings
LIBS=
AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
[ldflags_fatal=-Wl,--fatal-warnings],
AC_MSG_RESULT(no)
ldflags_fatal=)
AC_MSG_CHECKING([for -z,nodelete linker flag])
LDFLAGS="$ldflags_fatal -Wl,-z,nodelete"
AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
enable_znodelete=yes,
AC_MSG_RESULT(no)
enable_znodelete=no)
CFLAGS="${SAVED_CFLAGS}" LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
SAVED_CFLAGS="${CFLAGS}" SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
AC_MSG_CHECKING([for --fatal-warnings linker flag])
CFLAGS="${SAVED_CFLAGS} ${shared_flag:- -shared}"
LDFLAGS=-Wl,--fatal-warnings
LIBS=
AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
[ldflags_fatal=-Wl,--fatal-warnings],
AC_MSG_RESULT(no)
ldflags_fatal=)
AC_MSG_CHECKING([for -z,nodelete linker flag])
LDFLAGS="$ldflags_fatal -Wl,-z,nodelete"
AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
enable_znodelete=yes,
AC_MSG_RESULT(no)
enable_znodelete=no)
CFLAGS="${SAVED_CFLAGS}" LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"
if test "x${enable_znodelete}" = "xyes"; then
GLIB_LINK_FLAGS="$GLIB_LINK_FLAGS -Wl,-z,nodelete"