[pkg-java] r17290 - in trunk/commons-daemon/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-10-01 11:43:54 +0000 (Tue, 01 Oct 2013)
New Revision: 17290

Added:
   trunk/commons-daemon/debian/patches/s390x_support.diff
Modified:
   trunk/commons-daemon/debian/changelog
   trunk/commons-daemon/debian/patches/series
Log:
Restored the patch for s390x support



Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog	2013-10-01 11:34:46 UTC (rev 17289)
+++ trunk/commons-daemon/debian/changelog	2013-10-01 11:43:54 UTC (rev 17290)
@@ -3,6 +3,7 @@
   * Use canonical URLs for the Vcs-* fields
   * Generate Java 6 compatible bytecode
   * debian/rules: Improved the clean target to allow rebuilds
+  * Restored the patch for s390x support
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 01 Oct 2013 12:59:44 +0200
 

Added: trunk/commons-daemon/debian/patches/s390x_support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/s390x_support.diff	                        (rev 0)
+++ trunk/commons-daemon/debian/patches/s390x_support.diff	2013-10-01 11:43:54 UTC (rev 17290)
@@ -0,0 +1,13 @@
+Description: Adds support for s390x
+Author: Emmanuel Bourg <ebourg at apache.org>
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -161,7 +161,7 @@
+         HOST_CPU=ia64
+     fi
+     ;;
+-  s390)
++  s390 | s390x)
+     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+     supported_os="s390"
+     HOST_CPU=s390

Modified: trunk/commons-daemon/debian/patches/series
===================================================================
--- trunk/commons-daemon/debian/patches/series	2013-10-01 11:34:46 UTC (rev 17289)
+++ trunk/commons-daemon/debian/patches/series	2013-10-01 11:43:54 UTC (rev 17290)
@@ -1,2 +1,3 @@
 libgcj_PR31700.diff
 kfreebsd_support.diff
+s390x_support.diff