HAYASHI Kentaro
null+****@clear*****
Fri Aug 24 15:00:47 JST 2012
HAYASHI Kentaro 2012-08-24 15:00:47 +0900 (Fri, 24 Aug 2012) New Revision: 9d241ae48bf0c3be4bd35a5eef0cd536f1402807 https://github.com/groonga/groonga/commit/9d241ae48bf0c3be4bd35a5eef0cd536f1402807 Log: yum: use rpmbuild --target option instead of using customized .rpmrc refs #1455 Modified files: packages/yum/build-rpm.sh Modified: packages/yum/build-rpm.sh (+6 -4) =================================================================== --- packages/yum/build-rpm.sh 2012-08-24 13:02:08 +0900 (b46d038) +++ packages/yum/build-rpm.sh 2012-08-24 15:00:47 +0900 (05040bb) @@ -94,8 +94,7 @@ cat <<EOM > ~/.rpmmacros %_topdir \$HOME/rpmbuild EOM -cat /usr/lib/rpm/rpmrc > ~/.rpmrc-for-mecab -sed -i'' -e 's/march=i386/march=i586/' ~/.rpmrc-for-mecab +architecture=\$(cut -d '-' -f 1 /etc/rpm/platform) rm -rf rpmbuild mkdir -p rpmbuild/SOURCES @@ -119,8 +118,11 @@ mv *.spec ~/rpmbuild/SPECS/ mv * ~/rpmbuild/SOURCES/ cd .. rm -rf tmp -rpmbuild -ba rpmbuild/SPECS/*.spec --rcfile ~/.rpmrc-for-mecab \ - --buildroot ~/rpmbuild/BUILDROOT/\${srpm_base} +mecab_build_options="--buildroot \$HOME/rpmbuild/BUILDROOT/\${srpm_base}" +if [ \$architecture = "i386" ]; then + mecab_build_options="\${mecab_build_options} --target i586" +fi +rpmbuild -ba rpmbuild/SPECS/*.spec \${mecab_build_options} cp -p rpmbuild/RPMS/*/*.rpm dependencies/RPMS/ cp -p rpmbuild/SRPMS/*.rpm dependencies/SRPMS/ -------------- next part -------------- HTML����������������������������...Download
