[openrtm-commit:01953] r2733 - trunk/OpenRTM-aist/packages/rpm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-05-25 14:57:04 +0900 (Wed, 25 May 2016)
New Revision: 2733

Modified:
   trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in
Log:
[compat,build,->RELENG_1_1] Now 32bit-Fedora rpm package build arch target is fixed to i686. i386 causes ___atomic_fetch_add_4 undef ref error. Therror is reported #2453.

Modified: trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in
===================================================================
--- trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2016-05-24 09:38:29 UTC (rev 2732)
+++ trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2016-05-25 05:57:04 UTC (rev 2733)
@@ -59,11 +59,13 @@
 
 echo "distribution: " $dist_name
 
+arch=`uname -i | sed -s 's/i[3-5]/i6/g'`
+
 #------------------------------------------------------------
 # package build process
 #------------------------------------------------------------
 mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-mkdir -p RPMS/{i386,i586,i686,x86_64,noarch}
+mkdir -p RPMS/{$arch,noarch}
 
 # fake tar-ball is created under SOURCES dir
 rm -f $packagename
@@ -94,6 +96,6 @@
 # We have already extracted source under BUILD directory.
 # %prep process can be skiped. = --short-circuit -bc
 rpm_def="_topdir $builddir"
-rpmbuild --target `uname -i` --define "$rpm_def" -ba OpenRTM-aist.spec
+rpmbuild --target "$arch" --define "$rpm_def" -ba OpenRTM-aist.spec
 cd ..
 rm $packagename