scripts/functions: make CT_Patch dumber

It is the responsibility of the caller to split the package name from
its version. It already knows that.

6 files changed, 6 insertions, 6 deletions

diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index e858931..73844ef 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -29,7 +29,7 @@ do_cloog_extract() {
         *)      _t="-${CT_CLOOG_VERSION}";;
     esac
     CT_Pushd "${CT_SRC_DIR}/cloog-ppl${_t}"
-    CT_Patch nochdir "cloog-ppl-${CT_CLOOG_VERSION}"
+    CT_Patch nochdir "cloog-ppl" "${CT_CLOOG_VERSION}"
     CT_Popd
 }
 
diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh
index 5bcc39a..11da8f7 100644
--- a/scripts/build/companion_libs/gmp.sh
+++ b/scripts/build/companion_libs/gmp.sh
@@ -18,7 +18,7 @@ do_gmp_get() {
 # Extract GMP
 do_gmp_extract() {
     CT_Extract "gmp-${CT_GMP_VERSION}"
-    CT_Patch "gmp-${CT_GMP_VERSION}"
+    CT_Patch "gmp" "${CT_GMP_VERSION}"
 }
 
 if [ "${CT_GMP}" = "y" ]; then
diff --git a/scripts/build/companion_libs/libelf.sh b/scripts/build/companion_libs/libelf.sh
index 67e85b4..59dea27 100644
--- a/scripts/build/companion_libs/libelf.sh
+++ b/scripts/build/companion_libs/libelf.sh
@@ -16,7 +16,7 @@ do_libelf_get() {
 
 do_libelf_extract() {
     CT_Extract "libelf-${CT_LIBELF_VERSION}"
-    CT_Patch "libelf-${CT_LIBELF_VERSION}"
+    CT_Patch "libelf" "${CT_LIBELF_VERSION}"
 }
 
 if [ "${CT_LIBELF}" = "y" ]; then
diff --git a/scripts/build/companion_libs/mpc.sh b/scripts/build/companion_libs/mpc.sh
index 9631b52..652931f 100644
--- a/scripts/build/companion_libs/mpc.sh
+++ b/scripts/build/companion_libs/mpc.sh
@@ -19,7 +19,7 @@ do_mpc_get() {
 # Extract MPC
 do_mpc_extract() {
     CT_Extract "mpc-${CT_MPC_VERSION}"
-    CT_Patch "mpc-${CT_MPC_VERSION}"
+    CT_Patch "mpc" "${CT_MPC_VERSION}"
 }
 
 do_mpc() {
diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh
index 1c14c67..ecb63c2 100644
--- a/scripts/build/companion_libs/mpfr.sh
+++ b/scripts/build/companion_libs/mpfr.sh
@@ -19,7 +19,7 @@ do_mpfr_get() {
 # Extract MPFR
 do_mpfr_extract() {
     CT_Extract "mpfr-${CT_MPFR_VERSION}"
-    CT_Patch "mpfr-${CT_MPFR_VERSION}"
+    CT_Patch "mpfr" "${CT_MPFR_VERSION}"
 
     # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the
     # same version number. Unfortunately, some tarballs of MPFR are not
diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh
index a2c9a0e..7746af1 100644
--- a/scripts/build/companion_libs/ppl.sh
+++ b/scripts/build/companion_libs/ppl.sh
@@ -21,7 +21,7 @@ do_ppl_get() {
 # Extract PPL
 do_ppl_extract() {
     CT_Extract "ppl-${CT_PPL_VERSION}"
-    CT_Patch "ppl-${CT_PPL_VERSION}"
+    CT_Patch "ppl" "${CT_PPL_VERSION}"
 }
 
 do_ppl() {