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

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

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 852f733ca8e355259f4060052dd3b207588c331b..1268ab522bb468f1b4ea27898460df3c4485d4fe 100644 (file)
--- 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 d30367cb84ad032b55579f7c99582fb7727b781b..962eeb84a097bc59790747638b990ac4152ef295 100644 (file)
--- 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 d30367cb84ad032b55579f7c99582fb7727b781b..962eeb84a097bc59790747638b990ac4152ef295 100644 (file)
--- 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 3753c52bd858b4a8e3e6c2bef325951fbf518231..dbb587a3f055276656e7423fb43f27c57ca7aa44 100644 (file)
--- 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.