Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-java/gluegen/files/, dev-java/gluegen/
Date: Wed, 06 Jul 2022 00:10:36
Message-Id: 1657066229.1741005ef0607ee33620b6e3496eaf3c68e564a9.Alessandro-Barbieri@gentoo
1 commit: 1741005ef0607ee33620b6e3496eaf3c68e564a9
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 5 09:06:28 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Wed Jul 6 00:10:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1741005e
7
8 dev-java/gluegen: Debian patches
9
10 Closes: https://bugs.gentoo.org/855470
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 .../files/gluegen-2.2.4-dont-test-archive.patch | 14 --
14 ...gluegen-2.3.2-add-mips64el-mipsn32-support.diff | 229 ++++++++++++++++++
15 dev-java/gluegen/files/gluegen-2.3.2-armhf.diff | 62 +++++
16 .../gluegen-2.3.2-disable-java-version-check.diff | 28 +++
17 .../gluegen-2.3.2-disable-static-linking.diff | 42 ++++
18 .../gluegen-2.3.2-disable-test-zip-archive.diff | 11 +
19 .../files/gluegen-2.3.2-disableArchive7z.diff | 26 ++
20 .../files/gluegen-2.3.2-disable_git_call.diff | 17 ++
21 ...-strip.patch => gluegen-2.3.2-dont-strip.patch} | 3 +-
22 .../gluegen-2.3.2-fix-alpha-build-config.patch | 11 +
23 .../gluegen-2.3.2-fix-arm64-build-config.diff | 75 ++++++
24 .../gluegen/files/gluegen-2.3.2-fix_gcc-10.patch | 18 ++
25 .../gluegen/files/gluegen-2.3.2-hideException.diff | 18 ++
26 .../files/gluegen-2.3.2-java10-compatibility.patch | 263 +++++++++++++++++++++
27 dev-java/gluegen/files/gluegen-2.3.2-linker.diff | 11 +
28 .../files/gluegen-2.3.2-missing-arch-symbol.diff | 39 +++
29 .../files/gluegen-2.3.2-non-linux-support.diff | 16 ++
30 .../files/gluegen-2.3.2-ppc64el-support.diff | 207 ++++++++++++++++
31 .../files/gluegen-2.3.2-remove-static-lib.patch | 106 ---------
32 dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff | 67 ++++++
33 .../gluegen/files/gluegen-2.3.2-s390x-support.diff | 138 +++++++++++
34 dev-java/gluegen/files/gluegen-2.3.2-tests.diff | 171 ++++++++++++++
35 dev-java/gluegen/gluegen-2.3.2.ebuild | 36 ++-
36 23 files changed, 1473 insertions(+), 135 deletions(-)
37
38 diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch b/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
39 deleted file mode 100644
40 index a4f4507cf..000000000
41 --- a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
42 +++ /dev/null
43 @@ -1,14 +0,0 @@
44 ---- a/make/build-test.xml
45 -+++ b/make/build-test.xml
46 -@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
47 -
48 - <!-- updates / create the test results zip file -->
49 - <target name="test-zip-archive" depends="init">
50 -+ <!--
51 - <archive.7z destfile="${build}/${test.archive.name}.7z"
52 - basedir="${project.root}"
53 - includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
54 -+ -->
55 - </target>
56 -
57 -
58
59 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff
60 new file mode 100644
61 index 000000000..9de0e28be
62 --- /dev/null
63 +++ b/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff
64 @@ -0,0 +1,229 @@
65 +Description: Add mips64(el) and mipsn32(el) support
66 +Author: YunQiang Su <wzssyqa@×××××.com>, Dejan Latinovic <Dejan.Latinovic@××××××.com>
67 +Forwarded: no
68 +--- a/make/build.xml
69 ++++ b/make/build.xml
70 +@@ -298,6 +298,30 @@
71 + <property name="linker.cfg.id" value="linker.cfg.linux.mipsel" />
72 + </target>
73 +
74 ++ <target name="declare.linux.mipsn32" if="isLinuxMipsn32">
75 ++ <echo message="Linux.mipsn32" />
76 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
77 ++ <property name="linker.cfg.id" value="linker.cfg.linux.mipsn32" />
78 ++ </target>
79 ++
80 ++ <target name="declare.linux.mipsn32el" if="isLinuxMipsn32el">
81 ++ <echo message="Linux.mipsn32el" />
82 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
83 ++ <property name="linker.cfg.id" value="linker.cfg.linux.mipsn32el" />
84 ++ </target>
85 ++
86 ++ <target name="declare.linux.mips64" if="isLinuxMips64">
87 ++ <echo message="Linux.mips64" />
88 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
89 ++ <property name="linker.cfg.id" value="linker.cfg.linux.mips64" />
90 ++ </target>
91 ++
92 ++ <target name="declare.linux.mips64el" if="isLinuxMips64el">
93 ++ <echo message="Linux.mips64el" />
94 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
95 ++ <property name="linker.cfg.id" value="linker.cfg.linux.mips64el" />
96 ++ </target>
97 ++
98 + <target name="declare.linux.ppc" if="isLinuxPpc">
99 + <echo message="Linux.ppc" />
100 + <property name="compiler.cfg.id" value="compiler.cfg.linux" />
101 +@@ -340,7 +364,7 @@
102 + <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
103 + </target>
104 +
105 +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
106 ++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.mipsn32,declare.linux.mipsn32el,declare.linux.mips64,declare.linux.mips64el,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
107 + <property name="c.src.dir.os" value="unix" />
108 + </target>
109 +
110 +--- a/make/gluegen-cpptasks-base.xml
111 ++++ b/make/gluegen-cpptasks-base.xml
112 +@@ -47,6 +47,10 @@
113 + - isLinuxHppa
114 + - isLinuxMips
115 + - isLinuxMipsel
116 ++ - isLinuxMipsn32
117 ++ - isLinuxMipsn32el
118 ++ - isLinuxMips64
119 ++ - isLinuxMipsn64el
120 + - isLinuxPpc
121 + - isLinuxPpc64
122 + - isLinuxPpc64le
123 +@@ -135,6 +139,10 @@
124 + - compiler.cfg.linux.hppa
125 + - compiler.cfg.linux.mips
126 + - compiler.cfg.linux.mipsel
127 ++ - compiler.cfg.linux.mipsn32
128 ++ - compiler.cfg.linux.mipsn32el
129 ++ - compiler.cfg.linux.mips64
130 ++ - compiler.cfg.linux.mips64el
131 + - compiler.cfg.linux.ppc
132 + - compiler.cfg.linux.ppc64
133 + - compiler.cfg.linux.ppc64le
134 +@@ -160,6 +168,10 @@
135 + - linker.cfg.linux.hppa
136 + - linker.cfg.linux.mips
137 + - linker.cfg.linux.mipsel
138 ++ - linker.cfg.linux.mipsn32
139 ++ - linker.cfg.linux.mipsn32el
140 ++ - linker.cfg.linux.mips64
141 ++ - linker.cfg.linux.mips64el
142 + - linker.cfg.linux.ppc
143 + - linker.cfg.linux.ppc64le
144 + - linker.cfg.linux.s390
145 +@@ -420,6 +432,42 @@
146 + <condition property="mipsel">
147 + <os arch="mipsel" />
148 + </condition>
149 ++ <condition property="isLinuxMipsn32">
150 ++ <and>
151 ++ <istrue value="${isLinux}" />
152 ++ <os arch="mipsn32" />
153 ++ </and>
154 ++ </condition>
155 ++ <condition property="mipsn32">
156 ++ <os arch="mipsn32" />
157 ++ </condition>
158 ++ <condition property="isLinuxMipsn32el">
159 ++ <and>
160 ++ <istrue value="${isLinux}" />
161 ++ <os arch="mipsn32el" />
162 ++ </and>
163 ++ </condition>
164 ++ <condition property="mipsn32el">
165 ++ <os arch="mipsn32el" />
166 ++ </condition>
167 ++ <condition property="isLinuxMips64">
168 ++ <and>
169 ++ <istrue value="${isLinux}" />
170 ++ <os arch="mips64" />
171 ++ </and>
172 ++ </condition>
173 ++ <condition property="mips64">
174 ++ <os arch="mips64" />
175 ++ </condition>
176 ++ <condition property="isLinuxMips64el">
177 ++ <and>
178 ++ <istrue value="${isLinux}" />
179 ++ <os arch="mips64el" />
180 ++ </and>
181 ++ </condition>
182 ++ <condition property="mips64el">
183 ++ <os arch="mips64el" />
184 ++ </condition>
185 + <condition property="isLinuxPpc">
186 + <and>
187 + <istrue value="${isLinux}" />
188 +@@ -639,6 +687,10 @@
189 + <echo message="LinuxHppa=${isLinuxHppa}" />
190 + <echo message="LinuxMips=${isLinuxMips}" />
191 + <echo message="LinuxMipsel=${isLinuxMipsel}" />
192 ++ <echo message="LinuxMips=${isLinuxMipsn32}" />
193 ++ <echo message="LinuxMipsel=${isLinuxMipsn32el}" />
194 ++ <echo message="LinuxMips=${isLinuxMips64}" />
195 ++ <echo message="LinuxMipsel=${isLinuxMips64el}" />
196 + <echo message="LinuxPpc=${isLinuxPpc}" />
197 + <echo message="LinuxPpc64=${isLinuxPpc64}" />
198 + <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
199 +@@ -721,6 +773,22 @@
200 + <property name="os.and.arch" value="linux-mipsel" />
201 + </target>
202 +
203 ++ <target name="gluegen.cpptasks.detect.os.linux.mipsn32" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsn32">
204 ++ <property name="os.and.arch" value="linux-mipsn32" />
205 ++ </target>
206 ++
207 ++ <target name="gluegen.cpptasks.detect.os.linux.mipsn32el" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsn32el">
208 ++ <property name="os.and.arch" value="linux-mipsn32el" />
209 ++ </target>
210 ++
211 ++ <target name="gluegen.cpptasks.detect.os.linux.mips64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips64">
212 ++ <property name="os.and.arch" value="linux-mips64" />
213 ++ </target>
214 ++
215 ++ <target name="gluegen.cpptasks.detect.os.linux.mips64el" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips64el">
216 ++ <property name="os.and.arch" value="linux-mips64el" />
217 ++ </target>
218 ++
219 + <target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc">
220 + <property name="os.and.arch" value="linux-ppc" />
221 + </target>
222 +@@ -757,7 +825,7 @@
223 + <property name="os.and.arch" value="android-aarch64" />
224 + </target>
225 +
226 +- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
227 ++ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.mipsn32,gluegen.cpptasks.detect.os.linux.mipsn32el,gluegen.cpptasks.detect.os.linux.mips64,gluegen.cpptasks.detect.os.linux.mips64el,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc"
228 unless="gluegen.cpptasks.detected.os.2" />
229 +
230 + <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
231 + <property name="native.library.suffix" value="*lib" />
232 +@@ -1308,6 +1376,18 @@
233 + <linker id="linker.cfg.linux.mipsel" name="${gcc.compat.compiler}">
234 + </linker>
235 +
236 ++ <linker id="linker.cfg.linux.mipsn32" name="${gcc.compat.compiler}">
237 ++ </linker>
238 ++
239 ++ <linker id="linker.cfg.linux.mipsn32el" name="${gcc.compat.compiler}">
240 ++ </linker>
241 ++
242 ++ <linker id="linker.cfg.linux.mips64" name="${gcc.compat.compiler}">
243 ++ </linker>
244 ++
245 ++ <linker id="linker.cfg.linux.mips64el" name="${gcc.compat.compiler}">
246 ++ </linker>
247 ++
248 + <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
249 + </linker>
250 +
251 +@@ -1549,6 +1629,34 @@
252 + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsel" />
253 + </target>
254 +
255 ++ <target name="gluegen.cpptasks.declare.compiler.linux.mipsn32" if="isLinuxMipsn32">
256 ++ <echo message="Linux.Mipsn32" />
257 ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
258 ++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
259 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsn32" />
260 ++ </target>
261 ++
262 ++ <target name="gluegen.cpptasks.declare.compiler.linux.mipsn32el" if="isLinuxMipsn32el">
263 ++ <echo message="Linux.Mipsn32el" />
264 ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
265 ++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
266 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsn32el" />
267 ++ </target>
268 ++
269 ++ <target name="gluegen.cpptasks.declare.compiler.linux.mips64" if="isLinuxMips64">
270 ++ <echo message="Linux.Mips64" />
271 ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
272 ++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
273 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mips64" />
274 ++ </target>
275 ++
276 ++ <target name="gluegen.cpptasks.declare.compiler.linux.mips64el" if="isLinuxMips64el">
277 ++ <echo message="Linux.Mips64el" />
278 ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
279 ++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
280 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mips64el" />
281 ++ </target>
282 ++
283 + <target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPpc">
284 + <echo message="Linux.Ppc" />
285 + <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
286 +@@ -1591,7 +1699,7 @@
287 + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
288 + </target>
289 +
290 +- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
291 ++ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.mipsn32,gluegen.cpptasks.declare.compiler.linux.mipsn32el,gluegen.cpptasks.declare.compiler.linux.mips64,gluegen.cpptasks.declare.compiler.linux.mips64el,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
292 + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
293 + </target>
294 +
295
296 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff
297 new file mode 100644
298 index 000000000..a474552cd
299 --- /dev/null
300 +++ b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff
301 @@ -0,0 +1,62 @@
302 +--- a/make/build.xml
303 ++++ b/make/build.xml
304 +@@ -262,10 +262,16 @@
305 + <property name="linker.cfg.id" value="linker.cfg.linux" />
306 + </target>
307 +
308 +- <target name="declare.linux.armv6" if="isLinuxARMv6">
309 +- <echo message="Linux.armv6" />
310 +- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6" />
311 +- <property name="linker.cfg.id" value="linker.cfg.linux.armv6" />
312 ++ <target name="declare.linux.armv6.armel" if="isLinuxARMv6Armel">
313 ++ <echo message="Linux.armv6.armel" />
314 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.armel" />
315 ++ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armel" />
316 ++ </target>
317 ++
318 ++ <target name="declare.linux.armv6.armhf" if="isLinuxARMv6Armhf">
319 ++ <echo message="Linux.armv6.armhf" />
320 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
321 ++ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armhf" />
322 + </target>
323 +
324 + <target name="declare.linux.alpha" if="isLinuxAlpha">
325 +@@ -328,7 +334,7 @@
326 + <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
327 + </target>
328 +
329 +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
330 ++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
331 + <property name="c.src.dir.os" value="unix" />
332 + </target>
333 +
334 +--- a/make/gluegen-cpptasks-base.xml
335 ++++ b/make/gluegen-cpptasks-base.xml
336 +@@ -1032,7 +1032,7 @@
337 + - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
338 + - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
339 + for official JogAmp builds! -->
340 +- <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}">
341 ++ <compiler id="compiler.cfg.linux.armv6.armel" name="${gcc.compat.compiler}">
342 + <defineset>
343 + <define name="__unix__"/>
344 + <define name="__X11__" if="isX11"/>
345 +@@ -1270,7 +1270,7 @@
346 + - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
347 + - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
348 + for official JogAmp builds! -->
349 +- <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}">
350 ++ <linker id="linker.cfg.linux.armv6.armel" name="${gcc.compat.compiler}">
351 + <linkerarg value="-fpic" />
352 + <linkerarg value="-nostdlib" />
353 + <linkerarg value="-Bdynamic" />
354 +@@ -1286,6 +1286,9 @@
355 + <linkerarg value="-static-libstdc++" if="isGCC"/>
356 + </linker>
357 +
358 ++ <linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">
359 ++ </linker>
360 ++
361 + <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
362 + </linker>
363 +
364
365 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff
366 new file mode 100644
367 index 000000000..e3fb75f9a
368 --- /dev/null
369 +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff
370 @@ -0,0 +1,28 @@
371 +Description: Disables the Java version check since the JRE in Debian always
372 + meets the minimum requirement and the check routinely breaks with the latest JREs.
373 +Author: Emmanuel Bourg <ebourg@××××××.org>
374 +Forwarded: not-needed
375 +--- a/make/jogamp-env.xml
376 ++++ b/make/jogamp-env.xml
377 +@@ -45,21 +45,6 @@
378 + </condition>
379 + </fail>
380 +
381 +- <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
382 +- <condition>
383 +- <not>
384 +- <or>
385 +- <equals arg1="${ant.java.version}" arg2="1.6"/>
386 +- <equals arg1="${ant.java.version}" arg2="1.7"/>
387 +- <equals arg1="${ant.java.version}" arg2="1.8"/>
388 +- <equals arg1="${ant.java.version}" arg2="1.9"/>
389 +- <equals arg1="${ant.java.version}" arg2="2.0"/>
390 +- <equals arg1="${ant.java.version}" arg2="2.1"/>
391 +- </or>
392 +- </not>
393 +- </condition>
394 +- </fail>
395 +-
396 + </target>
397 +
398 + <target name="jogamp.env.init" depends="jogamp.env.validation">
399
400 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff
401 new file mode 100644
402 index 000000000..ffeb5d5be
403 --- /dev/null
404 +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff
405 @@ -0,0 +1,42 @@
406 +Description: disable static linking for native libraries.
407 +Author: Gilles Filippini <pini@××××××.org>
408 +--- a/make/gluegen-cpptasks-base.xml
409 ++++ b/make/gluegen-cpptasks-base.xml
410 +@@ -1262,20 +1262,14 @@
411 + <!-- Unix linker configuration -->
412 +
413 + <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
414 +- <linkerarg value="-static-libgcc" if="isGCC"/>
415 +- <linkerarg value="-static-libstdc++" if="isGCC"/>
416 + </linker>
417 +
418 + <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
419 + <linkerarg value="-m32"/>
420 +- <linkerarg value="-static-libgcc" if="isGCC"/>
421 +- <linkerarg value="-static-libstdc++" if="isGCC"/>
422 + </linker>
423 +
424 + <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
425 + <linkerarg value="-m64"/>
426 +- <linkerarg value="-static-libgcc" if="isGCC"/>
427 +- <linkerarg value="-static-libstdc++" if="isGCC"/>
428 + </linker>
429 +
430 + <!-- Using default compiler settings - utilize:
431 +@@ -1286,16 +1280,12 @@
432 + <linkerarg value="-fpic" />
433 + <linkerarg value="-nostdlib" />
434 + <linkerarg value="-Bdynamic" />
435 +- <linkerarg value="-static-libgcc" if="isGCC"/>
436 +- <linkerarg value="-static-libstdc++" if="isGCC"/>
437 + </linker>
438 +
439 + <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
440 + <linkerarg value="-fpic" />
441 + <linkerarg value="-nostdlib" />
442 + <linkerarg value="-Bdynamic" />
443 +- <linkerarg value="-static-libgcc" if="isGCC"/>
444 +- <linkerarg value="-static-libstdc++" if="isGCC"/>
445 + </linker>
446 +
447 + <linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">
448
449 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-test-zip-archive.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-test-zip-archive.diff
450 new file mode 100644
451 index 000000000..2d932d5f9
452 --- /dev/null
453 +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-test-zip-archive.diff
454 @@ -0,0 +1,11 @@
455 +--- a/make/build-test.xml
456 ++++ b/make/build-test.xml
457 +@@ -505,7 +505,7 @@
458 + </target>
459 +
460 + <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
461 +- <antcall target="test-zip-archive" inheritRefs="true" />
462 ++<!-- <antcall target="test-zip-archive" inheritRefs="true" />-->
463 + </target>
464 +
465 + <!--
466
467 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disableArchive7z.diff b/dev-java/gluegen/files/gluegen-2.3.2-disableArchive7z.diff
468 new file mode 100644
469 index 000000000..8b1c5e43d
470 --- /dev/null
471 +++ b/dev-java/gluegen/files/gluegen-2.3.2-disableArchive7z.diff
472 @@ -0,0 +1,26 @@
473 +--- a/make/build.xml
474 ++++ b/make/build.xml
475 +@@ -1088,9 +1088,9 @@
476 + <copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
477 + <fileset dir="doc/javadoc/resources" includes="*" />
478 + </copy>
479 +- <archive.7z destfile="${build}/javadoc.7z"
480 ++<!-- <archive.7z destfile="${build}/javadoc.7z"
481 + basedir="${javadoc.root.path}"
482 +- includes="gluegen/**" />
483 ++ includes="gluegen/**" />-->
484 + </target>
485 +
486 + <!-- ================================================================== -->
487 +@@ -1138,9 +1138,9 @@
488 + <fileset dir="lib" includes="junit.jar"/>
489 + </copy>
490 +
491 +- <archive.7z destfile="${build}/${archive.name}.7z"
492 ++<!-- <archive.7z destfile="${build}/${archive.name}.7z"
493 + basedir="${build}"
494 +- includes="${archive.name}/**" />
495 ++ includes="${archive.name}/**" />-->
496 + <!-- Clean up after ourselves -->
497 + <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
498 + </target>
499
500 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff
501 new file mode 100644
502 index 000000000..7ba4b0e23
503 --- /dev/null
504 +++ b/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff
505 @@ -0,0 +1,17 @@
506 +--- a/make/build.xml
507 ++++ b/make/build.xml
508 +@@ -70,14 +70,6 @@
509 + <property name="gluegen.build.number" value="manual"/>
510 + <property name="gluegen.build.id" value="${version.timestamp}"/>
511 + <mkdir dir="${build}" />
512 +- <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
513 +- output="${build}/localbranch.raw">
514 +- <arg line="branch --no-color"/>
515 +- </exec>
516 +- <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
517 +- outputproperty="gluegen.build.branch">
518 +- <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' '${build}/localbranch.raw'"/>
519 +- </exec>
520 + <property name="gluegen.build.branch" value="manual"/> <!-- fallback -->
521 + <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
522 + outputproperty="gluegen.build.commit">
523
524 diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
525 similarity index 91%
526 rename from dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
527 rename to dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
528 index 2e4ed462f..0a06e96c5 100644
529 --- a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
530 +++ b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
531 @@ -1,6 +1,6 @@
532 --- a/make/gluegen-cpptasks-base.xml
533 +++ b/make/gluegen-cpptasks-base.xml
534 -@@ -1511,17 +1511,6 @@
535 +@@ -1872,16 +1872,6 @@
536 - Helper strip.libraries for stripping off debug information
537 -->
538 <target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
539 @@ -12,7 +12,6 @@
540 - <include name="**/*.so"/> <!-- unix -->
541 - <include name="**/*.dll"/> <!-- windows -->
542 - <include name="**/*.dylib"/> <!-- macosx -->
543 -- <include name="**/*.jnilib"/> <!-- macosx -->
544 - </fileset>
545 - </apply>
546 </target>
547
548 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch b/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch
549 new file mode 100644
550 index 000000000..b02629a60
551 --- /dev/null
552 +++ b/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch
553 @@ -0,0 +1,11 @@
554 +--- a/make/build.xml
555 ++++ b/make/build.xml
556 +@@ -334,7 +334,7 @@
557 + <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
558 + </target>
559 +
560 +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
561 ++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
562 + <property name="c.src.dir.os" value="unix" />
563 + </target>
564 +
565
566 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff b/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff
567 new file mode 100644
568 index 000000000..19de9401b
569 --- /dev/null
570 +++ b/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff
571 @@ -0,0 +1,75 @@
572 +--- a/make/build.xml
573 ++++ b/make/build.xml
574 +@@ -316,6 +316,12 @@
575 + <property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" />
576 + </target>
577 +
578 ++ <target name="declare.linux.aarch64" if="isLinuxAarch64">
579 ++ <echo message="Linux.aarch64" />
580 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
581 ++ <property name="linker.cfg.id" value="linker.cfg.linux.aarch64" />
582 ++ </target>
583 ++
584 + <target name="declare.linux.s390" if="isLinuxs390">
585 + <echo message="Linux.s390" />
586 + <property name="compiler.cfg.id" value="compiler.cfg.linux" />
587 +@@ -334,7 +340,7 @@
588 + <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
589 + </target>
590 +
591 +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
592 ++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
593 + <property name="c.src.dir.os" value="unix" />
594 + </target>
595 +
596 +--- a/make/gluegen-cpptasks-base.xml
597 ++++ b/make/gluegen-cpptasks-base.xml
598 +@@ -50,6 +50,7 @@
599 + - isLinuxPpc
600 + - isLinuxPpc64
601 + - isLinuxPpc64le
602 ++ - isLinuxAarch64
603 + - isLinuxs390
604 + - isLinuxs390x
605 + - isLinuxSparc
606 +@@ -137,6 +138,7 @@
607 + - compiler.cfg.linux.ppc
608 + - compiler.cfg.linux.ppc64
609 + - compiler.cfg.linux.ppc64le
610 ++ - compiler.cfg.linux.aarch64
611 + - compiler.cfg.linux.s390
612 + - compiler.cfg.linux.s390x
613 + - compiler.cfg.linux.sparc
614 +@@ -440,6 +442,15 @@
615 + <condition property="ppc64le">
616 + <os arch="ppc64le" />
617 + </condition>
618 ++ <condition property="isLinuxAarch64">
619 ++ <and>
620 ++ <istrue value="${isLinux}" />
621 ++ <os arch="aarch64" />
622 ++ </and>
623 ++ </condition>
624 ++ <condition property="aarch64">
625 ++ <os arch="aarch64" />
626 ++ </condition>
627 + <condition property="isLinuxs390">
628 + <and>
629 + <istrue value="${isLinux}" />
630 +@@ -626,6 +637,7 @@
631 + <echo message="LinuxPpc=${isLinuxPpc}" />
632 + <echo message="LinuxPpc64=${isLinuxPpc64}" />
633 + <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
634 ++ <echo message="LinuxAarch64=${isLinuxAarch64}" />
635 + <echo message="Linuxs390=${isLinuxs390}" />
636 + <echo message="Linuxs390x=${isLinuxs390x}" />
637 + <echo message="LinuxSparc=${isLinuxSparc}" />
638 +@@ -1511,7 +1523,7 @@
639 + <echo message="Linux.aarch64" />
640 + <property name="compiler.cfg.id.base" value="compiler.cfg.linux.aarch64" />
641 + <property name="linker.cfg.id.base" value="linker.cfg.linux.aarch64" />
642 +- <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/arm" />
643 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" />
644 + </target>
645 +
646 + <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
647
648 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch b/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch
649 new file mode 100644
650 index 000000000..03c371a37
651 --- /dev/null
652 +++ b/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch
653 @@ -0,0 +1,18 @@
654 +Description: Fix ftbfs with GCC-10
655 +
656 +Author: Sudip Mukherjee <sudipm.mukherjee@×××××.com>
657 +Bug-Debian: https://bugs.debian.org/957276
658 +Forwarded: no
659 +
660 +--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
661 ++++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
662 +@@ -299,9 +299,6 @@ MYAPI MYAPIConfig * MYAPIENTRY typeTest
663 + #define HUGE_VALF_3 ((int) 1e53)
664 + #define DOUBLE_DEFINE_BRACKETS_3 HUGE_VALF_3
665 +
666 +-size_t unsigned_size_t_1;
667 +-ptrdiff_t a_signed_pointer_t_1;
668 +-
669 + MYAPI int32_t MYAPIENTRY typeTestInt32T(const int32_t i1, int32_t i2);
670 + MYAPI uint32_t MYAPIENTRY typeTestUInt32T(const uint32_t ui1, uint32_t ui2);
671 + MYAPI int64_t MYAPIENTRY typeTestInt64T(const int64_t i1, int64_t i2);
672
673 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff b/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff
674 new file mode 100644
675 index 000000000..422021624
676 --- /dev/null
677 +++ b/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff
678 @@ -0,0 +1,18 @@
679 +--- a/src/java/com/jogamp/common/os/Platform.java
680 ++++ b/src/java/com/jogamp/common/os/Platform.java
681 +@@ -305,15 +305,6 @@ public class Platform extends PlatformPr
682 + _USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
683 + PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true);
684 +
685 +- // load GluegenRT native library
686 +- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) {
687 +- try {
688 +- JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { jogamp.common.Debug.class }, null);
689 +- } catch (final Exception e0) {
690 +- // IllegalArgumentException, IOException
691 +- System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
692 +- }
693 +- }
694 + DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
695 +
696 + // JVM bug workaround
697
698 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch b/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch
699 new file mode 100644
700 index 000000000..f51157d18
701 --- /dev/null
702 +++ b/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch
703 @@ -0,0 +1,263 @@
704 +Description: Fixes the build failure with Java 10
705 +Author: Emmanuel Bourg <ebourg@××××××.org>
706 +Forwarded: no
707 +--- a/src/java/net/highteq/nativetaglet/NativeTaglet.java
708 ++++ /dev/null
709 +@@ -1,237 +0,0 @@
710 +-package net.highteq.nativetaglet;
711 +-
712 +-import com.sun.tools.doclets.Taglet;
713 +-import com.sun.javadoc.*;
714 +-
715 +-import java.util.Map;
716 +-import java.util.Properties;
717 +-import java.util.Iterator;
718 +-import java.io.InputStream;
719 +-import java.net.URL;
720 +-import java.net.MalformedURLException;
721 +-
722 +-public class NativeTaglet implements Taglet
723 +-{
724 +- private Properties mapping= null;
725 +- private static final String NAME = "native";
726 +-
727 +- /**
728 +- * Return the name of this custom tag.
729 +- */
730 +- @Override
731 +- public String getName()
732 +- {
733 +- return NAME;
734 +- }
735 +-
736 +- /**
737 +- * @return true since this tag can be used in a field
738 +- * doc comment
739 +- */
740 +- @Override
741 +- public boolean inField()
742 +- {
743 +- return true;
744 +- }
745 +-
746 +- /**
747 +- * @return true since this tag can be used in a constructor
748 +- * doc comment
749 +- */
750 +- @Override
751 +- public boolean inConstructor()
752 +- {
753 +- return true;
754 +- }
755 +-
756 +- /**
757 +- * @return true since this tag can be used in a method
758 +- * doc comment
759 +- */
760 +- @Override
761 +- public boolean inMethod()
762 +- {
763 +- return true;
764 +- }
765 +-
766 +- /**
767 +- * @return true since this tag can be used in an overview
768 +- * doc comment
769 +- */
770 +- @Override
771 +- public boolean inOverview()
772 +- {
773 +- return true;
774 +- }
775 +-
776 +- /**
777 +- * @return true since this tag can be used in a package
778 +- * doc comment
779 +- */
780 +- @Override
781 +- public boolean inPackage()
782 +- {
783 +- return true;
784 +- }
785 +-
786 +- /**
787 +- * @return true since this
788 +- */
789 +- @Override
790 +- public boolean inType()
791 +- {
792 +- return true;
793 +- }
794 +-
795 +- /**
796 +- * Will return true since this is an inline tag.
797 +- *
798 +- * @return true since this is an inline tag.
799 +- */
800 +-
801 +- @Override
802 +- public boolean isInlineTag()
803 +- {
804 +- return true;
805 +- }
806 +-
807 +- /**
808 +- * Register this Taglet.
809 +- *
810 +- * @param tagletMap the map to register this tag to.
811 +- */
812 +- public static void register(final Map tagletMap)
813 +- {
814 +- final NativeTaglet tag = new NativeTaglet();
815 +- final Taglet t = (Taglet) tagletMap.get(tag.getName());
816 +- if (t != null)
817 +- {
818 +- tagletMap.remove(tag.getName());
819 +- }
820 +- tagletMap.put(tag.getName(), tag);
821 +- }
822 +-
823 +- /**
824 +- * Given the <code>Tag</code> representation of this custom
825 +- * tag, return its string representation.
826 +- *
827 +- * @param tag the <code>Tag</code> representation of this custom tag.
828 +- */
829 +- @Override
830 +- public String toString(final Tag tag)
831 +- {
832 +- String text= tag.text().trim();
833 +- if(mapping== null)
834 +- {
835 +- mapping= new Properties();
836 +- InputStream in= null;
837 +- try
838 +- {
839 +- URL url;
840 +- try
841 +- {
842 +- url = new URL(System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
843 +- }
844 +- catch (final MalformedURLException e)
845 +- {
846 +- url = new URL("file:"+System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
847 +- }
848 +- in= url.openStream();
849 +- mapping.load(in);
850 +- }
851 +- catch (final Exception e)
852 +- {
853 +- System.err.println("[NATIVE TAGLET] Could not read mapping file");
854 +- System.err.println("-->");
855 +- e.printStackTrace(System.err);
856 +- System.err.println("<--");
857 +- System.err.println("[NATIVE TAGLET] !!! NO LINKS WILL BE GENERATED !!!");
858 +- }
859 +- finally
860 +- {
861 +- if(in!=null) try{ in.close(); }catch(final Exception ignore){}
862 +- }
863 +- }
864 +-
865 +- if(mapping!=null)
866 +- {
867 +- // First check to see whether this key exists in the mapping
868 +- String url = mapping.getProperty(text);
869 +- if (url == null) {
870 +- // Try iterating the keySet seeing if we can find a partial match
871 +- // In the OpenGL spec this handles the case of glVertex -> glVertex3f
872 +- for(final Iterator i= mapping.keySet().iterator(); i.hasNext();) {
873 +- final String name= (String) i.next();
874 +- if (hasOpenGLSuffix(text, name)) {
875 +- url = mapping.getProperty(name);
876 +- break;
877 +- }
878 +- }
879 +- }
880 +- if (url != null) {
881 +- url = mapping.getProperty("nativetaglet.baseUrl", "") + url;
882 +- text = "<a href=\"" + url + "\">" + text + "</a>";
883 +- }
884 +- }
885 +- return text;
886 +- }
887 +-
888 +- private static final String[] openGLSuffixes = {
889 +- "b",
890 +- "s",
891 +- "i",
892 +- "f",
893 +- "d",
894 +- "ub",
895 +- "us",
896 +- "ui",
897 +- "bv",
898 +- "sv",
899 +- "iv",
900 +- "fv",
901 +- "dv",
902 +- "ubv",
903 +- "usv",
904 +- "uiv"
905 +- };
906 +- private static boolean hasOpenGLSuffix(final String name,
907 +- final String baseName) {
908 +- if (!name.startsWith(baseName)) {
909 +- return false;
910 +- }
911 +- for (int i = 0; i < openGLSuffixes.length; i++) {
912 +- final String suffix = openGLSuffixes[i];
913 +- if (name.endsWith(suffix)) {
914 +- // First see whether it's a simple concatenation
915 +- if (name.equals(baseName + suffix)) {
916 +- return true;
917 +- }
918 +- // Now chop prefix and suffix off and see whether the
919 +- // resulting is a number
920 +- try {
921 +- final String tmp = name.substring(baseName.length(),
922 +- name.length() - suffix.length());
923 +- if (tmp.length() == 1 &&
924 +- Character.isDigit(tmp.charAt(0))) {
925 +- return true;
926 +- }
927 +- } catch (final IndexOutOfBoundsException e) {
928 +- }
929 +- }
930 +- }
931 +- return false;
932 +- }
933 +-
934 +- /**
935 +- * This method should not be called since arrays of inline tags do not
936 +- * exist. Method {@link #tostring(Tag)} should be used to convert this
937 +- * inline tag to a string.
938 +- *
939 +- * @param tags the array of <code>Tag</code>s representing of this custom tag.
940 +- */
941 +- @Override
942 +- public String toString(final Tag[] tags)
943 +- {
944 +- return null;
945 +- }
946 +-}
947 +--- a/make/build.xml
948 ++++ b/make/build.xml
949 +@@ -466,9 +466,6 @@
950 + <fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/>
951 + <fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/>
952 +
953 +- <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDataInfoRuntime" />
954 +- <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" />
955 +- <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/>
956 +
957 + <echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os}" />
958 +
959 +@@ -746,6 +743,7 @@
960 +
961 + <!-- Compile gluegen-rt first -->
962 + <javac destdir="${classes}"
963 ++ nativeHeaderDir="${src.generated.c}"
964 + includeAntRuntime="false"
965 + includes="${gluegen-rt.classes} ${jogamp.common.classes}"
966 + excludes="${gluegen.excludes.all} ${java.part.android}"
967
968 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-linker.diff b/dev-java/gluegen/files/gluegen-2.3.2-linker.diff
969 new file mode 100644
970 index 000000000..aa2427c93
971 --- /dev/null
972 +++ b/dev-java/gluegen/files/gluegen-2.3.2-linker.diff
973 @@ -0,0 +1,11 @@
974 +--- a/make/gluegen-cpptasks-base.xml
975 ++++ b/make/gluegen-cpptasks-base.xml
976 +@@ -1316,6 +1316,8 @@
977 + <linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
978 + </linker>
979 +
980 ++
981 ++
982 + <compiler id="linker.cfg.android" name="${gcc.compat.compiler}">
983 + <!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
984 + </compiler>
985
986 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff b/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff
987 new file mode 100644
988 index 000000000..a39a2b145
989 --- /dev/null
990 +++ b/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff
991 @@ -0,0 +1,39 @@
992 +--- a/make/stub_includes/platform/glibc-compat-symbols.h
993 ++++ b/make/stub_includes/platform/glibc-compat-symbols.h
994 +@@ -15,35 +15,7 @@
995 + *
996 + * Check build-in macro definitions via 'gcc -dM -E - < /dev/null'
997 + */
998 +-#if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */
999 +- #if defined(__GNUC__)
1000 +- #if defined(__aarch64__)
1001 +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
1002 +- #elif defined(__arm__)
1003 +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
1004 +- #elif defined(__amd64__)
1005 +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
1006 +- #else
1007 +- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0");
1008 +- #endif /*__amd64__*/
1009 +- #elif defined(__clang__)
1010 +- #if defined(__aarch64__)
1011 +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
1012 +- #elif defined(__arm__)
1013 +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
1014 +- #elif defined(__amd64__)
1015 +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
1016 +- #else
1017 +- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.0");
1018 +- #endif /*__amd64__*/
1019 +- #else
1020 +- #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
1021 +- #define GLIBC_COMPAT_SYMBOL(FFF)
1022 +- #endif
1023 +-#else
1024 +- #warning GLIBC_COMPAT_SYMBOL not supported with target OS
1025 +- #define GLIBC_COMPAT_SYMBOL(FFF)
1026 +-#endif
1027 ++#define GLIBC_COMPAT_SYMBOL(FFF)
1028 +
1029 + GLIBC_COMPAT_SYMBOL(memcpy)
1030 +
1031
1032 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff
1033 new file mode 100644
1034 index 000000000..6dfa9b83f
1035 --- /dev/null
1036 +++ b/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff
1037 @@ -0,0 +1,16 @@
1038 +--- a/make/gluegen-cpptasks-base.xml
1039 ++++ b/make/gluegen-cpptasks-base.xml
1040 +@@ -292,7 +292,12 @@
1041 + <os name="Android" />
1042 + </condition>
1043 + <condition property="isLinux">
1044 +- <os name="Linux" />
1045 ++ <or>
1046 ++ <os name="Linux" />
1047 ++ <!-- treat GNU/kFreeBSD or Hurd just as Linux -->
1048 ++ <os name="GNU/kFreeBSD" />
1049 ++ <os name="GNU" />
1050 ++ </or>
1051 + </condition>
1052 + <condition property="isSolaris">
1053 + <os name="SunOS" />
1054
1055 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff
1056 new file mode 100644
1057 index 000000000..b1dd58a13
1058 --- /dev/null
1059 +++ b/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff
1060 @@ -0,0 +1,207 @@
1061 +Description: add support for ppc64el arch.
1062 +Author: Gilles Filippini <pini@××××××.org>
1063 +--- /dev/null
1064 ++++ b/make/scripts/make.gluegen.all.linux-ppc64le.sh
1065 +@@ -0,0 +1,24 @@
1066 ++#! /bin/sh
1067 ++
1068 ++# -Dc.compiler.debug=true \
1069 ++# -Dgluegen.cpptasks.detected.os=true \
1070 ++# -DisUnix=true \
1071 ++# -DisLinux=true \
1072 ++# -DisLinuxX86=true \
1073 ++# -DisX11=true \
1074 ++
1075 ++MACHINE=ppc64le
1076 ++ARCH=ppc64el
1077 ++TRIPLET=powerpc64le-linux-gnu
1078 ++
1079 ++export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
1080 ++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
1081 ++
1082 ++export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
1083 ++
1084 ++#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
1085 ++export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
1086 ++
1087 ++ant \
1088 ++ -Drootrel.build=build-linux-$MACHINE \
1089 ++ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
1090 +--- a/make/gluegen-cpptasks-base.xml
1091 ++++ b/make/gluegen-cpptasks-base.xml
1092 +@@ -48,6 +48,8 @@
1093 + - isLinuxMips
1094 + - isLinuxMipsel
1095 + - isLinuxPpc
1096 ++ - isLinuxPpc64
1097 ++ - isLinuxPpc64le
1098 + - isLinuxs390
1099 + - isLinuxs390x
1100 + - isLinuxSparc
1101 +@@ -133,6 +135,8 @@
1102 + - compiler.cfg.linux.mips
1103 + - compiler.cfg.linux.mipsel
1104 + - compiler.cfg.linux.ppc
1105 ++ - compiler.cfg.linux.ppc64
1106 ++ - compiler.cfg.linux.ppc64le
1107 + - compiler.cfg.linux.s390
1108 + - compiler.cfg.linux.s390x
1109 + - compiler.cfg.linux.sparc
1110 +@@ -155,6 +159,7 @@
1111 + - linker.cfg.linux.mips
1112 + - linker.cfg.linux.mipsel
1113 + - linker.cfg.linux.ppc
1114 ++ - linker.cfg.linux.ppc64le
1115 + - linker.cfg.linux.s390
1116 + - linker.cfg.linux.s390x
1117 + - linker.cfg.linux.sparc
1118 +@@ -417,6 +422,24 @@
1119 + <condition property="ppc">
1120 + <os arch="ppc" />
1121 + </condition>
1122 ++ <condition property="isLinuxPpc64">
1123 ++ <and>
1124 ++ <istrue value="${isLinux}" />
1125 ++ <os arch="ppc64" />
1126 ++ </and>
1127 ++ </condition>
1128 ++ <condition property="ppc64">
1129 ++ <os arch="ppc64" />
1130 ++ </condition>
1131 ++ <condition property="isLinuxPpc64le">
1132 ++ <and>
1133 ++ <istrue value="${isLinux}" />
1134 ++ <os arch="ppc64le" />
1135 ++ </and>
1136 ++ </condition>
1137 ++ <condition property="ppc64le">
1138 ++ <os arch="ppc64le" />
1139 ++ </condition>
1140 + <condition property="isLinuxs390">
1141 + <and>
1142 + <istrue value="${isLinux}" />
1143 +@@ -601,6 +624,8 @@
1144 + <echo message="LinuxMips=${isLinuxMips}" />
1145 + <echo message="LinuxMipsel=${isLinuxMipsel}" />
1146 + <echo message="LinuxPpc=${isLinuxPpc}" />
1147 ++ <echo message="LinuxPpc64=${isLinuxPpc64}" />
1148 ++ <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
1149 + <echo message="Linuxs390=${isLinuxs390}" />
1150 + <echo message="Linuxs390x=${isLinuxs390x}" />
1151 + <echo message="LinuxSparc=${isLinuxSparc}" />
1152 +@@ -683,6 +708,14 @@
1153 + <property name="os.and.arch" value="linux-ppc" />
1154 + </target>
1155 +
1156 ++ <target name="gluegen.cpptasks.detect.os.linux.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64">
1157 ++ <property name="os.and.arch" value="linux-ppc64" />
1158 ++ </target>
1159 ++
1160 ++ <target name="gluegen.cpptasks.detect.os.linux.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64le">
1161 ++ <property name="os.and.arch" value="linux-ppc64le" />
1162 ++ </target>
1163 ++
1164 + <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
1165 + <property name="os.and.arch" value="linux-s390" />
1166 + </target>
1167 +@@ -707,7 +740,7 @@
1168 + <property name="os.and.arch" value="android-aarch64" />
1169 + </target>
1170 +
1171 +- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
1172 ++ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
1173 +
1174 + <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
1175 + <property name="native.library.suffix" value="*lib" />
1176 +@@ -1268,6 +1301,12 @@
1177 + <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
1178 + </linker>
1179 +
1180 ++ <linker id="linker.cfg.linux.ppc64" name="${gcc.compat.compiler}">
1181 ++ </linker>
1182 ++
1183 ++ <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}">
1184 ++ </linker>
1185 ++
1186 + <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
1187 + </linker>
1188 +
1189 +@@ -1505,6 +1544,20 @@
1190 + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
1191 + </target>
1192 +
1193 ++ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64" if="isLinuxPpc64">
1194 ++ <echo message="Linux.Ppc64" />
1195 ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
1196 ++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
1197 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" />
1198 ++ </target>
1199 ++
1200 ++ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64le" if="isLinuxPpc64le">
1201 ++ <echo message="Linux.Ppc64le" />
1202 ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
1203 ++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
1204 ++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" />
1205 ++ </target>
1206 ++
1207 + <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
1208 + <echo message="Linux.s390" />
1209 + <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
1210 +@@ -1526,7 +1579,7 @@
1211 + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
1212 + </target>
1213 +
1214 +- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
1215 ++ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
1216 + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
1217 + </target>
1218 +
1219 +--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
1220 ++++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
1221 +@@ -522,6 +522,7 @@ public abstract class PlatformPropsImpl
1222 + * <li>linux-aarch64</li>
1223 + * <li>linux-amd64</li>
1224 + * <li>linux-ppc64</li>
1225 ++ * <li>linux-ppc64le</li>
1226 + * <li>linux-mips64</li>
1227 + * <li>linux-ia64</li>
1228 + * <li>linux-sparcv9</li>
1229 +@@ -578,7 +579,7 @@ public abstract class PlatformPropsImpl
1230 + _and_arch_tmp = "amd64";
1231 + break;
1232 + case PPC64:
1233 +- _and_arch_tmp = "ppc64";
1234 ++ _and_arch_tmp = littleEndian ? "ppc64le" : "ppc64";
1235 + break;
1236 + case MIPS_64:
1237 + _and_arch_tmp = "mips64";
1238 +--- a/make/build.xml
1239 ++++ b/make/build.xml
1240 +@@ -306,6 +306,18 @@
1241 + <property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
1242 + </target>
1243 +
1244 ++ <target name="declare.linux.ppc64" if="isLinuxPpc64">
1245 ++ <echo message="Linux.ppc64" />
1246 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
1247 ++ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64" />
1248 ++ </target>
1249 ++
1250 ++ <target name="declare.linux.ppc64le" if="isLinuxPpc64le">
1251 ++ <echo message="Linux.ppc64le" />
1252 ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
1253 ++ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" />
1254 ++ </target>
1255 ++
1256 + <target name="declare.linux.s390" if="isLinuxs390">
1257 + <echo message="Linux.s390" />
1258 + <property name="compiler.cfg.id" value="compiler.cfg.linux" />
1259 +@@ -324,7 +336,7 @@
1260 + <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
1261 + </target>
1262 +
1263 +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
1264 ++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
1265 + <property name="c.src.dir.os" value="unix" />
1266 + </target>
1267 +
1268
1269 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch b/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
1270 deleted file mode 100644
1271 index 1b43c6721..000000000
1272 --- a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
1273 +++ /dev/null
1274 @@ -1,106 +0,0 @@
1275 ---- a/make/gluegen-cpptasks-base.xml
1276 -+++ b/make/gluegen-cpptasks-base.xml
1277 -@@ -1216,21 +1216,12 @@
1278 -
1279 - <!-- Unix linker configuration -->
1280 -
1281 -- <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
1282 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1283 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1284 -- </linker>
1285 --
1286 - <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
1287 - <linkerarg value="-m32"/>
1288 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1289 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1290 - </linker>
1291 -
1292 - <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
1293 - <linkerarg value="-m64"/>
1294 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1295 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1296 - </linker>
1297 -
1298 - <!-- Using default compiler settings - utilize:
1299 -@@ -1241,16 +1232,12 @@
1300 - <linkerarg value="-fpic" />
1301 - <linkerarg value="-nostdlib" />
1302 - <linkerarg value="-Bdynamic" />
1303 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1304 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1305 - </linker>
1306 -
1307 - <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
1308 - <linkerarg value="-fpic" />
1309 - <linkerarg value="-nostdlib" />
1310 - <linkerarg value="-Bdynamic" />
1311 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1312 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1313 - </linker>
1314 -
1315 - <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
1316 -@@ -1296,20 +1283,14 @@
1317 -
1318 - <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}">
1319 - <linkerarg value="-m32"/>
1320 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1321 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1322 - </linker>
1323 -
1324 - <linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}">
1325 - <linkerarg value="-xarch=v9a" />
1326 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1327 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1328 - </linker>
1329 -
1330 - <linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}">
1331 - <linkerarg value="-m64"/>
1332 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1333 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1334 - <!-- linkerarg value="-xarch=amd64" / -->
1335 - </linker>
1336 -
1337 -@@ -1324,8 +1305,6 @@
1338 - <linkerarg value="-arch" if="use.macosx64"/>
1339 - <linkerarg value="x86_64" if="use.macosx64"/>
1340 - <linkerarg value="-mmacosx-version-min=10.5"/>
1341 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1342 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1343 - <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
1344 - </linker>
1345 -
1346 -@@ -1334,16 +1313,12 @@
1347 - <!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"-->
1348 - <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
1349 - <linkerarg value="-m64"/>
1350 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1351 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1352 - </linker>
1353 -
1354 - <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
1355 - <linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
1356 - <linkerarg value="-m32"/>
1357 - <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
1358 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1359 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1360 - </linker>
1361 -
1362 - <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
1363 -@@ -1351,8 +1326,6 @@
1364 - <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
1365 - <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
1366 - <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
1367 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1368 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1369 - </linker>
1370 -
1371 - <linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
1372 -@@ -1360,8 +1333,6 @@
1373 - <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
1374 - <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
1375 - <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
1376 -- <linkerarg value="-static-libgcc" if="isGCC"/>
1377 -- <linkerarg value="-static-libstdc++" if="isGCC"/>
1378 - </linker>
1379 -
1380 - <linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">
1381
1382 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff b/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff
1383 new file mode 100644
1384 index 000000000..5820c7765
1385 --- /dev/null
1386 +++ b/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff
1387 @@ -0,0 +1,67 @@
1388 +Description: No longer use rt.jar which is gone since Java 9
1389 +Author: Emmanuel Bourg <ebourg@××××××.org>
1390 +Forwarded: no
1391 +--- a/make/build.xml
1392 ++++ b/make/build.xml
1393 +@@ -729,7 +729,6 @@
1394 + encoding="UTF-8"
1395 + source="${target.sourcelevel}"
1396 + target="${target.targetlevel}"
1397 +- bootclasspath="${target.rt.jar}"
1398 + debug="${javacdebug}" debuglevel="${javacdebuglevel}">
1399 + <src path="${src.java}" />
1400 + <src path="${src.generated.java}" />
1401 +@@ -757,7 +756,6 @@
1402 + encoding="UTF-8"
1403 + source="${target.sourcelevel}"
1404 + target="${target.targetlevel}"
1405 +- bootclasspath="${host.rt.jar}"
1406 + debug="${javacdebug}" debuglevel="${javacdebuglevel}">
1407 + <src path="${src.jcpp}" />
1408 + <src path="${src.java}" />
1409 +@@ -914,7 +912,6 @@
1410 + encoding="UTF-8"
1411 + source="${target.sourcelevel}"
1412 + target="${target.targetlevel}"
1413 +- bootclasspath="${target.rt.jar}"
1414 + debug="${javacdebug}" debuglevel="${javacdebuglevel}">
1415 + <src path="${src.java}" />
1416 + <src path="${src.generated.java}" />
1417 +@@ -974,7 +971,6 @@
1418 + encoding="UTF-8"
1419 + source="${target.sourcelevel}"
1420 + target="${target.targetlevel}"
1421 +- bootclasspath="${target.rt.jar}"
1422 + debug="${javacdebug}" debuglevel="${javacdebuglevel}">
1423 + <src path="${src.java}" />
1424 + <classpath refid="android.classpath" />
1425 +--- a/make/jogamp-env.xml
1426 ++++ b/make/jogamp-env.xml
1427 +@@ -183,13 +183,6 @@
1428 + <echo message="target.sourcelevel ${target.sourcelevel}"/>
1429 + <echo message="target.targetlevel ${target.targetlevel}"/>
1430 + <echo message="target.rt.jar ${target.rt.jar}"/>
1431 +- <fail message="No target.rt.jar specified not found.">
1432 +- <condition>
1433 +- <not>
1434 +- <isset property="target.rt.jar"/>
1435 +- </not>
1436 +- </condition>
1437 +- </fail>
1438 +
1439 + <property name="host.sourcelevel" value="${ant.java.version}" /> <!-- default values for compile time components -->
1440 + <property name="host.targetlevel" value="${ant.java.version}" /> <!-- default values for compile time components -->
1441 +@@ -206,13 +199,6 @@
1442 + <echo message="host.sourcelevel ${host.sourcelevel}"/>
1443 + <echo message="host.targetlevel ${host.targetlevel}"/>
1444 + <echo message="host.rt.jar ${host.rt.jar}"/>
1445 +- <fail message="No host.rt.jar specified not found.">
1446 +- <condition>
1447 +- <not>
1448 +- <isset property="host.rt.jar"/>
1449 +- </not>
1450 +- </condition>
1451 +- </fail>
1452 +
1453 + <fail message="Unsupported Target Java version (sourcelevel): ${target.sourcelevel}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
1454 + <condition>
1455
1456 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff
1457 new file mode 100644
1458 index 000000000..e5576b336
1459 --- /dev/null
1460 +++ b/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff
1461 @@ -0,0 +1,138 @@
1462 +Description: add support for s390x arch.
1463 +Author: Gilles Filippini <pini@××××××.org>
1464 +--- /dev/null
1465 ++++ b/make/scripts/make.gluegen.all.linux-s390x.sh
1466 +@@ -0,0 +1,24 @@
1467 ++#! /bin/sh
1468 ++
1469 ++# -Dc.compiler.debug=true \
1470 ++# -Dgluegen.cpptasks.detected.os=true \
1471 ++# -DisUnix=true \
1472 ++# -DisLinux=true \
1473 ++# -DisLinuxX86=true \
1474 ++# -DisX11=true \
1475 ++
1476 ++MACHINE=s390x
1477 ++ARCH=s390x
1478 ++TRIPLET=s390x-linux-gnu
1479 ++
1480 ++export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
1481 ++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
1482 ++
1483 ++export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
1484 ++
1485 ++#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
1486 ++export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
1487 ++
1488 ++ant \
1489 ++ -Drootrel.build=build-linux-$MACHINE \
1490 ++ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
1491 +--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
1492 ++++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
1493 +@@ -527,6 +527,7 @@ public abstract class PlatformPropsImpl
1494 + * <li>linux-ia64</li>
1495 + * <li>linux-sparcv9</li>
1496 + * <li>linux-risc2.0</li>
1497 ++ * <li>linux-s390x</li>
1498 + * <li>freebsd-i586</li>
1499 + * <li>freebsd-amd64</li>
1500 + * <li>hpux-hppa</li>
1501 +@@ -593,6 +594,9 @@ public abstract class PlatformPropsImpl
1502 + case PA_RISC2_0:
1503 + _and_arch_tmp = "risc2.0";
1504 + break;
1505 ++ case S390X:
1506 ++ _and_arch_tmp = "s390x";
1507 ++ break;
1508 + default:
1509 + throw new InternalError("Unhandled CPUType: "+cpuType);
1510 + }
1511 +--- a/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
1512 ++++ b/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
1513 +@@ -412,6 +412,15 @@ public class ElfHeaderPart1 {
1514 + cpuName = "ppc64";
1515 + abiType = ABIType.GENERIC_ABI;
1516 + break;
1517 ++ case EM_S390:
1518 ++ // Can be 32 or 64 bits
1519 ++ if( 64 == getArchClassBits() ) {
1520 ++ cpuName = "s390x";
1521 ++ } else {
1522 ++ cpuName = "s390";
1523 ++ }
1524 ++ abiType = ABIType.GENERIC_ABI;
1525 ++ break;
1526 + case EM_SH:
1527 + cpuName = "superh";
1528 + abiType = ABIType.GENERIC_ABI;
1529 +--- a/src/java/com/jogamp/common/os/Platform.java
1530 ++++ b/src/java/com/jogamp/common/os/Platform.java
1531 +@@ -77,7 +77,9 @@ public class Platform extends PlatformPr
1532 + /** Itanium */
1533 + IA64,
1534 + /** Hitachi SuperH */
1535 +- SuperH;
1536 ++ SuperH,
1537 ++ /** IBM ESA/390 and zSystems */
1538 ++ S390;
1539 + }
1540 +
1541 + public enum CPUType {
1542 +@@ -118,9 +120,13 @@ public class Platform extends PlatformPr
1543 + /** SPARC 64bit, big endian */
1544 + SPARCV9_64(CPUFamily.SPARC, false),
1545 + /** PA_RISC2_0 64bit, ??? endian */
1546 +- PA_RISC2_0(CPUFamily.PA_RISC, false);
1547 ++ PA_RISC2_0(CPUFamily.PA_RISC, false),
1548 + // 17
1549 +
1550 ++ /** S390X 64bit big endian */
1551 ++ S390X(CPUFamily.S390, true);
1552 ++ // 18
1553 ++
1554 + public final CPUFamily family;
1555 + public final boolean is32Bit;
1556 +
1557 +@@ -201,6 +207,8 @@ public class Platform extends PlatformPr
1558 + return MIPS_32;
1559 + } else if( cpuABILower.startsWith("superh") ) {
1560 + return SuperH;
1561 ++ } else if( cpuABILower.equals("s390x") ) {
1562 ++ return S390X;
1563 + } else {
1564 + throw new RuntimeException("Please port CPUType detection to your platform (CPU_ABI string '" + cpuABILower + "')");
1565 + }
1566 +--- a/src/java/com/jogamp/common/os/MachineDataInfo.java
1567 ++++ b/src/java/com/jogamp/common/os/MachineDataInfo.java
1568 +@@ -73,6 +73,7 @@ public class MachineDataInfo {
1569 + private final static int[] align_sparc_32_sunos = { 1, 2, 4, 8, 4, 4, 4, 8, 8, 4 };
1570 + private final static int[] align_x86_32_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 4, 4 };
1571 + private final static int[] align_lp64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 16, 8 };
1572 ++ private final static int[] align_s390_64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 8, 8 };
1573 + private final static int[] align_x86_64_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 16, 8 };
1574 +
1575 + /**
1576 +@@ -108,9 +109,11 @@ public class MachineDataInfo {
1577 + X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows),
1578 + /** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, {@link Platform.CPUType#PPC64} Unix, .. */
1579 + LP64_UNIX( size_lp64_unix, align_lp64_unix),
1580 ++ /** {@link Platform.CPUType#S390X} Unix */
1581 ++ S390_64_UNIX( size_lp64_unix, align_s390_64_unix),
1582 + /** {@link Platform.CPUType#X86_64} Windows */
1583 + X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
1584 +- // 8
1585 ++ // 9
1586 +
1587 + public final MachineDataInfo md;
1588 +
1589 +--- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java
1590 ++++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java
1591 +@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime {
1592 + } else {
1593 + if( osType == Platform.OSType.WINDOWS ) {
1594 + return StaticConfig.X86_64_WINDOWS;
1595 ++ } else if ( Platform.CPUType.S390X == cpuType ) {
1596 ++ return StaticConfig.S390_64_UNIX;
1597 + } else {
1598 + // for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
1599 + return StaticConfig.LP64_UNIX;
1600
1601 diff --git a/dev-java/gluegen/files/gluegen-2.3.2-tests.diff b/dev-java/gluegen/files/gluegen-2.3.2-tests.diff
1602 new file mode 100644
1603 index 000000000..be298505a
1604 --- /dev/null
1605 +++ b/dev-java/gluegen/files/gluegen-2.3.2-tests.diff
1606 @@ -0,0 +1,171 @@
1607 +Description: enable testcases build and run.
1608 + One testcase can't build because of missing up to date semver-java:
1609 + - TestVersionSemantics
1610 + Three testcases fail on every arch while the library seems functional:
1611 + - TestUri99LaunchOnReservedCharPathBug908
1612 + - TestStructGen01
1613 + - TestStructGen02.
1614 +Author: Gilles Filippini <pini@××××××.org>
1615 +--- gluegen2.orig/make/build-test.xml
1616 ++++ gluegen2/make/build-test.xml
1617 +@@ -84,6 +84,7 @@
1618 + <pathelement location="${junit.jar}" />
1619 + <pathelement location="${semver.jar}" />
1620 + <pathelement location="${gluegen.jar}" />
1621 ++ <pathelement location="/usr/share/java/jsr305.jar" />
1622 + </path>
1623 +
1624 + <path id="junit.run.classpath">
1625 +--- gluegen2.orig/make/scripts/runtest.sh
1626 ++++ gluegen2/make/scripts/runtest.sh
1627 +@@ -42,7 +42,7 @@ rm -f $LOG
1628 + GLUEGEN_ROOT=`dirname $builddir`
1629 + ROOTREL_BUILD=`basename $builddir`
1630 +
1631 +-X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT"
1632 ++X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT -Djava.library.path=$builddir/obj:$builddir/test/build/natives"
1633 + #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup"
1634 + #D_ARGS="-Djogamp.debug.TraceLock"
1635 + #D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary"
1636 +@@ -64,12 +64,12 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD -
1637 + #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.IOUtil.Exe"
1638 + #D_ARGS="-Djogamp.debug.ByteBufferInputStream"
1639 + #D_ARGS="-Djogamp.debug.Bitstream"
1640 +-#D_ARGS="-Djogamp.debug=all"
1641 ++D_ARGS="-Djogamp.debug=all"
1642 + #D_ARGS="-Djogamp.debug.Logging"
1643 +
1644 + function onetest() {
1645 + #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
1646 +- USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
1647 ++ USE_CLASSPATH=/usr/share/java/junit4.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../test/TestJarsInJar/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
1648 + #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
1649 + libspath="$builddir"/test/build/natives
1650 + #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes
1651 +@@ -88,66 +88,68 @@ function onetest() {
1652 + echo
1653 + }
1654 + #
1655 ++(cd $builddir/../test/TestJarsInJar && sh make.sh)
1656 ++#
1657 +-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
1658 +-#onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
1659 +-#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
1660 +-#onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
1661 ++onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
1662 ++onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
1663 ++onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
1664 ++onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
1665 + #onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
1666 +-#onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
1667 +-#onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
1668 +-#onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
1669 +-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
1670 +-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
1671 +-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
1672 +-#onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
1673 +-#onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
1674 +-#onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
1675 +-#onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
1676 +-#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
1677 +-#onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
1678 +-#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
1679 +-#onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
1680 +-#onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
1681 ++onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
1682 ++onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
1683 ++onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
1684 ++onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
1685 ++onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
1686 ++onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
1687 ++onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
1688 ++onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
1689 ++onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
1690 ++onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
1691 ++onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
1692 ++onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
1693 ++onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
1694 ++onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
1695 ++onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
1696 + onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG
1697 +-#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
1698 +-#onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
1699 +-#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
1700 +-#onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
1701 +-#onetest com.jogamp.common.util.TestLFRingBuffer01 $*
1702 +-#onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
1703 +-#onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
1704 +-#onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
1705 +-#onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
1706 +-#onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
1707 +-#onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
1708 +-#onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
1709 +-#onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
1710 +-#onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
1711 +-#onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
1712 +-#onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
1713 +-#onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
1714 +-#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
1715 +-#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
1716 +-#onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
1717 +-#onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
1718 +-#onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
1719 +-#onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
1720 +-#onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
1721 +-#onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
1722 +-#onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
1723 +-#onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
1724 +-#onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
1725 +-#onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
1726 ++onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
1727 ++onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
1728 ++onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
1729 ++onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
1730 ++onetest com.jogamp.common.util.TestLFRingBuffer01 $*
1731 ++onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
1732 ++onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
1733 ++onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
1734 ++onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
1735 ++onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
1736 ++onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
1737 ++onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
1738 ++onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
1739 ++onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
1740 ++onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
1741 ++onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
1742 ++onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
1743 ++onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
1744 ++onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
1745 ++onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
1746 ++onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
1747 ++onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
1748 ++onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
1749 ++onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
1750 ++onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
1751 ++onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
1752 ++onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
1753 ++onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
1754 ++onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
1755 +
1756 +-#onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
1757 +-#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
1758 +-#onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
1759 +-#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
1760 +-#onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
1761 ++onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
1762 ++onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
1763 ++onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
1764 ++onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
1765 ++onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
1766 +
1767 +-#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
1768 +-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
1769 +-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
1770 +-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
1771 +-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
1772 ++onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
1773 ++onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
1774 ++onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
1775 ++onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
1776 ++onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
1777 +
1778
1779 diff --git a/dev-java/gluegen/gluegen-2.3.2.ebuild b/dev-java/gluegen/gluegen-2.3.2.ebuild
1780 index a1946b576..d8cfd0826 100644
1781 --- a/dev-java/gluegen/gluegen-2.3.2.ebuild
1782 +++ b/dev-java/gluegen/gluegen-2.3.2.ebuild
1783 @@ -4,6 +4,7 @@
1784 EAPI=8
1785
1786 JAVA_PKG_IUSE="doc source test"
1787 +WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
1788
1789 inherit java-pkg-2 java-ant-2 toolchain-funcs
1790
1791 @@ -40,26 +41,42 @@ DEPEND="
1792 dev-java/ant-junit4
1793 )
1794 "
1795 -BDEPEND="dev-vcs/git"
1796
1797 PATCHES=(
1798 + "${FILESDIR}/${PN}-2.3.2-ppc64el-support.diff"
1799 + "${FILESDIR}/${PN}-2.3.2-disableArchive7z.diff"
1800 + "${FILESDIR}/${PN}-2.3.2-disable-test-zip-archive.diff"
1801 + "${FILESDIR}/${PN}-2.3.2-disable_git_call.diff"
1802 + "${FILESDIR}/${PN}-2.3.2-linker.diff"
1803 + "${FILESDIR}/${PN}-2.3.2-hideException.diff"
1804 + "${FILESDIR}/${PN}-2.3.2-armhf.diff"
1805 + "${FILESDIR}/${PN}-2.3.2-fix-alpha-build-config.patch"
1806 + "${FILESDIR}/${PN}-2.3.2-missing-arch-symbol.diff"
1807 + "${FILESDIR}/${PN}-2.3.2-fix-arm64-build-config.diff"
1808 + "${FILESDIR}/${PN}-2.3.2-tests.diff"
1809 + "${FILESDIR}/${PN}-2.3.2-disable-static-linking.diff"
1810 + "${FILESDIR}/${PN}-2.3.2-s390x-support.diff"
1811 + "${FILESDIR}/${PN}-2.3.2-non-linux-support.diff"
1812 + "${FILESDIR}/${PN}-2.3.2-disable-java-version-check.diff"
1813 + "${FILESDIR}/${PN}-2.3.2-rtjar.diff"
1814 + "${FILESDIR}/${PN}-2.3.2-add-mips64el-mipsn32-support.diff"
1815 + "${FILESDIR}/${PN}-2.3.2-java10-compatibility.patch"
1816 + "${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch"
1817 +
1818 "${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
1819 "${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
1820 - "${FILESDIR}/${PN}-2.2.4-dont-test-archive.patch"
1821 - "${FILESDIR}/${P}-remove-static-lib.patch"
1822 - "${FILESDIR}/${P}-respect-flags.patch"
1823 + "${FILESDIR}/${PN}-2.3.2-respect-flags.patch"
1824 )
1825 EANT_BUILD_TARGET="all.no_junit"
1826 EANT_BUILD_XML="make/build.xml"
1827 EANT_DOC_TARGET=""
1828 -EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
1829 +EANT_EXTRA_ARGS="-Dc.strip.libraries=false -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar= "
1830 EANT_GENTOO_CLASSPATH="antlr,ant-core,jsr305"
1831 EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
1832 EANT_NEEDS_TOOLS="yes"
1833 EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
1834 EANT_TEST_TARGET="junit.run"
1835 JAVA_ANT_REWRITE_CLASSPATH="yes"
1836 -WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
1837
1838 src_prepare() {
1839 tc-export CC
1840 @@ -67,13 +84,6 @@ src_prepare() {
1841 rm -rf make/lib || die
1842 default
1843 java-ant_bsfix_files "${S}/make/build-test.xml" "${S}/make/jogamp-env.xml"
1844 -
1845 - #it want a git repo
1846 - git init || die
1847 - git config --global user.email "you@×××××××.com" || die
1848 - git config --global user.name "Your Name" || die
1849 - git add . || die
1850 - git commit -m 'init' || die
1851 }
1852
1853 src_test() {
Report Message
Find on MARC Find on Google Groups