[eclipse] 01/02: Build for arm64 and ppc64el
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Mon Dec 23 21:54:33 UTC 2013
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse.
commit e285bf331a7a0286f94fdb5fb9e9cdd1d73c7e51
Author: Matthias Klose <doko at ubuntu.com>
Date: Mon Dec 23 16:24:53 2013 +0100
Build for arm64 and ppc64el
---
debian/changelog | 4 +
debian/patches/eclipse-add-aarch64-ppc64el.patch | 164 ++++++++++++++++++++++
debian/patches/eclipse-add-archs-filesystem.patch | 43 ++++--
debian/patches/eclipse-add-archs-net.patch | 26 +++-
debian/patches/generate-additional-archs.patch | 16 ++-
debian/patches/series | 1 +
6 files changed, 240 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 215158b..1f01a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
eclipse (3.8.1-5) UNRELEASED; urgency=low
+ [ Jakub Adam ]
* Compile org.eclipse.osgi bundle for java 1.5.
- Required for Tycho build with Java 7.
+ [ Matthias Klose ]
+ * Build for arm64 and ppc64el.
+
-- Jakub Adam <jakub.adam at ktknet.cz> Tue, 10 Sep 2013 17:11:24 +0200
eclipse (3.8.1-4) unstable; urgency=low
diff --git a/debian/patches/eclipse-add-aarch64-ppc64el.patch b/debian/patches/eclipse-add-aarch64-ppc64el.patch
new file mode 100644
index 0000000..906b403
--- /dev/null
+++ b/debian/patches/eclipse-add-aarch64-ppc64el.patch
@@ -0,0 +1,164 @@
+From: Debian Orbital Alignment Team
+ <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 23 Dec 2013 17:16:39 +0100
+Subject: eclipse-add-aarch64-ppc64el
+
+===================================================================
+---
+ patches/eclipse-add-archs-executable.patch | 32 ++++++++++++++++++++--
+ patches/eclipse-add-ppc64-sparc64-s390-s390x.patch | 14 +++++++---
+ 2 files changed, 39 insertions(+), 7 deletions(-)
+
+diff --git a/patches/eclipse-add-archs-executable.patch b/patches/eclipse-add-archs-executable.patch
+index dab9e21..3e3c480 100644
+--- a/patches/eclipse-add-archs-executable.patch
++++ b/patches/eclipse-add-archs-executable.patch
+@@ -1,6 +1,6 @@
+ --- a/features/org.eclipse.equinox.executable/target.build.properties
+ +++ b/features/org.eclipse.equinox.executable/target.build.properties
+-@@ -22,10 +22,47 @@
++@@ -22,10 +22,53 @@
+ root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
+ root.linux.gtk.x86.permissions.755=libcairo-swt.so
+
+@@ -10,6 +10,9 @@
+ +root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
+ +root.linux.gtk.arm.permissions.755=libcairo-swt.so
+ +
+++root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+++root.linux.gtk.aarch64.permissions.755=libcairo-swt.so
+++
+ +root.linux.gtk.ia64=bin/gtk/linux/ia64,gtk_root
+ +root.linux.gtk.ia64.permissions.755=libcairo-swt.so
+ +
+@@ -28,6 +31,9 @@
+ root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
+ +root.linux.gtk.ppc64.permissions.755=libcairo-swt.so
+ +
+++root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
+++root.linux.gtk.ppc64le.permissions.755=libcairo-swt.so
+++
+ +root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
+ +root.linux.gtk.s390.permissions.755=libcairo-swt.so
+ +
+@@ -50,7 +56,7 @@
+ root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
+ --- a/features/org.eclipse.equinox.executable/feature.xml
+ +++ b/features/org.eclipse.equinox.executable/feature.xml
+-@@ -90,6 +90,66 @@
++@@ -90,6 +90,76 @@
+ version="0.0.0"
+ fragment="true"/>
+
+@@ -75,6 +81,16 @@
+ + fragment="true"/>
+ +
+ + <plugin
+++ id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
+++ os="linux"
+++ ws="gtk"
+++ arch="aarch64"
+++ download-size="0"
+++ install-size="0"
+++ version="0.0.0"
+++ fragment="true"/>
+++
+++ <plugin
+ + id="org.eclipse.equinox.launcher.gtk.linux.ia64"
+ + os="linux"
+ + ws="gtk"
+@@ -117,7 +133,7 @@
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
+ os="linux"
+-@@ -100,6 +160,56 @@
++@@ -100,6 +160,66 @@
+ version="0.0.0"
+ fragment="true"/>
+
+@@ -131,6 +147,16 @@
+ + version="0.0.0"
+ + fragment="true"/>
+ +
+++ <plugin
+++ id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
+++ os="linux"
+++ ws="gtk"
+++ arch="ppc64le"
+++ download-size="0"
+++ install-size="0"
+++ version="0.0.0"
+++ fragment="true"/>
+++
+ + <plugin
+ + id="org.eclipse.equinox.launcher.gtk.linux.s390"
+ + os="linux"
+diff --git a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
+index d2cdf8d..f1c1a3d 100644
+--- a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
++++ b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
+@@ -1,15 +1,17 @@
+ --- a/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
+ +++ b/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
+-@@ -48,6 +48,14 @@
++@@ -48,6 +48,16 @@
+ Platform.ARCH_X86, //
+ Platform.ARCH_AMD64, //
+ Platform.ARCH_IA64, //
+ + Platform.ARCH_PPC64, //
+++ Platform.ARCH_PPC64LE, //
+ + Platform.ARCH_SPARC64, //
+ + Platform.ARCH_S390, //
+ + Platform.ARCH_S390X, //
+ + Platform.ARCH_ALPHA, //
+ + Platform.ARCH_ARM, //
+++ Platform.ARCH_AARCH64, //
+ + Platform.ARCH_MIPS, //
+ + Platform.ARCH_MIPSEL, //
+ Platform.ARCH_IA64_32};
+@@ -17,17 +19,19 @@
+ // debug support: set in loadOptions()
+ --- a/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
+ +++ b/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
+-@@ -348,6 +348,15 @@
++@@ -348,6 +348,17 @@
+ * @since 3.1
+ */
+ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
+ +
+ + public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
+++ public static final String ARCH_PPC64LE = "ppc64le";//$NON-NLS-1$
+ + public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
+ + public static final String ARCH_S390 = "s390";//$NON-NLS-1$
+ + public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
+ + public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
+ + public static final String ARCH_ARM = "arm";//$NON-NLS-1$
+++ public static final String ARCH_AARCH64 = "aarch64";//$NON-NLS-1$
+ + public static final String ARCH_MIPS = "mips";//$NON-NLS-1$
+ + public static final String ARCH_MIPSEL = "mipsel";//$NON-NLS-1$
+
+@@ -40,13 +44,13 @@
+ private static PluginConverterImpl instance;
+ @SuppressWarnings("deprecation")
+ - private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64};
+-+ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment [...]
+++ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64LE, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environme [...]
+ static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
+ static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
+ static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
+ --- a/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
+ +++ b/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
+-@@ -160,6 +160,14 @@
++@@ -160,6 +160,16 @@
+ */
+ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
+
+@@ -55,6 +59,8 @@
+ + public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
+ + public static final String ARCH_ALPHA = "alpha";//$NON-NLS-1$
+ + public static final String ARCH_ARM = "arm";//$NON-NLS-1$
+++ public static final String ARCH_AARCH64 = "aarch64";//$NON-NLS-1$
+++ public static final String ARCH_PPC64LE = "ppc64le";//$NON-NLS-1$
+ + public static final String ARCH_MIPS = "mips";//$NON-NLS-1$
+ + public static final String ARCH_MIPSEL = "mipsel";//$NON-NLS-1$
+ +
diff --git a/debian/patches/eclipse-add-archs-filesystem.patch b/debian/patches/eclipse-add-archs-filesystem.patch
index 57838ab..96f3dd6 100644
--- a/debian/patches/eclipse-add-archs-filesystem.patch
+++ b/debian/patches/eclipse-add-archs-filesystem.patch
@@ -6,22 +6,41 @@ Subject: eclipse-add-archs-filesystem
patches/eclipse-add-archs-filesystem.patch | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
-diff --git a/patches/eclipse-add-archs-filesystem.patch b/patches/eclipse-add-archs-filesystem.patch
-index 6a71f88..206ec92 100644
+Index: b/patches/eclipse-add-archs-filesystem.patch
+===================================================================
--- a/patches/eclipse-add-archs-filesystem.patch
+++ b/patches/eclipse-add-archs-filesystem.patch
@@ -1,6 +1,6 @@
--- a/features/org.eclipse.platform/feature.xml
+++ b/features/org.eclipse.platform/feature.xml
-@@ -445,6 +445,116 @@
-+@@ -565,6 +565,126 @@
++@@ -565,6 +565,146 @@
version="0.0.0"
fragment="true"
unpack="false"/>
-@@ -114,6 +114,16 @@
- + version="0.0.0"
- + fragment="true"
+@@ -26,6 +26,16 @@
+ unpack="false"/>
+ +
+ + <plugin
+++ id="org.eclipse.core.filesystem.linux.aarch64"
+++ os="linux"
+++ arch="aarch64"
+++ download-size="0"
+++ install-size="0"
+++ version="0.0.0"
+++ fragment="true"
+++ unpack="false"/>
+++
+++ <plugin
+ + id="org.eclipse.core.filesystem.linux.ia64"
+ + os="linux"
+ + arch="ia64"
+@@ -112,6 +122,26 @@
+ + download-size="0"
+ + install-size="0"
+ + version="0.0.0"
+++ fragment="true"
+++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.core.filesystem.linux.ppc64"
@@ -32,6 +51,14 @@ index 6a71f88..206ec92 100644
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
+++
+++ <plugin
+++ id="org.eclipse.core.filesystem.linux.ppc64le"
+++ os="linux"
+++ arch="ppc64le"
+++ download-size="0"
+++ install-size="0"
+++ version="0.0.0"
+ + fragment="true"
+ + unpack="false"/>
- <plugin
- id="org.eclipse.core.filesystem.linux.x86_64"
diff --git a/debian/patches/eclipse-add-archs-net.patch b/debian/patches/eclipse-add-archs-net.patch
index 61c7555..9f328cf 100644
--- a/debian/patches/eclipse-add-archs-net.patch
+++ b/debian/patches/eclipse-add-archs-net.patch
@@ -6,11 +6,11 @@ Subject: eclipse-add-archs-net
eclipse/features/org.eclipse.platform/feature.xml | 120 +++++++++++++++++++++
1 file changed, 120 insertions(+)
-diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
-index 6df7ca2..68974bf 100644
+Index: b/eclipse/features/org.eclipse.platform/feature.xml
+===================================================================
--- a/eclipse/features/org.eclipse.platform/feature.xml
+++ b/eclipse/features/org.eclipse.platform/feature.xml
-@@ -114,6 +114,126 @@
+@@ -114,6 +114,146 @@
unpack="false"/>
<plugin
@@ -34,6 +34,16 @@ index 6df7ca2..68974bf 100644
+ unpack="false"/>
+
+ <plugin
++ id="org.eclipse.core.net.linux.aarch64"
++ os="linux"
++ arch="aarch64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.core.net.linux.ia64"
+ os="linux"
+ arch="ia64"
@@ -94,6 +104,16 @@ index 6df7ca2..68974bf 100644
+ unpack="false"/>
+
+ <plugin
++ id="org.eclipse.core.net.linux.ppc64le"
++ os="linux"
++ arch="ppc64le"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.core.net.linux.s390"
+ os="linux"
+ arch="s390"
diff --git a/debian/patches/generate-additional-archs.patch b/debian/patches/generate-additional-archs.patch
index b426864..af11bc4 100644
--- a/debian/patches/generate-additional-archs.patch
+++ b/debian/patches/generate-additional-archs.patch
@@ -6,12 +6,22 @@ Subject: generate-additional-archs
build.xml | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/build.xml b/build.xml
-index 3320d2b..c62b934 100644
+Index: b/build.xml
+===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -252,6 +252,8 @@
+@@ -244,14 +244,18 @@
+
+ <generateArch newArch="alpha" archBase="x86_64"/>
+ <generateArch newArch="arm" archBase="x86"/>
++ <generateArch newArch="aarch64" archBase="x86"/>
+ <generateArch newArch="ia64" archBase="x86_64"/>
+ <generateArch newArch="mips" archBase="x86_64"/>
+ <generateArch newArch="mipsel" archBase="x86_64"/>
+ <generateArch newArch="PA_RISC" archBase="x86_64"/>
+ <generateArch newArch="ppc" archBase="x86" />
<generateArch newArch="ppc64" archBase="x86_64"/>
++ <generateArch newArch="ppc64le" archBase="x86_64"/>
<generateArch newArch="sparc" archBase="x86" />
<generateArch newArch="sparc64" archBase="x86_64"/>
+ <generateArch newArch="s390" archBase="x86" />
diff --git a/debian/patches/series b/debian/patches/series
index 3c61af7..0c2c0a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@ gnomeproxy-glib-2.32-compat.patch
eclipse-add-archs-filesystem.patch
equinox-jsp-jasper-tomcat-7.0.40.patch
osgi-target-java-1.5.patch
+eclipse-add-aarch64-ppc64el.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git
More information about the pkg-java-commits
mailing list