The package rpms/eclipse-cdt.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-cdt.git/commit/?id=4bf02e....
Change:
+%ifarch s390x aarch64 ppc64le ppc64 arm
Thanks.
Full change:
============
commit 4bf02e160bb1c7695da47466ea1a756b47eabf50
Author: Jeff Johnston <jjohnstn(a)redhat.com>
Date: Wed Oct 10 10:37:36 2018 -0400
Build the CDT standalone debugger as an RCP application and package
diff --git a/eclipse-cdt-standalone.patch b/eclipse-cdt-standalone.patch
new file mode 100644
index 0000000..7a6ff5d
--- /dev/null
+++ b/eclipse-cdt-standalone.patch
@@ -0,0 +1,30 @@
+diff -up ./debug/org.eclipse.cdt.debug.application.product/pom.xml.fix
./debug/org.eclipse.cdt.debug.application.product/pom.xml
+--- ./debug/org.eclipse.cdt.debug.application.product/pom.xml.fix 2018-10-07
17:59:03.162394450 +0000
++++ ./debug/org.eclipse.cdt.debug.application.product/pom.xml 2018-10-07
17:59:35.593266852 +0000
+@@ -72,26 +72,6 @@
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+- <environment>
+- <os>linux</os>
+- <ws>gtk</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86_64</arch>
+- </environment>
+ </environments>
+ </configuration>
+ </plugin>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 9316338..ce24375 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -16,6 +16,8 @@ Epoch: 2
%global cdt_snapshot org.eclipse.cdt-55569e158ce4a1026f3d2405945154d349dc724c
%global template_snapshot
org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5
+%global _cdtstandalonedir %{_prefix}/lib/cdt-stand-alone-debugger
+
%ifarch %{ix86}
%global eclipse_arch x86
%endif
@@ -36,7 +38,7 @@ Epoch: 2
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: 9.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: EPL-1.0 and CPL
URL:
http://www.eclipse.org/cdt
@@ -65,7 +67,11 @@ Patch3: eclipse-cdt-cdtdebug-readme.patch
# Following fixes Eclipse bug 538994 concerning argv parms and cdtdebug.sh script
Patch4: eclipse-cdt-cdtdebug.patch2
+# Remove invalid configurations used when building standalone debugger
+Patch5: eclipse-cdt-standalone.patch
+
BuildRequires: make
+BuildRequires: rsync
BuildRequires: gcc-c++
BuildRequires: tycho
BuildRequires: tycho-extras
@@ -212,6 +218,7 @@ cp %{SOURCE4} man
%patch2 -p0
%patch3 -p1
%patch4 -p0
+%patch5 -p0
# Use unversioned dep of packages that can be supplied by the JRE
sed -i -e '/javax.xml.bind/s/;version="2.2.0"//' \
@@ -256,6 +263,18 @@ sed -i -e 's|-m.. |$(CFLAGS) $(LDFLAGS) |' \
sed -i -e 's/x86_64/%{eclipse_arch}/' \
debug/org.eclipse.cdt.debug.application.product/debug.product
+sed -i -e 's/x86/%{eclipse_arch}/g' \
+ debug/org.eclipse.cdt.debug.application.product/pom.xml
+
+# remove fragments in standalone product file on platforms they aren't
+# shipped
+%ifarch s390x aarch64 ppc64le ppc64 arm
+sed -i '/filesystem.linux.%{eclipse_arch}/d' \
+ debug/org.eclipse.cdt.debug.application.product/debug.product
+sed -i '/net.linux.%{eclipse_arch}/d' \
+ debug/org.eclipse.cdt.debug.application.product/debug.product
+%endif
+
# Force the arch-specific plug-ins to be dir-shaped so that binary stripping works and
the native files
# aren't loaded into the user.home .eclipse configuration
echo "Eclipse-BundleShape: dir" >>
core/org.eclipse.cdt.core.linux.%{eclipse_arch}/META-INF/MANIFEST.MF
@@ -415,7 +434,7 @@ popd
# Exclude EquinoxResolver to avoid NPE occuring on arm and increase memory for s390
export MAVEN_OPTS="-Xmx1024m
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
-%mvn_build -j -f -- -Dtycho.local.keepTarget -Dnative=linux.%{eclipse_arch}
+%mvn_build -j -f -- -Dtycho.local.keepTarget -Dnative=linux.%{eclipse_arch}
-Pbuild-standalone-debugger-rcp
%install
%mvn_install
@@ -423,6 +442,13 @@ export MAVEN_OPTS="-Xmx1024m
-XX:CompileCommand=exclude,org/eclipse/tycho/core/o
binInstallDir=${RPM_BUILD_ROOT}/%{_bindir}
install -d -m755 $binInstallDir
+libInstallDir=${RPM_BUILD_ROOT}/%{_cdtstandalonedir}
+install -d -m755 $libInstallDir
+
+#standalone debugger - copy it into right location
+rsync -vrpl
debug/org.eclipse.cdt.debug.application.product/target/products/org.eclipse.cdt.debug.application.product/linux/gtk/%{eclipse_arch}/cdt-stand-alone-debugger
\
+ %{buildroot}%{_prefix}/lib
+
cat << EOFSCRIPT > eclipse-runCDTTestBundles
#! /bin/bash
eclipse-runTestBundles %{_javadir}/cdt-tests
@@ -484,7 +510,12 @@ sed -i -e
"s,org.eclipse.cdt.debug.application\,,file\\\\:%{eclipse_base}/drople
sed -i -e "s,cp config.ini,cp
%{eclipse_base}/droplets/cdt/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/config.ini,"
org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh
sed -i -e "s,cp dev.properties,cp
%{eclipse_base}/droplets/cdt/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/dev.properties,"
org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh
-install -D -m 755
org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh
$binInstallDir/cdtdebug
+#install -D -m 755
org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/scripts/cdtdebug.sh
$binInstallDir/cdtdebug
+popd
+
+# Symlink cdtdebug binary
+pushd %{buildroot}%{_bindir}
+ ln -s %{_cdtstandlonedir}/cdtdebug
popd
echo
%{eclipse_base}/droplets/cdt/plugins/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION/org.eclipse.cdt.debug.application_$DEBUGAPPLICATIONVERSION.jar
>> .mfiles
@@ -535,6 +566,7 @@ fi
%files -f .mfiles
%{_bindir}/cdtdebug
+%{_cdtstandalonedir}/*
/usr/share/applications/*
/usr/share/pixmaps/*
/usr/share/icons/*/*/apps/*
@@ -585,6 +617,9 @@ fi
%endif
%changelog
+* Tue Oct 09 2018 Jeff Johnston <jjohnstn(a)redhat.com> - 2:9.5.3-4
+- Build the CDT standalone debugger as an RCP application and package
+
* Thu Oct 04 2018 Mat Booth <mat.booth(a)redhat.com> - 2:9.5.3-3
- Fix missing requirement on lldb and improve installtion recommendations