This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 3510ac8  ARROW-3370: [Packaging] Suppress BFD warnings on CentOS 6
3510ac8 is described below

commit 3510ac87e988ab2d50278f30ce60da82aae27db3
Author: Kouhei Sutou <[email protected]>
AuthorDate: Mon Oct 1 04:14:39 2018 -0400

    ARROW-3370: [Packaging] Suppress BFD warnings on CentOS 6
    
    CentOS 6 build: https://travis-ci.org/kou/crossbow/builds/435405456
    
    Author: Kouhei Sutou <[email protected]>
    
    Closes #2668 from kou/rpm-centos-suppress-bfd-warnings and squashes the 
following commits:
    
    1d61da402 <Kouhei Sutou>  Suppress BFD warnings on CentOS 6
---
 dev/tasks/linux-packages/yum/build.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev/tasks/linux-packages/yum/build.sh 
b/dev/tasks/linux-packages/yum/build.sh
index 5f22056..1d15d9d 100755
--- a/dev/tasks/linux-packages/yum/build.sh
+++ b/dev/tasks/linux-packages/yum/build.sh
@@ -93,13 +93,22 @@ run cp \
     /host/tmp/${distribution}/${PACKAGE}.spec \
     rpmbuild/SPECS/
 
-cat <<BUILD > build.sh
+run cat <<BUILD > build.sh
 #!/bin/bash
 
 rpmbuild -ba ${rpmbuild_options} rpmbuild/SPECS/${PACKAGE}.spec
 BUILD
 run chmod +x build.sh
 if [ "${distribution_version}" = 6 ]; then
+  run cat <<WHICH_STRIP > which-strip.sh
+#!/bin/bash
+
+which strip
+WHICH_STRIP
+  run chmod +x which-strip.sh
+  run cat <<USE_DEVTOOLSET_STRIP >> ~/.rpmmacros
+%__strip $(run scl enable devtoolset-6 ./which-strip.sh)
+USE_DEVTOOLSET_STRIP
   if [ "${DEBUG:-no}" = "yes" ]; then
     run scl enable devtoolset-6 ./build.sh
   else

Reply via email to