[PATCH] libosmocore[master]: Add generic configure step

[Max]

Review at  https://gerrit.osmocom.org/6013

Add generic configure step

Add function to run ./configure and use it from arch-specific scripts.

Change-Id: Ibb2f018780c82d798ff0e8a0a836d1aa8d0d7670
---
M contrib/jenkins_amd64.sh
M contrib/jenkins_arm.sh
M contrib/jenkins_common.sh
3 files changed, 17 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/6013/1

diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh
index ff1cfdc..a1e37b4 100755
--- a/contrib/jenkins_amd64.sh
+++ b/contrib/jenkins_amd64.sh
@@ -15,7 +15,10 @@
 
     prep_build "$src_dir" "$build_dir"
 
-    "$src_dir"/configure  --disable-silent-rules --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" CPPFLAGS="-Werror"
+    _c_flags="-Werror"
+    _cpp_flags="-Werror"
+    _conf="--disable-silent-rules --enable-static $ENABLE_SANITIZE"
+    run_configure "$src_dir" "$_conf" "$_c_flags" "$_cpp_flags"
 
     run_make
 }
diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh
index 4579596..0c5a507 100755
--- a/contrib/jenkins_arm.sh
+++ b/contrib/jenkins_arm.sh
@@ -8,13 +8,10 @@
 
     prep_build "$src_dir" "$build_dir"
 
-    "$src_dir"/configure --enable-static \
-	--prefix=/usr/local/arm-none-eabi \
-	--host=arm-none-eabi \
-	--enable-embedded \
-	--disable-doxygen \
-	--disable-shared \
-	CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror"
+    _c_flags="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror"
+    _cpp_flags=""
+    _conf="--enable-static --prefix=/usr/local/arm-none-eabi --host=arm-none-eabi --enable-embedded --disable-doxygen --disable-shared"
+    run_configure "$src_dir" "$_conf" "$_c_flags" "$_cpp_flags"
 
     run_make
 }
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index 41c7fb4..5a54eeb 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -27,6 +27,15 @@
     cd "$_build_dir"
 }
 
+run_configure() {
+    _src_dir="$1"
+    _conf_flags="$2"
+    _c_flags="$3"
+    _cpp_flags="$4"
+
+    "$_src_dir"/configure "$_conf_flags" CFLAGS="$_c_flags" CPPFLAGS="$_cpp_flags"
+}
+
 run_make() {
     $MAKE "$PARALLEL_MAKE" check || cat-testlogs.sh
 }

-- 
To view, visit https://gerrit.osmocom.org/6013
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb2f018780c82d798ff0e8a0a836d1aa8d0d7670
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>