From 028b9d1c98e2c96745f5c2ae5089076a17b96667 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Sep 2009 12:25:33 +0200
Subject: comp-libs/cloog: fix building

For CLooG/PPL 0.15.3, the directory name was simply cloog-ppl.
For any later versions, the driectory name does have the version, such as
cloog-ppl-0.15.4.
---
 scripts/build/companion_libs/cloog.sh | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index fae3f72d..f6eb68a3 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -34,22 +34,31 @@ do_cloog_extract() {
 }
 
 do_cloog() {
+    local _t
+
+    # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
+    # while versions 0.15.4 onward do have the version in the dirname.
+    case "${CT_CLOOG_VERSION}" in
+        0.15.3) _t="";;
+        *)      _t="-${CT_CLOOG_VERSION}";;
+    esac
+
     mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
     cd "${CT_BUILD_DIR}/build-cloog-ppl"
 
     CT_DoStep INFO "Installing CLooG/ppl"
 
     CT_DoLog EXTRA "Configuring CLooG/ppl"
-    CFLAGS="${CT_CFLAGS_FOR_HOST}"      \
-    CT_DoExecLog ALL                    \
-    "${CT_SRC_DIR}/cloog-ppl/configure" \
-        --build=${CT_BUILD}             \
-        --host=${CT_HOST}               \
-        --prefix="${CT_PREFIX_DIR}"     \
-        --with-gmp="${CT_PREFIX_DIR}"   \
-        --with-ppl="${CT_PREFIX_DIR}"   \
-        --enable-shared                 \
-        --disable-static                \
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
+    CT_DoExecLog ALL                            \
+    "${CT_SRC_DIR}/cloog-ppl${_t}/configure"    \
+        --build=${CT_BUILD}                     \
+        --host=${CT_HOST}                       \
+        --prefix="${CT_PREFIX_DIR}"             \
+        --with-gmp="${CT_PREFIX_DIR}"           \
+        --with-ppl="${CT_PREFIX_DIR}"           \
+        --enable-shared                         \
+        --disable-static                        \
         --with-bits=gmp
 
     CT_DoLog EXTRA "Building CLooG/ppl"
-- 
cgit v1.2.3


From 2d6a221babda79345734688ffd9f36261121cae0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Sep 2009 17:14:28 +0200
Subject: samples: correclty fix saving samples with a C library config file

---
 scripts/saveSample.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in
index 9e4e3584..e91dc9e0 100644
--- a/scripts/saveSample.sh.in
+++ b/scripts/saveSample.sh.in
@@ -99,7 +99,7 @@ fi
 if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
     # We save the file, and then point the saved sample to this file
     CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
-    "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
+    "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
              "${samp_dir}/crosstool.config"
 else
     # remove any dangling files
-- 
cgit v1.2.3