diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-09-28 20:32:59 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-09-28 20:32:59 (GMT) |
| commit | d0dd654ca65029da8b30e2437a29c0934b7ecf80 (patch) | |
| tree | 701785c1e51328cc05da10adabcc1bee03288914 /scripts | |
| parent | 5f18c3ed4e3af50f18985def9d7d1f640fd9577f (diff) | |
| parent | 9d7c783a93dd4693a009aae5e99156c1f187acaf (diff) | |
Merge pull request #1038 from stilor/make-fix-glob
Fix make's glob() with new glibc
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/libc/glibc.sh | 1 | ||||
| -rw-r--r-- | scripts/functions | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index f8af7fc..bc48cee 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -26,7 +26,6 @@ do_libc_extract() { CT_DoExecLog ALL ln -sf "${CT_GLIBC_PORTS_SRC_DIR}/${CT_GLIBC_PORTS_BASENAME}" \ "${CT_GLIBC_SRC_DIR}/${CT_GLIBC_BASENAME}/ports" fi - # TBD make the configure timestamp fix in all patched packages (e.g. part of CT_ExtractPatch) } # Build and install headers and start files diff --git a/scripts/functions b/scripts/functions index 2267a95..2e875f7 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2165,6 +2165,20 @@ CT_DoExtractPatch() CT_DoExecLog ALL "${CT_CONFIG_SHELL}" -c "${devel_bootstrap}" fi + # Fix up the timestamps on the file we may be patching: otherwise, we may + # have a circular dependency. For example, we need make to build autoconf + # and automake companion tools, but we need autoconf and automake to regenerate + # aclocal.m4 or config.h.in after the patch touches configure.ac. Instead, + # assume the patch fixes all the files it needs. + find . -type f -name "aclocal.m4" \ + -exec touch {} \; -exec echo touch {} \; | CT_DoLog ALL + find . -type f -name "config.h.in" \ + -exec touch {} \; -exec echo touch {} \; | CT_DoLog ALL + find . -type f -name "Makefile.in" \ + -exec touch {} \; -exec echo touch {} \; | CT_DoLog ALL + find . -type f -name "configure" \ + -exec touch {} \; -exec echo touch {} \; | CT_DoLog ALL + if [ -n "${patchfunc}" ]; then ${patchfunc} fi |