| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | In order to enable musl or other libc support, force update the config.guess |
| 2 | |
| 3 | In order to reliably replace config.guess and config.sub, we need to remove |
| 4 | them prior to the call to automake. Adding the --force-missing is likely |
| 5 | not necessary, but matching normal OE autoreconf usage. |
| 6 | |
| 7 | Upstream-Status: Inappropriate [configuration] |
| 8 | |
| 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 10 | |
| 11 | Index: rpm-5.4.15/autogen.sh |
| 12 | =================================================================== |
| 13 | --- rpm-5.4.15.orig/autogen.sh |
| 14 | +++ rpm-5.4.15/autogen.sh |
| 15 | @@ -73,7 +73,8 @@ rm -f aclocal.m4 |
| 16 | aclocal -I m4 |
| 17 | autoheader -I m4 |
| 18 | echo "---> generate files via GNU automake (automake)" |
| 19 | -automake -Wall -Wno-override -a -c |
| 20 | +rm -f config.guess config.sub |
| 21 | +automake -Wall -Wno-override -a -c --force-missing |
| 22 | echo "---> generate files via GNU autoconf (autoconf)" |
| 23 | autoconf -I m4 |
| 24 | echo "<=== rpm" |
| 25 | Index: rpm-5.4.15/beecrypt/autogen.sh |
| 26 | =================================================================== |
| 27 | --- rpm-5.4.15.orig/beecrypt/autogen.sh |
| 28 | +++ rpm-5.4.15/beecrypt/autogen.sh |
| 29 | @@ -25,6 +25,7 @@ libtoolize () { |
| 30 | |
| 31 | libtoolize --force --copy |
| 32 | aclocal |
| 33 | -automake -a -c |
| 34 | +rm -f config.guess config.sub |
| 35 | +automake -a -c --force-missing |
| 36 | autoconf |
| 37 | autoheader |
| 38 | Index: rpm-5.4.15/libtpm/autogen.sh |
| 39 | =================================================================== |
| 40 | --- rpm-5.4.15.orig/libtpm/autogen.sh |
| 41 | +++ rpm-5.4.15/libtpm/autogen.sh |
| 42 | @@ -46,7 +46,8 @@ echo "---> generate files via GNU autoco |
| 43 | aclocal |
| 44 | autoheader |
| 45 | echo "---> generate files via GNU automake (automake)" |
| 46 | -automake -Wall -Wno-override -a -c |
| 47 | +rm -f config.guess config.sub |
| 48 | +automake -Wall -Wno-override -a -c --force-missing |
| 49 | echo "---> generate files via GNU autoconf (autoconf)" |
| 50 | autoconf |
| 51 | |
| 52 | Index: rpm-5.4.15/neon/autogen.sh |
| 53 | =================================================================== |
| 54 | --- rpm-5.4.15.orig/neon/autogen.sh |
| 55 | +++ rpm-5.4.15/neon/autogen.sh |
| 56 | @@ -63,7 +63,8 @@ echo "---> generate files via GNU autoco |
| 57 | ${ACLOCAL:-aclocal} -I macros |
| 58 | ${AUTOHEADER:-autoheader} |
| 59 | echo "---> generate files via GNU automake (automake)" |
| 60 | -${AUTOMAKE:-automake} -Wall -Wno-override -a -c |
| 61 | +rm -f config.guess config.sub |
| 62 | +${AUTOMAKE:-automake} -Wall -Wno-override -a -c --force-missing |
| 63 | echo "---> generate files via GNU autoconf (autoconf)" |
| 64 | ${AUTOCONF:-autoconf} -Wall |
| 65 | |
| 66 | Index: rpm-5.4.15/syck/autogen.sh |
| 67 | =================================================================== |
| 68 | --- rpm-5.4.15.orig/syck/autogen.sh |
| 69 | +++ rpm-5.4.15/syck/autogen.sh |
| 70 | @@ -40,6 +40,7 @@ echo "---> generate files via GNU autoco |
| 71 | aclocal |
| 72 | autoheader |
| 73 | echo "---> generate files via GNU automake (automake)" |
| 74 | -automake -Wall -Wno-override -a -c |
| 75 | +rm -f config.guess config.sub |
| 76 | +automake -Wall -Wno-override -a -c --force-missing |
| 77 | echo "---> generate files via GNU autoconf (autoconf)" |
| 78 | autoconf |