[pkg-java] r17282 - in trunk/gluegen2/debian: . patches

Sylvestre Ledru sylvestre at alioth.debian.org
Sat Sep 28 17:03:54 UTC 2013 

Author: sylvestre
Date: 2013-09-28 17:03:53 +0000 (Sat, 28 Sep 2013)
New Revision: 17282

Added:
   trunk/gluegen2/debian/patches/armhf.diff
Modified:
   trunk/gluegen2/debian/changelog
   trunk/gluegen2/debian/patches/disableArchive7z.diff
   trunk/gluegen2/debian/patches/series
   trunk/gluegen2/debian/rules
Log:
* New upstream release

* Synchronise From Ubuntu.  Remaining changes:
  - Add more explicit armhf support, rather than trying to use incorrect
    armel toolchain flags.
  - On armhf, build only the all.no_junit target.  "all junit.run"
    mysteriously segfaults on the first run but not thereafter.

Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog	2013-09-28 12:45:45 UTC (rev 17281)
+++ trunk/gluegen2/debian/changelog	2013-09-28 17:03:53 UTC (rev 17282)
@@ -1,3 +1,16 @@
+gluegen2 (2.0.2-1) unstable; urgency=low
+
+  * New upstream release
+  
+  [ Colin Watson ]
+  * Synchronise From Ubuntu.  Remaining changes:
+    - Add more explicit armhf support, rather than trying to use incorrect
+      armel toolchain flags.
+    - On armhf, build only the all.no_junit target.  "all junit.run"
+      mysteriously segfaults on the first run but not thereafter.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 28 Sep 2013 18:53:18 +0200
+
 gluegen2 (2.0-rc12-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/gluegen2/debian/patches/armhf.diff
===================================================================
--- trunk/gluegen2/debian/patches/armhf.diff	                        (rev 0)
+++ trunk/gluegen2/debian/patches/armhf.diff	2013-09-28 17:03:53 UTC (rev 17282)
@@ -0,0 +1,84 @@
+Index: b/make/build.xml
+===================================================================
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -289,10 +289,16 @@
+       <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+     </target>
+ 
+-    <target name="declare.linux.armv6" if="isLinuxARMv6">
+-      <echo message="Linux.armv6" />
+-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv6" /> 
+-      <property name="linker.cfg.id"                        value="linker.cfg.linux.armv6" /> 
++    <target name="declare.linux.armv6.armel" if="isLinuxARMv6Armel">
++      <echo message="Linux.armv6.armel" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv6.armel" /> 
++      <property name="linker.cfg.id"                        value="linker.cfg.linux.armv6.armel" /> 
++    </target>
++
++    <target name="declare.linux.armv6.armhf" if="isLinuxARMv6Armhf">
++      <echo message="Linux.armv6.armhf" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
++      <property name="linker.cfg.id"                        value="linker.cfg.linux.armv6.armhf" /> 
+     </target>
+ 
+     <target name="declare.linux.alpha" if="isLinuxAlpha">
+@@ -343,7 +349,7 @@
+       <property name="linker.cfg.id"                        value="linker.cfg.linux.sparc" /> 
+     </target>
+     
+-    <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" >
++    <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.armel,declare.linux.armv6.armhf" if="isLinux" >
+       <property name="c.src.dir.os"                         value="unix" />
+       <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
+     </target>
+Index: b/make/gluegen-cpptasks-base.xml
+===================================================================
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -122,7 +122,7 @@
+    -   compiler.cfg.linux
+    -   compiler.cfg.linux.x86
+    -   compiler.cfg.linux.amd64
+-   -   compiler.cfg.linux.armv6
++   -   compiler.cfg.linux.armv6.armel
+    -   compiler.cfg.linux.alpha
+    -   compiler.cfg.linux.hppa
+    -   compiler.cfg.linux.mips
+@@ -143,7 +143,8 @@
+    -   linker.cfg.linux
+    -   linker.cfg.linux.x86
+    -   linker.cfg.linux.amd64
+-   -   linker.cfg.linux.armv6
++   -   linker.cfg.linux.armv6.armel
++   -   linker.cfg.linux.armv6.armhf
+    -   linker.cfg.linux.alpha
+    -   linker.cfg.linux.hppa
+    -   linker.cfg.linux.mips
+@@ -927,7 +928,7 @@
+            - lib/gluegen-cpptasks-linux-armv6.xml   (armv5te + softfp), or 
+            - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6   + hardfp) 
+          for official JogAmp builds! -->
+-    <compiler id="compiler.cfg.linux.armv6" name="gcc">
++    <compiler id="compiler.cfg.linux.armv6.armel" name="gcc">
+       <defineset>
+         <define name="__unix__"/>
+         <define name="__X11__"  if="isX11"/>
+@@ -1142,13 +1143,16 @@
+            - lib/gluegen-cpptasks-linux-armv6.xml   (armv5te + softfp), or 
+            - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6   + hardfp) 
+          for official JogAmp builds! -->
+-    <linker id="linker.cfg.linux.armv6" name="gcc">
++    <linker id="linker.cfg.linux.armv6.armel" name="gcc">
+       <linkerarg value="-fpic" /> 
+       <linkerarg value="-nostdlib" />
+       <linkerarg value="-Bdynamic" />
+       <linkerarg value="-static-libgcc"/>
+     </linker>
+ 
++    <linker id="linker.cfg.linux.armv6.armhf" name="gcc">
++    </linker>
++
+     <linker id="linker.cfg.linux.alpha" name="gcc">
+     </linker>
+ 

Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff
===================================================================
--- trunk/gluegen2/debian/patches/disableArchive7z.diff	2013-09-28 12:45:45 UTC (rev 17281)
+++ trunk/gluegen2/debian/patches/disableArchive7z.diff	2013-09-28 17:03:53 UTC (rev 17282)
@@ -1,11 +1,11 @@
-Index: gluegen-v2.0-rc12/make/build.xml
+Index: gluegen-v2.0.2/make/build.xml
 ===================================================================
---- gluegen-v2.0-rc12.orig/make/build.xml	2013-07-01 14:02:13.000000000 +0200
-+++ gluegen-v2.0-rc12/make/build.xml	2013-07-01 14:02:13.000000000 +0200
-@@ -1002,9 +1002,9 @@
-         <classpath path="${classes}"/>
-         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
-     </javadoc>
+--- gluegen-v2.0.2.orig/make/build.xml	2013-09-28 18:57:37.000000000 +0200
++++ gluegen-v2.0.2/make/build.xml	2013-09-28 18:58:13.000000000 +0200
+@@ -1006,9 +1006,9 @@
+     <copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
+         <fileset dir="doc/javadoc/resources" includes="*" />
+     </copy>
 -    <archive.7z destfile="${build}/javadoc.7z"
 +<!--    <archive.7z destfile="${build}/javadoc.7z"
                  basedir="${javadoc.root.path}"
@@ -14,3 +14,15 @@
    </target>
  
      <!-- ================================================================== -->
+@@ -1046,9 +1046,9 @@
+             <fileset dir="${project.root}/jnlp-files" includes="*" />
+         </copy>
+         <copy todir="${archive}" file="${build}/gluegen-java-src.zip"/>
+-        <archive.7z destfile="${build}/${archive.name}.7z"
++<!--        <archive.7z destfile="${build}/${archive.name}.7z"
+              basedir="${build}"
+-             includes="${archive.name}/**" />
++             includes="${archive.name}/**" />-->
+         <!-- Clean up after ourselves -->
+         <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
+     </target>

Modified: trunk/gluegen2/debian/patches/series
===================================================================
--- trunk/gluegen2/debian/patches/series	2013-09-28 12:45:45 UTC (rev 17281)
+++ trunk/gluegen2/debian/patches/series	2013-09-28 17:03:53 UTC (rev 17282)
@@ -14,3 +14,4 @@
 #s390x.diff
 #duplicatedeclaration.diff
 #disable_android2.diff
+armhf.diff

Modified: trunk/gluegen2/debian/rules
===================================================================
--- trunk/gluegen2/debian/rules	2013-09-28 12:45:45 UTC (rev 17281)
+++ trunk/gluegen2/debian/rules	2013-09-28 17:03:53 UTC (rev 17282)
@@ -9,7 +9,13 @@
 DEB_ANT_CLEAN_TARGET := clean
 DEB_BUILDDIR         := make
 DEB_ANT_BUILD_TARGET := all junit.run
+DEB_ANT_ARGS += -Dtarget.sourcelevel=1.6 -Dtarget.targetlevel=1.6 -Dtarget.rt.jar=1.6
 
+ifeq ($(DEB_HOST_ARCH),armhf)
+DEB_ANT_ARGS         += -DisAbiEabiGnuArmhf=true
+DEB_ANT_BUILD_TARGET := all.no_junit
+endif
+
 install/libgluegen2-rt-java::
 	install -m 644 -D build/gluegen-rt.jar debian/libgluegen2-rt-java/usr/share/java/gluegen2-$(DEB_UPSTREAM_VERSION)-rt.jar
 	ln -s gluegen2-$(DEB_UPSTREAM_VERSION)-rt.jar debian/libgluegen2-rt-java/usr/share/java/gluegen2-rt.jar

More information about the pkg-java-commits mailing list