Initial commit
This commit is contained in:
+138
@@ -0,0 +1,138 @@
|
||||
From 7a3bbca81b803ba116b83c82de378e840cc35f81 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 1 Sep 2022 16:19:50 -0500
|
||||
Subject: [PATCH] Port to compilers that moan about K&R func decls
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* lib/autoconf/c.m4 (AC_LANG_CALL, AC_LANG_FUNC_LINK_TRY):
|
||||
Use '(void)' rather than '()' in function prototypes, as the latter
|
||||
provokes fatal errors in some compilers nowadays.
|
||||
* lib/autoconf/functions.m4 (AC_FUNC_STRTOD):
|
||||
* tests/fortran.at (AC_F77_DUMMY_MAIN usage):
|
||||
* tests/semantics.at (AC_CHECK_DECLS):
|
||||
Don’t use () in a function decl.
|
||||
|
||||
Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
doc/autoconf.texi | 7 +++----
|
||||
lib/autoconf/c.m4 | 6 +++---
|
||||
lib/autoconf/functions.m4 | 3 ---
|
||||
tests/fortran.at | 8 ++++----
|
||||
tests/semantics.at | 2 +-
|
||||
5 files changed, 11 insertions(+), 15 deletions(-)
|
||||
|
||||
--- a/doc/autoconf.texi
|
||||
+++ b/doc/autoconf.texi
|
||||
@@ -5465,9 +5465,7 @@ the @samp{#undef malloc}):
|
||||
#include <config.h>
|
||||
#undef malloc
|
||||
|
||||
-#include <sys/types.h>
|
||||
-
|
||||
-void *malloc ();
|
||||
+#include <stdlib.h>
|
||||
|
||||
/* Allocate an N-byte block of memory from the heap.
|
||||
If N is zero, allocate a 1-byte block. */
|
||||
@@ -8295,7 +8293,7 @@ needed:
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
- int F77_DUMMY_MAIN () @{ return 1; @}
|
||||
+ int F77_DUMMY_MAIN (void) @{ return 1; @}
|
||||
#endif
|
||||
@end example
|
||||
|
||||
--- a/lib/autoconf/c.m4
|
||||
+++ b/lib/autoconf/c.m4
|
||||
@@ -127,7 +127,7 @@ m4_if([$2], [main], ,
|
||||
[/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
-char $2 ();])], [return $2 ();])])
|
||||
+char $2 (void);])], [return $2 ();])])
|
||||
|
||||
|
||||
# AC_LANG_FUNC_LINK_TRY(C)(FUNCTION)
|
||||
@@ -151,7 +151,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
|
||||
#define $1 innocuous_$1
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
- which can conflict with char $1 (); below. */
|
||||
+ which can conflict with char $1 (void); below. */
|
||||
|
||||
#include <limits.h>
|
||||
#undef $1
|
||||
@@ -162,7 +162,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
-char $1 ();
|
||||
+char $1 (void);
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
--- a/lib/autoconf/functions.m4
|
||||
+++ b/lib/autoconf/functions.m4
|
||||
@@ -1601,9 +1601,6 @@ AC_DEFUN([AC_FUNC_STRTOD],
|
||||
AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
|
||||
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
]AC_INCLUDES_DEFAULT[
|
||||
-#ifndef strtod
|
||||
-double strtod ();
|
||||
-#endif
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
--- a/tests/fortran.at
|
||||
+++ b/tests/fortran.at
|
||||
@@ -233,7 +233,7 @@ void FOOBAR_F77 (double *x, double *y);
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
- int F77_DUMMY_MAIN () { return 1; }
|
||||
+ int F77_DUMMY_MAIN (void) { return 1; }
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
@@ -315,7 +315,7 @@ void FOOBAR_FC(double *x, double *y);
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
- int FC_DUMMY_MAIN () { return 1; }
|
||||
+ int FC_DUMMY_MAIN (void) { return 1; }
|
||||
#endif
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
@@ -561,7 +561,7 @@ void @foobar@ (int *x);
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
- int F77_DUMMY_MAIN () { return 1; }
|
||||
+ int F77_DUMMY_MAIN (void) { return 1; }
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
@@ -637,7 +637,7 @@ void @foobar@ (int *x);
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
- int FC_DUMMY_MAIN () { return 1; }
|
||||
+ int FC_DUMMY_MAIN (void) { return 1; }
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
--- a/tests/semantics.at
|
||||
+++ b/tests/semantics.at
|
||||
@@ -207,7 +207,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS],
|
||||
[[extern int yes;
|
||||
enum { myenum };
|
||||
extern struct mystruct_s { int x[20]; } mystruct;
|
||||
- extern int myfunc();
|
||||
+ extern int myfunc (int);
|
||||
#define mymacro1(arg) arg
|
||||
#define mymacro2]])
|
||||
# Ensure we can detect missing declarations of functions whose
|
||||
@@ -0,0 +1,123 @@
|
||||
From 0071d28e304745a16871561f23117fdb00dd2559 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 12 Mar 2020 17:25:23 +0000
|
||||
Subject: [PATCH 4/7] autoreconf-exclude.patch
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
---
|
||||
bin/autoreconf.in | 26 ++++++++++++++++++++++++++
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
|
||||
index bb9f316d..7da3005b 100644
|
||||
--- a/bin/autoreconf.in
|
||||
+++ b/bin/autoreconf.in
|
||||
@@ -82,6 +82,7 @@ Operation modes:
|
||||
-i, --install copy missing standard auxiliary files
|
||||
--no-recursive don't rebuild sub-packages
|
||||
-s, --symlink with -i, install symbolic links instead of copies
|
||||
+ -x, --exclude=STEPS steps we should not run
|
||||
-m, --make when applicable, re-run ./configure && make
|
||||
-W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax]
|
||||
|
||||
@@ -141,6 +142,10 @@ my $run_make = 0;
|
||||
# Recurse into subpackages
|
||||
my $recursive = 1;
|
||||
|
||||
+# Steps to exclude
|
||||
+my @exclude;
|
||||
+my @ex;
|
||||
+
|
||||
## ---------- ##
|
||||
## Routines. ##
|
||||
## ---------- ##
|
||||
@@ -161,6 +166,7 @@ sub parse_args ()
|
||||
'B|prepend-include=s' => \@prepend_include,
|
||||
'i|install' => \$install,
|
||||
's|symlink' => \$symlink,
|
||||
+ 'x|exclude=s' => \@exclude,
|
||||
'm|make' => \$run_make,
|
||||
'recursive!' => \$recursive);
|
||||
|
||||
@@ -170,6 +176,8 @@ sub parse_args ()
|
||||
parse_WARNINGS;
|
||||
parse_warnings @warning;
|
||||
|
||||
+ @exclude = map { split /,/ } @exclude;
|
||||
+
|
||||
# Even if the user specified a configure.ac, trim to get the
|
||||
# directory, and look for configure.ac again. Because (i) the code
|
||||
# is simpler, and (ii) we are still able to diagnose simultaneous
|
||||
@@ -493,8 +501,11 @@ sub autoreconf_current_directory ($)
|
||||
}
|
||||
else
|
||||
{
|
||||
+ @ex = grep (/^autopoint$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
xsystem_hint ("autopoint is needed because this package uses Gettext",
|
||||
$autopoint);
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -687,9 +698,12 @@ sub autoreconf_current_directory ($)
|
||||
{
|
||||
$libtoolize .= " --ltdl";
|
||||
}
|
||||
+ @ex = grep (/^libtoolize$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
xsystem_hint ("libtoolize is needed because this package uses Libtool",
|
||||
$libtoolize);
|
||||
$rerun_aclocal = 1;
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -726,8 +740,11 @@ sub autoreconf_current_directory ($)
|
||||
}
|
||||
elsif ($install)
|
||||
{
|
||||
+ @ex = grep (/^gtkdocize$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc",
|
||||
$gtkdocize);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -765,7 +782,10 @@ sub autoreconf_current_directory ($)
|
||||
# latter runs the former, and (ii) autoconf is stricter than
|
||||
# autoheader. So all in all, autoconf should give better error
|
||||
# messages.
|
||||
+ @ex = grep (/^autoconf$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
xsystem ($autoconf);
|
||||
+ }
|
||||
|
||||
|
||||
# -------------------- #
|
||||
@@ -786,7 +806,10 @@ sub autoreconf_current_directory ($)
|
||||
}
|
||||
else
|
||||
{
|
||||
+ @ex = grep (/^autoheader$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
xsystem ($autoheader);
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -803,7 +826,10 @@ sub autoreconf_current_directory ($)
|
||||
# We should always run automake, and let it decide whether it shall
|
||||
# update the file or not. In fact, the effect of '$force' is already
|
||||
# included in '$automake' via '--no-force'.
|
||||
+ @ex = grep (/^automake$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
xsystem ($automake);
|
||||
+ }
|
||||
}
|
||||
|
||||
# ---------------------------------------------------- #
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,129 @@
|
||||
From 8c0f24404bebffdaf3132d81e2b9560d34ff1677 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 12 Mar 2020 17:25:45 +0000
|
||||
Subject: [PATCH 6/7] autotest-automake-result-format.patch
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
---
|
||||
lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++----------
|
||||
1 file changed, 29 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
|
||||
index 0c0e3c5b..17590e96 100644
|
||||
--- a/lib/autotest/general.m4
|
||||
+++ b/lib/autotest/general.m4
|
||||
@@ -412,6 +412,9 @@ at_recheck=
|
||||
# Whether a write failure occurred
|
||||
at_write_fail=0
|
||||
|
||||
+# Automake result format "result: testname"
|
||||
+at_am_fmt=false
|
||||
+
|
||||
# The directory we run the suite in. Default to . if no -C option.
|
||||
at_dir=`pwd`
|
||||
# An absolute reference to this testsuite script.
|
||||
@@ -525,6 +528,10 @@ do
|
||||
at_check_filter_trace=at_fn_filter_trace
|
||||
;;
|
||||
|
||||
+ --am-fmt | -A )
|
||||
+ at_am_fmt=:
|
||||
+ ;;
|
||||
+
|
||||
[[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
|
||||
at_fn_validate_ranges at_option
|
||||
AS_VAR_APPEND([at_groups], ["$at_option$as_nl"])
|
||||
@@ -713,10 +720,10 @@ m4_divert_push([HELP_MODES])dnl
|
||||
cat <<_ATEOF || at_write_fail=1
|
||||
|
||||
Operation modes:
|
||||
- -h, --help print the help message, then exit
|
||||
- -V, --version print version number, then exit
|
||||
- -c, --clean remove all the files this test suite might create and exit
|
||||
- -l, --list describes all the tests, or the selected TESTS
|
||||
+ -h, --help print the help message, then exit
|
||||
+ -V, --version print version number, then exit
|
||||
+ -c, --clean remove all the files this test suite might create and exit
|
||||
+ -l, --list describes all the tests, or the selected TESTS
|
||||
_ATEOF
|
||||
m4_divert_pop([HELP_MODES])dnl
|
||||
m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl
|
||||
@@ -742,6 +749,7 @@ Execution tuning:
|
||||
-d, --debug inhibit clean up and top-level logging
|
||||
[ default for debugging scripts]
|
||||
-x, --trace enable tests shell tracing
|
||||
+ -A, --am-fmt automake result format "result: testname"
|
||||
_ATEOF
|
||||
m4_divert_pop([HELP_TUNING_BEGIN])])dnl
|
||||
m4_divert_push([HELP_END])dnl
|
||||
@@ -1129,7 +1137,9 @@ at_fn_group_banner ()
|
||||
[*]) at_desc_line="$[1]: " ;;
|
||||
esac
|
||||
AS_VAR_APPEND([at_desc_line], ["$[3]$[4]"])
|
||||
- $at_quiet AS_ECHO_N(["$at_desc_line"])
|
||||
+ if ! $at_am_fmt; then
|
||||
+ $at_quiet AS_ECHO_N(["$at_desc_line"])
|
||||
+ fi
|
||||
echo "# -*- compilation -*-" >> "$at_group_log"
|
||||
}
|
||||
|
||||
@@ -1155,42 +1165,51 @@ _ATEOF
|
||||
case $at_xfail:$at_status in
|
||||
yes:0)
|
||||
at_msg="UNEXPECTED PASS"
|
||||
+ at_am_msg="XPASS"
|
||||
at_res=xpass
|
||||
at_errexit=$at_errexit_p
|
||||
at_color=$at_red
|
||||
;;
|
||||
no:0)
|
||||
at_msg="ok"
|
||||
+ at_am_msg="PASS"
|
||||
at_res=pass
|
||||
at_errexit=false
|
||||
at_color=$at_grn
|
||||
;;
|
||||
*:77)
|
||||
at_msg='skipped ('`cat "$at_check_line_file"`')'
|
||||
+ at_am_msg="SKIP"
|
||||
at_res=skip
|
||||
at_errexit=false
|
||||
at_color=$at_blu
|
||||
;;
|
||||
no:* | *:99)
|
||||
at_msg='FAILED ('`cat "$at_check_line_file"`')'
|
||||
+ at_am_msg="FAIL"
|
||||
at_res=fail
|
||||
at_errexit=$at_errexit_p
|
||||
at_color=$at_red
|
||||
;;
|
||||
yes:*)
|
||||
at_msg='expected failure ('`cat "$at_check_line_file"`')'
|
||||
+ at_am_msg="XFAIL"
|
||||
at_res=xfail
|
||||
at_errexit=false
|
||||
at_color=$at_lgn
|
||||
;;
|
||||
esac
|
||||
echo "$at_res" > "$at_job_dir/$at_res"
|
||||
- # In parallel mode, output the summary line only afterwards.
|
||||
- if test $at_jobs -ne 1 && test -n "$at_verbose"; then
|
||||
- AS_ECHO(["$at_desc_line $at_color$at_msg$at_std"])
|
||||
+ if $at_am_fmt; then
|
||||
+ AS_ECHO(["$at_am_msg: $at_desc"])
|
||||
else
|
||||
- # Make sure there is a separator even with long titles.
|
||||
- AS_ECHO([" $at_color$at_msg$at_std"])
|
||||
+ # In parallel mode, output the summary line only afterwards.
|
||||
+ if test $at_jobs -ne 1 && test -n "$at_verbose"; then
|
||||
+ AS_ECHO(["$at_desc_line $at_color$at_msg$at_std"])
|
||||
+ else
|
||||
+ # Make sure there is a separator even with long titles.
|
||||
+ AS_ECHO([" $at_color$at_msg$at_std"])
|
||||
+ fi
|
||||
fi
|
||||
at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
|
||||
case $at_status in
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
Don't use the target perl when regenerating the man pages.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
diff --git a/man/local.mk b/man/local.mk
|
||||
index e69858b1..78c68ab5 100644
|
||||
--- a/man/local.mk
|
||||
+++ b/man/local.mk
|
||||
@@ -67,13 +67,12 @@ SUFFIXES += .w .1
|
||||
@echo "Updating man page $@"
|
||||
$(MKDIR_P) $(@D)
|
||||
PATH="$(top_srcdir)/man$(PATH_SEPARATOR)$$PATH"; \
|
||||
- PERL="$(PERL)"; \
|
||||
PACKAGE_NAME="$(PACKAGE_NAME)"; \
|
||||
VERSION="$(VERSION)"; \
|
||||
RELEASE_YEAR="$(RELEASE_YEAR)"; \
|
||||
top_srcdir="$(top_srcdir)"; \
|
||||
channeldefs_pm="$(channeldefs_pm)"; \
|
||||
- export PATH PERL PACKAGE_NAME VERSION RELEASE_YEAR; \
|
||||
+ export PATH PACKAGE_NAME VERSION RELEASE_YEAR; \
|
||||
export top_srcdir channeldefs_pm; \
|
||||
$(HELP2MAN) \
|
||||
--include=$(srcdir)/$*.x \
|
||||
@@ -0,0 +1,21 @@
|
||||
For native builds we don't care about the documentation, and this would
|
||||
otherwise pull in a dependency on help2man.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 146e8e3..a1827c1 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -763,10 +762,0 @@ dist_buildaux_SCRIPTS = \
|
||||
-dist_man_MANS = \
|
||||
- man/autoconf.1 \
|
||||
- man/autoheader.1 \
|
||||
- man/autom4te.1 \
|
||||
- man/autoreconf.1 \
|
||||
- man/autoscan.1 \
|
||||
- man/autoupdate.1 \
|
||||
- man/ifnames.1
|
||||
-
|
||||
-
|
||||
@@ -0,0 +1,38 @@
|
||||
From 0aac3047cd7681d610b22d79501c297fa3433148 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 12 Mar 2020 17:25:41 +0000
|
||||
Subject: [PATCH 2/7] m4sh: prefer bash over sh
|
||||
|
||||
_AS_DETECT_BETTER_SHELL looks for a good shell to use, and tries to look for
|
||||
'sh' before 'bash'. Whilst for many systems sh is a symlink to bash,
|
||||
there are many where sh is a symlink to a more minimal sh implementation.
|
||||
|
||||
For example, Debian by default has /bin/sh -> /bin/dash: dash is a faster
|
||||
shell to start (which makes a notable difference to boot speed) but is not
|
||||
as fast as bash at executing long scripts (and configure scripts are not
|
||||
known for their conciseness).
|
||||
|
||||
Change the search order to bash then sh, so that a known-good shell (bash)
|
||||
is used if available over something which is merely POSIX compliant.
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
---
|
||||
lib/m4sugar/m4sh.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
|
||||
index 9d543952..84ef84a9 100644
|
||||
--- a/lib/m4sugar/m4sh.m4
|
||||
+++ b/lib/m4sugar/m4sh.m4
|
||||
@@ -230,7 +230,7 @@ dnl Remove any tests from suggested that are also required
|
||||
[_AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH],
|
||||
[case $as_dir in @%:@(
|
||||
/*)
|
||||
- for as_base in sh bash ksh sh5; do
|
||||
+ for as_base in bash sh ksh sh5; do
|
||||
# Try only shells that exist, to save several forks.
|
||||
as_shell=$as_dir$as_base
|
||||
AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From f4f19a5c03e8ae3b9cc93d24b76694f4b7b2eb76 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 12 Mar 2020 17:28:38 +0000
|
||||
Subject: [PATCH 3/7] program_prefix.patch
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
---
|
||||
lib/autoconf/general.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
|
||||
index 16f0d074..4c5e0b36 100644
|
||||
--- a/lib/autoconf/general.m4
|
||||
+++ b/lib/autoconf/general.m4
|
||||
@@ -2070,7 +2070,7 @@ _AC_CANONICAL_SPLIT([target])
|
||||
|
||||
# The aliases save the names the user supplied, while $host etc.
|
||||
# will get canonicalized.
|
||||
-test -n "$target_alias" &&
|
||||
+test -n "$target_alias" && test "$target_alias" != "$host_alias" &&
|
||||
test "$program_prefix$program_suffix$program_transform_name" = \
|
||||
NONENONEs,x,x, &&
|
||||
program_prefix=${target_alias}-[]dnl
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From a08643ac3fef884900d6cfa161f0acec3ef104d1 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 12 Mar 2020 17:25:37 +0000
|
||||
Subject: [PATCH 1/7] remove-usr-local-lib-from-m4.patch
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
---
|
||||
lib/autoconf/functions.m4 | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
|
||||
index 12f60b99..07da7941 100644
|
||||
--- a/lib/autoconf/functions.m4
|
||||
+++ b/lib/autoconf/functions.m4
|
||||
@@ -801,15 +801,6 @@ if test $ac_have_func = no; then
|
||||
[LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
|
||||
fi
|
||||
|
||||
-if test $ac_have_func = no; then
|
||||
- # There is a commonly available library for RS/6000 AIX.
|
||||
- # Since it is not a standard part of AIX, it might be installed locally.
|
||||
- ac_getloadavg_LIBS=$LIBS
|
||||
- LIBS="-L/usr/local/lib $LIBS"
|
||||
- AC_CHECK_LIB(getloadavg, getloadavg,
|
||||
- [LIBS="-lgetloadavg $LIBS"], [LIBS=$ac_getloadavg_LIBS])
|
||||
-fi
|
||||
-
|
||||
# Make sure it is really in the library, if we think we found it,
|
||||
# otherwise set up the replacement function.
|
||||
AC_CHECK_FUNCS(getloadavg, [],
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user