# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1318769909 -7200
# Node ID f070d922facf42b0395b7db909e1867d45b245dd
# Parent  3976adc582fb16e7d2dcfc50bdf1ed9969873f1a
complibs/cloog: fix extraction

In the early days, cloog-ppl was bizarrely packaged: the first tarball
did not contain the version in the name of the extracted directory, so
we had to play tricks.

Nowadays, however, the first component of the path are stripped when
extracting a  tarball, which means that the created directory will
always be properly named. So, our old tricks do no longer work, and
worse, they break the build.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -r 3976adc582fb -r f070d922facf scripts/build/companion_libs/cloog.sh
--- a/scripts/build/companion_libs/cloog.sh	Sun Oct 16 14:38:52 2011 +0200
+++ b/scripts/build/companion_libs/cloog.sh	Sun Oct 16 14:58:29 2011 +0200
@@ -19,31 +19,22 @@
 do_cloog_extract() {
     local _t
 
-    CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}"
-
     # 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
-    CT_Pushd "${CT_SRC_DIR}/cloog-ppl${_t}"
-    CT_Patch nochdir "cloog-ppl" "${CT_CLOOG_VERSION}"
+    # But, because the infrastructure properly creates the extracted
+    # directories (with tar's --strip-components), we can live safely...
+    CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}"
+    CT_Patch "cloog-ppl" "${CT_CLOOG_VERSION}"
+
     if [ "${CT_CLOOG_VERSION}" = "0.15.10" ]; then
+        CT_Pushd "${CT_SRC_DIR}/cloog-ppl-${CT_CLOOG_VERSION}"
         CT_DoExecLog CFG ./autogen.sh
+        CT_Popd
     fi
-    CT_Popd
 }
 
 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
+    local cloog_src_dir="${CT_SRC_DIR}/cloog-ppl-${CT_CLOOG_VERSION}"
 
     mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
     cd "${CT_BUILD_DIR}/build-cloog-ppl"
@@ -55,7 +46,7 @@
     CT_DoExecLog CFG                            \
     CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
     LDFLAGS="-lm"                               \
-    "${CT_SRC_DIR}/cloog-ppl${_t}/configure"    \
+    "${cloog_src_dir}/configure"                \
         --build=${CT_BUILD}                     \
         --host=${CT_HOST}                       \
         --prefix="${CT_COMPLIBS_DIR}"           \