binutils: Don't link to libfl as it's unnecessary

AM_PROG_LEX sets this for some weird reason; it should
look for a program only and not a library.  Then later
it gets linked to ar, ranlib, dlltool, windres, windmc
and itbl-test despite nothing in the code #include'ing
FlexLexer.h

This isn't a big deal but it did cause a build failure
on Cygwin as it triggered a bug with their flex package
dependencies which I reported at:

https://www.cygwin.com/ml/cygwin/2015-10/msg00433.html

Arguably I should remove all traces of LIBLEX in each
Makefile.am instead?

Signed-off-by: Ray Donnelly <mingw.android@gmail.com>
This commit is contained in:
Ray Donnelly 2015-10-25 18:46:52 +00:00
parent 3c95e3492a
commit df02517fd7

View File

@ -0,0 +1,102 @@
diff -urN binutils-2.25.1.orig/binutils/configure binutils-2.25.1/binutils/configure
--- binutils-2.25.1.orig/binutils/configure 2015-10-25 13:18:46.249052806 +0000
+++ binutils-2.25.1/binutils/configure 2015-10-25 13:39:21.339034801 +0000
@@ -12067,6 +12067,7 @@
done
test -n "$YACC" || YACC="yacc"
+save_LIBS=$LIBS
for ac_prog in flex lex
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -12227,6 +12228,8 @@
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
+LIBS=$save_LIBS
+LEXLIB=
ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
# If we haven't got the data from the intl directory,
diff -urN binutils-2.25.1.orig/binutils/configure.ac binutils-2.25.1/binutils/configure.ac
--- binutils-2.25.1.orig/binutils/configure.ac 2015-10-25 13:18:46.249052806 +0000
+++ binutils-2.25.1/binutils/configure.ac 2015-10-25 13:38:52.969035216 +0000
@@ -87,7 +87,10 @@
fi
AC_PROG_YACC
+save_LIBS=$LIBS
AM_PROG_LEX
+LIBS=$save_LIBS
+LEXLIB=
ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
ZW_GNU_GETTEXT_SISTER_DIR
diff -urN binutils-2.25.1.orig/gas/configure binutils-2.25.1/gas/configure
--- binutils-2.25.1.orig/gas/configure 2015-10-25 13:18:46.389052803 +0000
+++ binutils-2.25.1/gas/configure 2015-10-25 15:16:55.988949456 +0000
@@ -12795,6 +12795,7 @@
done
test -n "$YACC" || YACC="yacc"
+save_LIBS=$LIBS
for ac_prog in flex lex
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -12955,6 +12956,8 @@
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
+LIBS=$save_LIBS
+LEXLIB=
ALL_LINGUAS="fr tr es rw id ru fi ja"
# If we haven't got the data from the intl directory,
diff -urN binutils-2.25.1.orig/gas/configure.ac binutils-2.25.1/gas/configure.ac
--- binutils-2.25.1.orig/gas/configure.ac 2015-10-25 15:15:06.000000000 +0000
+++ binutils-2.25.1/gas/configure.ac 2015-10-25 14:45:32.000000000 +0000
@@ -717,7 +717,10 @@
AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.])
AC_PROG_YACC
+save_LIBS=$LIBS
AM_PROG_LEX
+LIBS=$save_LIBS
+LEXLIB=
ALL_LINGUAS="fr tr es rw id ru fi ja"
ZW_GNU_GETTEXT_SISTER_DIR
diff -urN binutils-2.25.1.orig/ld/configure binutils-2.25.1/ld/configure
--- binutils-2.25.1.orig/ld/configure 2015-10-25 13:18:47.399052788 +0000
+++ binutils-2.25.1/ld/configure 2015-10-25 15:17:06.472282637 +0000
@@ -16071,6 +16071,7 @@
done
test -n "$YACC" || YACC="yacc"
+save_LIBS=$LIBS
for ac_prog in flex lex
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -16231,6 +16232,8 @@
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
+LIBS=$save_LIBS
+LEXLIB=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff -urN binutils-2.25.1.orig/ld/configure.ac binutils-2.25.1/ld/configure.ac
--- binutils-2.25.1.orig/ld/configure.ac 2015-10-25 13:18:47.415719456 +0000
+++ binutils-2.25.1/ld/configure.ac 2015-10-25 15:14:43.000000000 +0000
@@ -173,7 +173,10 @@
AC_EXEEXT
AC_PROG_YACC
+save_LIBS=$LIBS
AM_PROG_LEX
+LIBS=$save_LIBS
+LEXLIB=
AM_MAINTAINER_MODE
AM_CONDITIONAL(GENINSRC_NEVER, false)