diff --git a/.cvsignore b/.cvsignore index 3e5b65b..ea098b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -31,3 +31,4 @@ eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz libstdc++-v3.libhover glibc-2.7-2.libhover eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz +eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2 diff --git a/eclipse-cdt-discoverytab.patch b/eclipse-cdt-discoverytab.patch new file mode 100644 index 0000000..4243de8 --- /dev/null +++ b/eclipse-cdt-discoverytab.patch @@ -0,0 +1,47 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.cdt.managedbuilder.ui +Index: src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java +=================================================================== +RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java,v +retrieving revision 1.23.2.4 +diff -u -r1.23.2.4 DiscoveryTab.java +--- src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java 7 Sep 2009 03:52:28 -0000 1.23.2.4 ++++ src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java 7 Oct 2009 22:54:06 -0000 +@@ -534,9 +534,11 @@ + + private void handleDiscoveryProfileChanged() { + int pos = profileComboBox.getSelectionIndex(); +- for (int i = 0; i < realPages.length; i++) +- if (realPages[i] != null) +- realPages[i].setVisible(i == pos); ++ if (realPages != null) { ++ for (int i = 0; i < realPages.length; i++) ++ if (realPages[i] != null) ++ realPages[i].setVisible(i == pos); ++ } + } + + /** +@@ -622,13 +624,15 @@ + if (buildInfo == null) + return; + String savedId = buildInfo.getSelectedProfileId(); +- for (int i = 0; i < realPages.length; i++) { +- if (realPages != null && realPages[i] != null) { +- String s = visibleProfilesList.get(i); +- buildInfo.setSelectedProfileId(s); +- realPages[i].performApply(); +- realPages[i].setVisible(false); +- } ++ if (realPages != null) { ++ for (int i = 0; i < realPages.length; i++) { ++ if (realPages[i] != null) { ++ String s = visibleProfilesList.get(i); ++ buildInfo.setSelectedProfileId(s); ++ realPages[i].performApply(); ++ realPages[i].setVisible(false); ++ } ++ } + } + buildInfo.setSelectedProfileId(savedId); + handleDiscoveryProfileChanged(); diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index aea6fd1..4bfc34d 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -7,7 +7,7 @@ Epoch: 1 %define major 6 %define minor 0 %define majmin %{major}.%{minor} -%define micro 0 +%define micro 1 %define eclipse_base %{_libdir}/eclipse %define build_id 200906161748 @@ -22,7 +22,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 10%{?dist} +Release: 1%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -33,7 +33,7 @@ Requires: eclipse-platform # script. Note that the optional c99 and upc parsers plus the optional # xlc support features have been removed. -Source0: %{name}-fetched-src-CDT_6_0_0.tar.bz2 +Source0: %{name}-fetched-src-CDT_6_0_1.tar.bz2 Source4: fetch-cdt.sh Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz @@ -73,6 +73,7 @@ Source7: libstdc++-v3.libhover # Remove include of stropts.h in openpty.c as it is no longer included # in glibc-headers package +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272373 Patch12: %{name}-openpty.patch # Add XML -> HTML generation after running tests @@ -86,6 +87,21 @@ Patch14: %{name}-libhover-local.patch # and to enable local plugin file support for docs. Patch15: %{name}-libhover.patch +# Patches for ppc64 +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380 + +# Add LDFLAGS to Makefile for .so +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364 +Patch16: %{name}-ppc64-add_ldflags.patch + +# Add define of _XOPEN_SOURCE so that ptsname header is included +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370 +Patch17: %{name}-ppc64-add_xopen_source-include.patch + +# Fix problem in Discovery Tab code that causes NPE for Autotools project +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=291690 +Patch18: %{name}-discoverytab.patch + BuildRequires: eclipse-pde BuildRequires: eclipse-mylyn >= 3.0 BuildRequires: eclipse-rse >= 3.0 @@ -99,8 +115,7 @@ Requires: gdb make gcc-c++ autoconf automake Requires: eclipse-platform >= 1:3.5.0 Requires: eclipse-rse >= 3.0 -# Currently, upstream CDT only supports building on the platforms listed here. -ExclusiveArch: %{ix86} x86_64 ppc ia64 +ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -153,6 +168,9 @@ popd pushd results/plugins %patch13 popd +pushd results/plugins/org.eclipse.cdt.managedbuilder.ui +%patch18 -p0 +popd #pushd results/plugins/org.eclipse.cdt.core.tests #rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java #%patch14 @@ -229,6 +247,20 @@ find -name \*.so | xargs rm -rf mv org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.BAK \ org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so +%ifarch ppc64 +pushd org.eclipse.cdt.releng/results/plugins +echo "fragmentName.linux.%{eclipse_arch} = C/C++ Development Tools Core for Linux (%{eclipse_arch})" \ + >> org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core/plugin.properties +cp -rp org.eclipse.cdt.core.linux.{x86,%{eclipse_arch}} +cd org.eclipse.cdt.core.linux.%{eclipse_arch} +sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF +mv os/linux/{x86,%{eclipse_arch}} +cd ../org.eclipse.cdt.core.linux +%patch16 -p0 +%patch17 -p0 +popd +%endif + %build export JAVA_HOME=%{java_home} export PATH=%{java_bin}:/usr/bin:$PATH @@ -522,6 +554,12 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Oct 09 2009 Jeff Johnston 1:6.0.1-1 +- Rebase CDT to 6.0.1. + +* Mon Oct 05 2009 Andrew Overholt 1:6.0.0-11 +- Build on ppc64 + * Wed Sep 23 2009 Jeff Johnston 1:6.0.0-10 - Resolves #290247 - Upgrade libhover to 0.3.0. diff --git a/sources b/sources index 6a05f07..c717290 100644 --- a/sources +++ b/sources @@ -5,3 +5,4 @@ d0b0b38accc5547e6209fda23c6c8d49 eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2 921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover 4bccad3ee92faaca4f8dc3ac6941434e glibc-2.7-2.libhover 2dbeff80a9c053b2888940a30f62d3f2 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz +b128891c69b669173abc21f5105e3a30 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2