pool/tanukiwrapper
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 243433 from home:k0da:ppc

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/243433
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tanukiwrapper?expand=0&rev=17
This commit is contained in:
Tomáš Chvátal
2014-08-04 07:45:12 +00:00
committed by Git OBS Bridge
parent ae5f6103ed
commit d18ea15a1f
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tanukiwrapper-ppc64le.patch Normal file
View File

@@ -0,0 +1,38 @@
Index: wrapper_3.2.3_src/build.xml
===================================================================
--- wrapper_3.2.3_src.orig/build.xml
+++ wrapper_3.2.3_src/build.xml
@@ -79,6 +79,7 @@
<equals arg1="${os.arch}" arg2="Power"/>
<equals arg1="${os.arch}" arg2="PowerPC"/>
<equals arg1="${os.arch}" arg2="ppc64"/>
+ <equals arg1="${os.arch}" arg2="ppc64le"/>
</or>
</condition>
<condition property="dist.arch" value="parisc">
Index: wrapper_3.2.3_src/src/bin/sh.script.in
===================================================================
--- wrapper_3.2.3_src.orig/src/bin/sh.script.in
+++ wrapper_3.2.3_src/src/bin/sh.script.in
@@ -168,7 +168,7 @@ case "$DIST_ARCH" in
'ip27')
DIST_ARCH="mips"
;;
- 'power' | 'powerpc' | 'power_pc' | 'ppc64')
+ 'power' | 'powerpc' | 'power_pc' | 'ppc64' | 'ppc64le')
DIST_ARCH="ppc"
;;
'pa_risc' | 'pa-risc')
Index: wrapper_3.2.3_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java
===================================================================
--- wrapper_3.2.3_src.orig/src/java/org/tanukisoftware/wrapper/WrapperManager.java
+++ wrapper_3.2.3_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java
@@ -1069,7 +1069,7 @@ public final class WrapperManager
{
arch = "sparc";
}
- else if ( arch.equals( "power" ) || arch.equals( "powerpc" ) || arch.equals( "ppc64" ) )
+ else if ( arch.equals( "power" ) || arch.equals( "powerpc" ) || arch.startsWith( "ppc64" ) )
{
arch = "ppc";
}

5
tanukiwrapper.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 1 21:44:14 UTC 2014 - dvlaeev@suse.com
- Fix ppc64le build
-------------------------------------------------------------------
Tue Jul 8 10:52:25 UTC 2014 - tchvatal@suse.com

4
tanukiwrapper.spec
View File

@@ -34,6 +34,7 @@ Patch4: %{name}-Makefile-s390-s390x-ppc.patch
# The following patch is only needed for GCJ.
#Patch5: %{name}-nosun-jvm-64.patch
Patch6: %{name}-Makefile-aarch64.patch
Patch7: tanukiwrapper-ppc64le.patch
BuildRequires: ant >= 1.6.1
BuildRequires: ant-junit
BuildRequires: glibc-devel
@@ -98,6 +99,7 @@ common to many Java applications:
%patch3
%patch4
%patch6 -p1
%patch7 -p1
find . -name "*.jar" -exec rm -f {} \;
perl -p -i -e 's/\r//' doc/AUTHORS
perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile*
@@ -112,7 +114,7 @@ perl -p -e \
%build
export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis)
%ifarch x86_64 ia64 ppc64 sparc64 s390x aarch64
%ifarch x86_64 ia64 ppc64 ppc64le sparc64 s390x aarch64
bits=64
%else
bits=32