From 5324905c1446d898d9a8f578555c1e54a2fbc89c Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 25 Aug 2017 08:42:19 -0700 Subject: Fix glibc-ports with the new framework While here, also consider patched by anything other than "bundled patches" as per-target sources. Add scary warnings in case of a failure. Signed-off-by: Alexey Neyman --- scripts/build/libc/glibc.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'scripts/build/libc') diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index eae64bc4..84bfeed8 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -5,7 +5,6 @@ do_libc_get() { local date local version - local -a addons_list CT_Fetch GLIBC if [ "${CT_GLIBC_USE_PORTS_EXTERNAL}" = "y" ]; then @@ -15,13 +14,18 @@ do_libc_get() { } do_libc_extract() { - local addon - CT_ExtractPatch GLIBC if [ "${CT_GLIBC_USE_PORTS_EXTERNAL}" = "y" ]; then CT_ExtractPatch GLIBC_PORTS + + # This may create a bogus symlink if glibc-ports is using custom + # sources or has an overlay (and glibc is shared). However, + # we do not support concurrent use of the source directory + # and next run, if using different glibc-ports source, will override + # this symlink anyway. + 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 patches for addons (ports? anything else?) uniformly using short names # TBD make the configure timestamp fix in all patched packages (e.g. part of CT_ExtractPatch) } -- cgit v1.2.3