From: Kefu Chai <kchai@redhat.com>
Date: Sat, 9 Dec 2017 11:38:56 +0000 (+0800)
Subject: ceph-*-setup/build/build: enable WITH_STATIC_LIBSTDCXX for xenial and trusty for... 
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F937%2Fhead;p=ceph-build.git

ceph-*-setup/build/build: enable WITH_STATIC_LIBSTDCXX for xenial and trusty for new branchs

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 852f733c..1268ab52 100644
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -72,6 +72,11 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
+
+if [ -n $(extra_cmake_args) ]; then
+    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)"
+fi
+
 # pass only those env vars specifically noted
 sudo \
     CEPH_EXTRA_CMAKE_ARGS=$CEPH_EXTRA_CMAKE_ARGS \
diff --git a/ceph-dev-build/build/build_deb b/ceph-dev-build/build/build_deb
index d30367cb..962eeb84 100644
--- a/ceph-dev-build/build/build_deb
+++ b/ceph-dev-build/build/build_deb
@@ -72,6 +72,11 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
+
+if [ -n $(extra_cmake_args) ]; then
+    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)"
+fi
+
 # pass only those env vars specifically noted
 sudo \
     CEPH_EXTRA_CMAKE_ARGS=$CEPH_EXTRA_CMAKE_ARGS \
diff --git a/ceph-dev-new-build/build/build_deb b/ceph-dev-new-build/build/build_deb
index d30367cb..962eeb84 100644
--- a/ceph-dev-new-build/build/build_deb
+++ b/ceph-dev-new-build/build/build_deb
@@ -72,6 +72,11 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
+
+if [ -n $(extra_cmake_args) ]; then
+    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)"
+fi
+
 # pass only those env vars specifically noted
 sudo \
     CEPH_EXTRA_CMAKE_ARGS=$CEPH_EXTRA_CMAKE_ARGS \
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 3753c52b..dbb587a3 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -483,6 +483,32 @@ EOF
     fi
 }
 
+extra_cmake_args() {
+    # statically link against libstdc++ for building new releases on old distros
+    case $vers in
+        10.*)
+            # jewel
+            use_ppa=false;;
+        12.*)
+            # luminous
+            use_ppa=false;;
+        *)
+            # mimic, nautilus, *
+            case $DIST in
+                trusty)
+                    use_ppa=true;;
+                xenial)
+                    use_ppa=true;;
+                *)
+                    use_ppa=false;;
+            esac
+            ;;
+    esac
+    if $use_ppa; then
+        echo "-DWITH_STATIC_LIBSTDCXX=ON"
+    fi
+}
+
 delete_libvirt_vms() {
     # Delete any VMs leftover from previous builds.
     # Primarily used for Vagrant VMs leftover from docker builds.