From 51a3606b17b62eb5a9ae5616467f8814792969b7 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 2 Dec 2016 14:50:58 -0800 Subject: Fix use of custom location if it is a directory. In that case, CT_GetCustom just creates a symlink to the original. In that case, 'cp -a .' gives an error and 'cp -a ' creates as a symlink (which will then run the build inside the shared directory, .build/src/). Signed-off-by: Alexey Neyman --- scripts/build/companion_libs/320-libiconv.sh | 2 +- scripts/build/companion_libs/330-gettext.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/companion_libs') diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh index 2f1b2094..ffe60c23 100644 --- a/scripts/build/companion_libs/320-libiconv.sh +++ b/scripts/build/companion_libs/320-libiconv.sh @@ -88,7 +88,7 @@ do_libiconv_backend() { CT_DoLog EXTRA "Configuring libiconv" - CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}" "." + CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/." "." if [ "${static_build}" = "y" ]; then extra_config+=("--disable-shared") diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index 6be51bfc..19d3ca8b 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -88,7 +88,7 @@ do_gettext_backend() { CT_DoLog EXTRA "Configuring gettext" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/"/* . + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/." . # A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions # but gettext configure doesn't see this flag when it checks for that. An -- cgit v1.2.3