[gluegen] Fix FTBFS on ARM.

[Jon Ciesla]

commit ddbedeb09cb61c5ddbbbad02104172c2d2b0b357
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Aug 27 21:12:43 2012 -0500

    Fix FTBFS on ARM.

 gluegen-1.0-armv6l.patch |   74 ++++++++++++++++++++++++++++++++++++++++++++++
 gluegen.spec             |    7 ++++-
 2 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/gluegen-1.0-armv6l.patch b/gluegen-1.0-armv6l.patch
new file mode 100644
index 0000000..26609f0
--- /dev/null
+++ b/gluegen-1.0-armv6l.patch
@@ -0,0 +1,74 @@
+--- make/build.xml~	2012-08-27 19:57:36.000000000 -0500
++++ make/build.xml	2012-08-27 20:11:51.800000001 -0500
+@@ -254,7 +254,14 @@
+       <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+     </target>
+ 
+-    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.ppc,declare.linux.s390" if="isLinux" >
++    <target name="declare.linux.arm" if="isLinuxARM">
++      <echo message="Linux.arm" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
++      <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
++    </target>
++
++    <target name="declare.linux"
++    depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.ppc,declare.linux.s390,declare.linux.arm" if="isLinux" >
+       <property name="c.src.dir"                            value="unix" />
+       <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
+     </target>
+--- make/gluegen-cpptasks.xml.orig	2012-08-27 20:22:26.860000001 -0500
++++ make/gluegen-cpptasks.xml	2012-08-27 20:26:56.320000001 -0500
+@@ -38,6 +38,7 @@
+    -   isLinuxX86
+    -   isLinuxPPC
+    -   isLinuxS390
++   -   isLinuxARM
+    -   isOSX
+    -   isOSXPPC
+    -   isOSXUniversal (if macosxfat=true)
+@@ -208,6 +209,14 @@
+             </or>
+       </and>
+     </condition>
++    <condition property="isLinuxARM">
++      <and>
++        <istrue value="${isLinux}" />
++            <or>
++                <equals arg1="${os.arch}" arg2="arm"/>
++            </or>
++      </and>
++    </condition>
+     <condition property="isIA64">
+       <os arch="IA64" />
+     </condition>
+@@ -266,6 +275,7 @@
+     <echo message="LinuxX86=${isLinuxX86}" />
+     <echo message="LinuxPPC=${isLinuxPPC}" />
+     <echo message="LinuxS390=${isLinuxS390}" />
++    <echo message="LinuxARMV6L=${isLinuxARM}" />
+     <echo message="OS X=${isOSX}" />
+     <echo message="Solaris=${isSolaris}" />
+     <echo message="Solaris32Bit=${isSolaris32Bit}" />
+@@ -306,7 +316,11 @@
+     <property name="os.and.arch" value="linux-s390" />
+   </target>
+ 
+-  <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.ppc,gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os" />
++  <target name="gluegen.cpptasks.detect.os.linux.arm" unless="gluegen.cpptasks.detected.os" if="isLinuxARM">
++    <property name="os.and.arch" value="linux-arm" />
++  </target>
++
++  <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.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.arm" unless="gluegen.cpptasks.detected.os" />
+ 
+   <target name="gluegen.cpptasks.detect.os.osx.ppc" unless="gluegen.cpptasks.detected.os" if="isOSXPPC">
+     <property name="os.and.arch" value="macosx-ppc" />
+--- src/java/com/sun/gluegen/StructLayout.java~	2012-08-27 20:14:04.000000000 -0500
++++ src/java/com/sun/gluegen/StructLayout.java	2012-08-27 20:28:47.600000001 -0500
+@@ -136,6 +136,7 @@
+                (os.startsWith("linux") && cpu.equals("ppc64")) ||
+                (os.startsWith("linux") && cpu.equals("s390")) ||
+                (os.startsWith("linux") && cpu.equals("s390x")) ||
++               (os.startsWith("linux") && cpu.equals("arm")) ||
+                (os.startsWith("sunos") && cpu.equals("sparc")) ||
+                (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
+                (os.startsWith("sunos") && cpu.equals("x86")) ||
diff --git a/gluegen.spec b/gluegen.spec
index 0bfa59c..135c3cc 100644
--- a/gluegen.spec
+++ b/gluegen.spec
@@ -1,6 +1,6 @@
 Name:		gluegen
 Version:	1
-Release:	0.20102505svn14%{?dist}
+Release:	0.20102505svn15%{?dist}
 Summary:	Java/JNI glue code generator to call out to ANSI C
 
 Group:		Development/Libraries
@@ -21,6 +21,7 @@ Patch2:		debug-on.patch
 Patch3:		build-ppc.patch
 Patch4:     fix-antlr-classpath.patch
 Patch5:		build-s390.patch
+Patch6:		gluegen-1.0-armv6l.patch
 
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	ant-antlr
@@ -64,6 +65,7 @@ GlueGen's user manual
 %patch3 -p1 -b .build-ppc.patch
 %patch4 -b .fix-antlr-classpath.patch
 %patch5 -p1 -b .build-s390.patch
+%patch6 -p0 -b .arm
 
 
 #Remove bundled .jar
@@ -177,6 +179,9 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}/*
 
 %changelog
+* Mon Sep 17 2012 Jon Ciesla <limburgher at gmail.com> - 1-0.20102505svn15
+- Fix FTBFS on ARM.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1-0.20102505svn14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild