From 581f2aa0b21723c01e275184977d156799a7b25b Mon Sep 17 00:00:00 2001 From: NicJA Date: Tue, 3 Feb 2015 10:17:23 +0000 Subject: [PATCH] Fix flex version detection (properly this time). Use gobjcopy if it is available, and objcopy isnt. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49999 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-pc/boot/grub2-aros/Makefile.in | 5 +- arch/all-pc/boot/grub2-aros/configure | 55 ++++++++++++++-------- arch/all-pc/boot/grub2-aros/configure.ac | 6 +-- arch/all-pc/boot/grub2-aros/docs/Makefile.in | 1 + arch/all-pc/boot/grub2-aros/grub-core/Makefile.in | 1 + .../boot/grub2-aros/grub-core/gnulib/Makefile.in | 1 + .../grub-core/lib/libgcrypt-grub/cipher/ChangeLog | 2 +- arch/all-pc/boot/grub2-aros/po/POTFILES.in | 3 ++ .../grub2-aros/util/bash-completion.d/Makefile.in | 1 + 9 files changed, 50 insertions(+), 25 deletions(-) diff --git a/arch/all-pc/boot/grub2-aros/Makefile.in b/arch/all-pc/boot/grub2-aros/Makefile.in index e366725825..cf1ba9d6bd 100644 --- a/arch/all-pc/boot/grub2-aros/Makefile.in +++ b/arch/all-pc/boot/grub2-aros/Makefile.in @@ -97,8 +97,8 @@ DIST_COMMON = $(top_srcdir)/conf/Makefile.common \ $(top_srcdir)/build-aux/test-driver COPYING THANKS TODO \ build-aux/compile build-aux/config.guess \ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/missing \ - $(top_srcdir)/build-aux/compile \ + build-aux/install-sh build-aux/mdate-sh build-aux/missing \ + build-aux/texinfo.tex $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.rpath \ $(top_srcdir)/build-aux/config.sub \ @@ -2962,6 +2962,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_FREETYPE = @ac_ct_FREETYPE@ ac_ct_TARGET_CC = @ac_ct_TARGET_CC@ +ac_ct_TARGET_OBJCOPY = @ac_ct_TARGET_OBJCOPY@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/arch/all-pc/boot/grub2-aros/configure b/arch/all-pc/boot/grub2-aros/configure index 6c107b520b..8e5614073e 100755 --- a/arch/all-pc/boot/grub2-aros/configure +++ b/arch/all-pc/boot/grub2-aros/configure @@ -803,6 +803,7 @@ HOST_CC TARGET_RANLIB TARGET_NM TARGET_STRIP +ac_ct_TARGET_OBJCOPY TARGET_OBJCOPY ac_ct_TARGET_CC TARGET_CC @@ -5949,7 +5950,7 @@ fi if test "x$LEX" = "x:"; then as_fn_error $? "flex is not found" "$LINENO" 5 else - version=`$LEX --version | $AWK '{ split($0,tmp," "); print tmp[2];}' | $AWK '{ split($NF,x,"."); print x[1]*10000+x[2]*100+x[3]; }'` + version=`$LEX --version | $AWK '{ split($0,tmp," "); split(tmp[2],x,"."); print x[1]*10000+x[2]*100+x[3]; }'` if test -n "$version" -a "$version" -ge 20535; then : else @@ -23748,8 +23749,10 @@ esac fi if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. -set dummy ${ac_tool_prefix}objcopy; ac_word=$2 + for ac_prog in gobjcopy objcopy + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_TARGET_OBJCOPY+:} false; then : @@ -23765,7 +23768,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_TARGET_OBJCOPY="${ac_tool_prefix}objcopy" + ac_cv_prog_TARGET_OBJCOPY="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23785,11 +23788,15 @@ $as_echo "no" >&6; } fi + test -n "$TARGET_OBJCOPY" && break + done fi -if test -z "$ac_cv_prog_TARGET_OBJCOPY"; then +if test -z "$TARGET_OBJCOPY"; then ac_ct_TARGET_OBJCOPY=$TARGET_OBJCOPY - # Extract the first word of "objcopy", so it can be a program name with args. -set dummy objcopy; ac_word=$2 + for ac_prog in gobjcopy objcopy +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_TARGET_OBJCOPY+:} false; then : @@ -23805,7 +23812,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_TARGET_OBJCOPY="objcopy" + ac_cv_prog_ac_ct_TARGET_OBJCOPY="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23824,6 +23831,10 @@ else $as_echo "no" >&6; } fi + + test -n "$ac_ct_TARGET_OBJCOPY" && break +done + if test "x$ac_ct_TARGET_OBJCOPY" = x; then TARGET_OBJCOPY="" else @@ -23835,8 +23846,6 @@ ac_tool_warned=yes ;; esac TARGET_OBJCOPY=$ac_ct_TARGET_OBJCOPY fi -else - TARGET_OBJCOPY="$ac_cv_prog_TARGET_OBJCOPY" fi if test -n "$ac_tool_prefix"; then @@ -24122,8 +24131,10 @@ else TARGET_CC=$CC fi if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. -set dummy ${ac_tool_prefix}objcopy; ac_word=$2 + for ac_prog in gobjcopy objcopy + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_TARGET_OBJCOPY+:} false; then : @@ -24139,7 +24150,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_TARGET_OBJCOPY="${ac_tool_prefix}objcopy" + ac_cv_prog_TARGET_OBJCOPY="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -24159,11 +24170,15 @@ $as_echo "no" >&6; } fi + test -n "$TARGET_OBJCOPY" && break + done fi -if test -z "$ac_cv_prog_TARGET_OBJCOPY"; then +if test -z "$TARGET_OBJCOPY"; then ac_ct_TARGET_OBJCOPY=$TARGET_OBJCOPY - # Extract the first word of "objcopy", so it can be a program name with args. -set dummy objcopy; ac_word=$2 + for ac_prog in gobjcopy objcopy +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_TARGET_OBJCOPY+:} false; then : @@ -24179,7 +24194,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_TARGET_OBJCOPY="objcopy" + ac_cv_prog_ac_ct_TARGET_OBJCOPY="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -24198,6 +24213,10 @@ else $as_echo "no" >&6; } fi + + test -n "$ac_ct_TARGET_OBJCOPY" && break +done + if test "x$ac_ct_TARGET_OBJCOPY" = x; then TARGET_OBJCOPY="" else @@ -24209,8 +24228,6 @@ ac_tool_warned=yes ;; esac TARGET_OBJCOPY=$ac_ct_TARGET_OBJCOPY fi -else - TARGET_OBJCOPY="$ac_cv_prog_TARGET_OBJCOPY" fi if test -n "$ac_tool_prefix"; then diff --git a/arch/all-pc/boot/grub2-aros/configure.ac b/arch/all-pc/boot/grub2-aros/configure.ac index ebbc129918..4168fc9374 100644 --- a/arch/all-pc/boot/grub2-aros/configure.ac +++ b/arch/all-pc/boot/grub2-aros/configure.ac @@ -316,7 +316,7 @@ AC_PROG_LN_S if test "x$LEX" = "x:"; then AC_MSG_ERROR([flex is not found]) else - version=`$LEX --version | $AWK '{ split($0,tmp," "); print tmp[2];}' | $AWK '{ split($NF,x,"."); print x[1]*10000+x[2]*100+x[3]; }'` + version=`$LEX --version | $AWK '{ split($0,tmp," "); split(tmp[[2]],x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'` if test -n "$version" -a "$version" -ge 20535; then : else @@ -483,7 +483,7 @@ if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc], [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])]) - AC_CHECK_TOOL(TARGET_OBJCOPY, objcopy) + AC_CHECK_TOOLS(TARGET_OBJCOPY, [gobjcopy objcopy]) AC_CHECK_TOOL(TARGET_STRIP, strip) AC_CHECK_TOOL(TARGET_NM, nm) AC_CHECK_TOOL(TARGET_RANLIB, ranlib) @@ -493,7 +493,7 @@ else if test "x$TARGET_CC" = x; then TARGET_CC=$CC fi - AC_CHECK_TOOL(TARGET_OBJCOPY, objcopy) + AC_CHECK_TOOLS(TARGET_OBJCOPY, [gobjcopy objcopy]) AC_CHECK_TOOL(TARGET_STRIP, strip) AC_CHECK_TOOL(TARGET_NM, nm) AC_CHECK_TOOL(TARGET_RANLIB, ranlib) diff --git a/arch/all-pc/boot/grub2-aros/docs/Makefile.in b/arch/all-pc/boot/grub2-aros/docs/Makefile.in index 595f0ed69d..11a69502ec 100644 --- a/arch/all-pc/boot/grub2-aros/docs/Makefile.in +++ b/arch/all-pc/boot/grub2-aros/docs/Makefile.in @@ -980,6 +980,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_FREETYPE = @ac_ct_FREETYPE@ ac_ct_TARGET_CC = @ac_ct_TARGET_CC@ +ac_ct_TARGET_OBJCOPY = @ac_ct_TARGET_OBJCOPY@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/arch/all-pc/boot/grub2-aros/grub-core/Makefile.in b/arch/all-pc/boot/grub2-aros/grub-core/Makefile.in index 6f1d388573..f08ec1fa5b 100644 --- a/arch/all-pc/boot/grub2-aros/grub-core/Makefile.in +++ b/arch/all-pc/boot/grub2-aros/grub-core/Makefile.in @@ -13207,6 +13207,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_FREETYPE = @ac_ct_FREETYPE@ ac_ct_TARGET_CC = @ac_ct_TARGET_CC@ +ac_ct_TARGET_OBJCOPY = @ac_ct_TARGET_OBJCOPY@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/arch/all-pc/boot/grub2-aros/grub-core/gnulib/Makefile.in b/arch/all-pc/boot/grub2-aros/grub-core/gnulib/Makefile.in index 702ec689f8..c9ea332ccf 100644 --- a/arch/all-pc/boot/grub2-aros/grub-core/gnulib/Makefile.in +++ b/arch/all-pc/boot/grub2-aros/grub-core/gnulib/Makefile.in @@ -1038,6 +1038,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_FREETYPE = @ac_ct_FREETYPE@ ac_ct_TARGET_CC = @ac_ct_TARGET_CC@ +ac_ct_TARGET_OBJCOPY = @ac_ct_TARGET_OBJCOPY@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/arch/all-pc/boot/grub2-aros/grub-core/lib/libgcrypt-grub/cipher/ChangeLog b/arch/all-pc/boot/grub2-aros/grub-core/lib/libgcrypt-grub/cipher/ChangeLog index 0b7b188541..6478c90a23 100644 --- a/arch/all-pc/boot/grub2-aros/grub-core/lib/libgcrypt-grub/cipher/ChangeLog +++ b/arch/all-pc/boot/grub2-aros/grub-core/lib/libgcrypt-grub/cipher/ChangeLog @@ -1,4 +1,4 @@ -2015-02-01 Automatic import tool +2015-02-02 Automatic import tool Imported ciphers to GRUB diff --git a/arch/all-pc/boot/grub2-aros/po/POTFILES.in b/arch/all-pc/boot/grub2-aros/po/POTFILES.in index eae7e37e28..6ce971a6af 100644 --- a/arch/all-pc/boot/grub2-aros/po/POTFILES.in +++ b/arch/all-pc/boot/grub2-aros/po/POTFILES.in @@ -823,6 +823,7 @@ ./grub-core/tests/video_checksum.c ./grub-core/tests/videotest_checksum.c ./grub-core/tests/xnu_uuid_test.c +./grub-core/unidata.c ./grub-core/video/bitmap.c ./grub-core/video/bitmap_scale.c ./grub-core/video/bochs.c @@ -939,6 +940,8 @@ ./include/grub/fs.h ./include/grub/fshelp.h ./include/grub/gcry/types.h +./include/grub/gcrypt/g10lib.h +./include/grub/gcrypt/gcrypt.h ./include/grub/gcrypt/gpg-error.h ./include/grub/gdb.h ./include/grub/gfxmenu_model.h diff --git a/arch/all-pc/boot/grub2-aros/util/bash-completion.d/Makefile.in b/arch/all-pc/boot/grub2-aros/util/bash-completion.d/Makefile.in index ee67f3277b..4560ea1647 100644 --- a/arch/all-pc/boot/grub2-aros/util/bash-completion.d/Makefile.in +++ b/arch/all-pc/boot/grub2-aros/util/bash-completion.d/Makefile.in @@ -937,6 +937,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_FREETYPE = @ac_ct_FREETYPE@ ac_ct_TARGET_CC = @ac_ct_TARGET_CC@ +ac_ct_TARGET_OBJCOPY = @ac_ct_TARGET_OBJCOPY@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -- 2.11.4.GIT