diff options
| -rw-r--r-- | patches/eglibc/2_8/110-AC_PREREQ-2.50.patch | 78 | ||||
| -rw-r--r-- | scripts/build/libc/eglibc.sh | 7 | ||||
| -rw-r--r-- | scripts/build/libc/glibc.sh | 5 |
3 files changed, 11 insertions, 79 deletions
diff --git a/patches/eglibc/2_8/110-AC_PREREQ-2.50.patch b/patches/eglibc/2_8/110-AC_PREREQ-2.50.patch deleted file mode 100644 index 38388ec..0000000 --- a/patches/eglibc/2_8/110-AC_PREREQ-2.50.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: sysdeps/powerpc/powerpc32/configure.in -=================================================================== ---- libc/sysdeps/powerpc/powerpc32/configure.in (revision 7000) -+++ libc/sysdeps/powerpc/powerpc32/configure.in (working copy) -@@ -1,6 +1,8 @@ - GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - # Local configure fragment for sysdeps/powerpc/powerpc32. - -+AC_PREREQ(2.50) -+ - # See whether gas has R_PPC_REL16 relocs. - AC_CACHE_CHECK(for R_PPC_REL16 gas support, libc_cv_ppc_rel16, [dnl - cat > conftest.s <<\EOF -Index: sysdeps/powerpc/powerpc32/elf/configure.in -=================================================================== ---- libc/sysdeps/powerpc/powerpc32/elf/configure.in (revision 7000) -+++ libc/sysdeps/powerpc/powerpc32/elf/configure.in (working copy) -@@ -1,6 +1,8 @@ - GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - # Local configure fragment for sysdeps/powerpc32/elf. - -+AC_PREREQ(2.50) -+ - if test "$usetls" != no; then - # Check for support of thread-local storage handling in assembler and - # linker. -Index: sysdeps/powerpc/configure.in -=================================================================== ---- libc/sysdeps/powerpc/configure.in (revision 7000) -+++ libc/sysdeps/powerpc/configure.in (working copy) -@@ -1,6 +1,8 @@ - GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - # Local configure fragment for sysdeps/powerpc. - -+AC_PREREQ(2.50) -+ - # Accept binutils which knows about ".machine". - AC_CACHE_CHECK(for .machine support, libc_cv_ppc_machine, [dnl - cat > conftest.s <<\EOF -Index: sysdeps/unix/sysv/linux/powerpc/configure.in -=================================================================== ---- libc/sysdeps/unix/sysv/linux/powerpc/configure.in (revision 7000) -+++ libc/sysdeps/unix/sysv/linux/powerpc/configure.in (working copy) -@@ -2,6 +2,8 @@ - GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. - -+AC_PREREQ(2.50) -+ - AC_CACHE_CHECK(whether $CC $CFLAGS -mlong-double-128 uses IBM extended format, - libc_cv_mlong_double_128ibm, [dnl - save_CFLAGS="$CFLAGS" -Index: sysdeps/ieee754/ldbl-opt/configure.in -=================================================================== ---- libc/sysdeps/ieee754/ldbl-opt/configure.in (revision 7000) -+++ libc/sysdeps/ieee754/ldbl-opt/configure.in (working copy) -@@ -2,6 +2,8 @@ - GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - # Local configure fragment for sysdeps/ieee754/ldbl-opt/. - -+AC_PREREQ(2.50) -+ - AC_CACHE_CHECK(whether $CC $CFLAGS supports -mlong-double-128, - libc_cv_mlong_double_128, [dnl - save_CFLAGS="$CFLAGS" -Index: libidn/configure.in -=================================================================== ---- libc/libidn/configure.in (revision 7000) -+++ libc/libidn/configure.in (working copy) -@@ -1,6 +1,8 @@ - dnl glibc configure fragment for libidn add-on - GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - -+AC_PREREQ(2.50) -+ - libc_add_on_canonical= - libc_add_on_subdirs=. - diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index 29e2719..a803b5e 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -110,6 +110,11 @@ do_libc_extract() { CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" done + # The configure files may be older than the configure.in files + # if using a snapshot (or even some tarballs). Fake them being + # up to date. + find "${CT_SRC_DIR}/${CT_LIBC_FILE}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL + return 0 } @@ -118,7 +123,7 @@ do_libc_check_config() { : } -# This function installs the glibc headers needed to build the core compiler +# This function installs the eglibc headers needed to build the core compiler do_libc_headers() { # Instead of doing two time the same actions, headers will # be installed with start files diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 2f78007..844f949 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -46,6 +46,11 @@ do_libc_extract() { CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" done + # The configure files may be older than the configure.in files + # if using a snapshot (or even some tarballs). Fake them being + # up to date. + find "${CT_SRC_DIR}/${CT_LIBC_FILE}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL + return 0 } |