Merge pull request #814 from stilor/issue-802

Issue 802

1 files changed, 11 insertions, 6 deletions

diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index eae64bc..c09ff5c 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)
 }
 
@@ -124,8 +128,9 @@ do_libc_backend_once() {
     # Also, if those two are missing, iconv build breaks
     extra_config+=( --disable-debug --disable-sanity-checks )
 
-    # always include rpc, the user can still override it with TI-RPC
-    extra_config+=( --enable-obsolete-rpc )
+    if [ "${CT_GLIBC_ENABLE_OBSOLETE_RPC}" = "y" ]; then
+        extra_config+=( --enable-obsolete-rpc )
+    fi
 
     # Add some default glibc config options if not given by user.
     # We don't need to be conditional on whether the user did set different