[eclipse-cdt] Add additional arch linux plug-in to core.native feature
Jeff Johnston
jjohnstn at fedoraproject.org
Mon Jun 30 07:21:57 UTC 2014
commit f8d9c049f27bc4d13a2c4b8e0b76c3e54702235b
Author: jjohnstn <jjohnstn at redhat.com>
Date: Mon Jun 30 03:21:04 2014 -0400
Add additional arch linux plug-in to core.native feature
eclipse-cdt.spec | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index a78f8f0..4c0d1c2 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -21,7 +21,7 @@ Epoch: 1
%ifarch %{arm}
%define eclipse_arch arm
%else
-%define eclipse_arch %{_arch}
+%define eclipse_arch %{_arch}
%endif
%endif
@@ -172,9 +172,9 @@ sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
# Add secondary arch support if we are building there
%ifarch %{arm} s390 s390x aarch64
pushd core
-pushd org.eclipse.cdt.core
+pushd org.eclipse.cdt.core.native
sed -i -e 's/linux.x86 /linux.%{eclipse_arch} /g' plugin.properties
-sed -i -e 's/\(x86\)/\(%{eclipse_arch}\)/g' plugin.properties
+sed -i -e 's/\\(x86\\)/(%{eclipse_arch})/g' plugin.properties
popd
cp -r org.eclipse.cdt.core.linux.x86 org.eclipse.cdt.core.linux.%{eclipse_arch}
pushd org.eclipse.cdt.core.linux
@@ -182,7 +182,6 @@ sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
popd
pushd org.eclipse.cdt.core.linux.%{eclipse_arch}
sed -i -e 's/x86/%{eclipse_arch}/g' pom.xml
-sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
pushd META-INF
sed -i -e 's/x86/%{eclipse_arch}/g' MANIFEST.MF
popd
@@ -191,7 +190,7 @@ mv x86 %{eclipse_arch}
popd
popd
popd
-pushd releng/org.eclipse.cdt.platform-feature
+pushd releng/org.eclipse.cdt.native-feature
sed -i -e 's/"org.eclipse.cdt.core.linux.x86"/"org.eclipse.cdt.core.linux.%{eclipse_arch}"/g' feature.xml
sed -i -e 's/arch="x86"/arch="%{eclipse_arch}"/' feature.xml
popd
More information about the scm-commits
mailing list