rpms/gluegen/F-11 build-ppc.patch, NONE, 1.1 gluegen.spec, 1.1, 1.2 import.log, 1.1, 1.2
Henrique Junior
lspooky at fedoraproject.org
Sat May 1 02:22:30 UTC 2010
Author: lspooky
Update of /cvs/pkgs/rpms/gluegen/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11525/F-11
Modified Files:
gluegen.spec import.log
Added Files:
build-ppc.patch
Log Message:
This is the first package, but it already fixes the ppc build error
build-ppc.patch:
make/build.xml | 8 +++++++-
make/gluegen-cpptasks.xml | 20 +++++++++++++++++++-
src/java/com/sun/gluegen/StructLayout.java | 2 ++
3 files changed, 28 insertions(+), 2 deletions(-)
--- NEW FILE build-ppc.patch ---
--- gluegen/make/build.xml 2008-03-09 18:42:07.000000000 +0100
+++ gluegen/make/build.xml 2008-03-09 18:43:53.000000000 +0100
@@ -217,8 +217,14 @@
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
<property name="linker.cfg.id" value="linker.cfg.linux" />
</target>
+
+ <target name="declare.linux.ppc" if="isLinuxPPC">
+ <echo message="Linux.ppc" />
+ <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" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.ppc" if="isLinux" >
<property name="c.src.dir" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
--- gluegen/make/gluegen-cpptasks.xml 2008-03-09 18:42:07.000000000 +0100
+++ gluegen/make/gluegen-cpptasks.xml 2008-03-09 18:47:17.000000000 +0100
@@ -36,6 +36,7 @@
- isLinuxAMD64
- isLinuxIA64
- isLinuxX86
+ - isLinuxPPC
- isOSX
- isOSXPPC
- isOSXUniversal (if macosxfat=true)
@@ -185,6 +186,18 @@
<os arch="IA64" />
</and>
</condition>
+ <condition property="isLinuxPPC">
+ <and>
+ <istrue value="${isLinux}" />
+ <or>
+ <equals arg1="${os.arch}" arg2="ppc"/>
+ <equals arg1="${os.arch}" arg2="power"/>
+ <equals arg1="${os.arch}" arg2="Power"/>
+ <equals arg1="${os.arch}" arg2="PowerPC"/>
+ <equals arg1="${os.arch}" arg2="ppc64"/>
+ </or>
+ </and>
+ </condition>
<condition property="isIA64">
<os arch="IA64" />
</condition>
@@ -241,6 +254,7 @@
<echo message="LinuxAMD64=${isLinuxAMD64}" />
<echo message="LinuxIA64=${isLinuxIA64}" />
<echo message="LinuxX86=${isLinuxX86}" />
+ <echo message="LinuxPPC=${isLinuxPPC}" />
<echo message="OS X=${isOSX}" />
<echo message="Solaris=${isSolaris}" />
<echo message="Solaris32Bit=${isSolaris32Bit}" />
@@ -273,7 +287,11 @@
<property name="os.and.arch" value="linux-i586" />
</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" unless="gluegen.cpptasks.detected.os" />
+ <target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os" if="isLinuxPPC">
+ <property name="os.and.arch" value="linux-ppc" />
+ </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" 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" />
diff -u -r gluegen/src/java/com/sun/gluegen/StructLayout.java gluegen/src/java/com/sun/gluegen/StructLayout.java
--- gluegen/src/java/com/sun/gluegen/StructLayout.java 2008-03-09 18:42:07.000000000 +0100
+++ gluegen/src/java/com/sun/gluegen/StructLayout.java 2008-03-09 19:06:59.000000000 +0100
@@ -132,6 +132,8 @@
(os.startsWith("linux") && cpu.equals("amd64")) ||
(os.startsWith("linux") && cpu.equals("x86_64")) ||
(os.startsWith("linux") && cpu.equals("ia64")) ||
+ (os.startsWith("linux") && cpu.equals("ppc")) ||
+ (os.startsWith("linux") && cpu.equals("ppc64")) ||
(os.startsWith("sunos") && cpu.equals("sparc")) ||
(os.startsWith("sunos") && cpu.equals("sparcv9")) ||
(os.startsWith("sunos") && cpu.equals("x86")) ||
Index: gluegen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gluegen/F-11/gluegen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gluegen.spec 29 Apr 2010 02:30:46 -0000 1.1
+++ gluegen.spec 1 May 2010 02:22:29 -0000 1.2
@@ -1,6 +1,6 @@
Name: gluegen
Version: 1
-Release: 0.20102502svn9%{?dist}
+Release: 0.20102502svn10%{?dist}
Summary: Java/JNI glue code generator to call out to ANSI C
Group: Development/Libraries
@@ -18,6 +18,7 @@ Source0: gluegen-1.0.20102502svn.tar.gz
Patch0: antlr-properties.patch
Patch1: no-solaris.patch
Patch2: debug-on.patch
+Patch3: build-ppc.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant-antlr
@@ -58,6 +59,7 @@ GlueGen's user manual
%patch0 -p1 -b .antlr-properties.patch
%patch1 -p1 -b .no-solaris.patch
%patch2 -p1 -b .debug-on.patch
+%patch3 -p1 -b .build-ppc.patch
#Remove bundled .jar
@@ -135,8 +137,8 @@ ant \
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_javadir}/%{name}
-install -D build/gluegen.jar %{buildroot}%{_javadir}/%{name}/gluegen-%{version}.jar
-install -D build/gluegen-rt.jar %{buildroot}%{_javadir}/%{name}/gluegen-rt-%{version}.jar
+install -D build/gluegen.jar %{buildroot}%{_libdir}/%{name}/gluegen-%{version}.jar
+install -D build/gluegen-rt.jar %{buildroot}%{_libdir}/%{name}/gluegen-rt-%{version}.jar
install -D build/obj/libgluegen-rt.so %{buildroot}%{_libdir}/java/libgluegen-rt.so
# Make the source package. This package is essencial to build JOGL
@@ -157,7 +159,8 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc LICENSE.txt
-%{_javadir}/%{name}/*.jar
+#%{_javadir}/%{name}/*.jar
+%{_libdir}/%{name}/*.jar
%{_libdir}/java/libgluegen-rt.so
%files source
@@ -170,6 +173,9 @@ rm -rf %{buildroot}
%{_docdir}/%{name}/*
%changelog
+* Thu Apr 23 2010 Henrique Junior <lspooky at fedoraproject.org> - 1-0.20102502svn10
+- Fixing PPC build error
+
* Fri Apr 23 2010 Henrique Junior <lspooky at fedoraproject.org> - 1-0.20102502svn9
- Removing dynamic-linker.h to avoid AT&T license
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gluegen/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 29 Apr 2010 02:30:46 -0000 1.1
+++ import.log 1 May 2010 02:22:29 -0000 1.2
@@ -1 +1,2 @@
gluegen-1-0_20102502svn9_fc12:F-11:gluegen-1-0.20102502svn9.fc12.src.rpm:1272583654
+gluegen-1-0_20102502svn10_fc12:F-11:gluegen-1-0.20102502svn10.fc12.src.rpm:1272766778
More information about the scm-commits
mailing list