Attachment 875978 Details for Bug 1077783 – ppc64le support

[patch] ppc64le support

0001-Adding-ppc64le-support-for-rhbx-077783.patch (text/plain), 4.84 KB, created by Brent Baude on 2014-03-18 15:04:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Baude

Created: 2014-03-18 15:04:47 UTC

Size: 4.84 KB

patch

obsolete

>From 2382b5ce09bdce8e29a60654fe77578e8848a8c2 Mon Sep 17 00:00:00 2001
>From: Brent Baude <baude@us.ibm.com>
>Date: Tue, 18 Mar 2014 09:59:43 -0500
>Subject: [PATCH] Adding ppc64le support for rhbx#077783
>
>---
> java-service-wrapper.spec | 11 +++++---
> ppc64le-support.patch     | 68 +++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 76 insertions(+), 3 deletions(-)
> create mode 100644 ppc64le-support.patch
>
>diff --git a/java-service-wrapper.spec b/java-service-wrapper.spec
>index 82d7659..612290a 100644
>--- a/java-service-wrapper.spec
>+++ b/java-service-wrapper.spec
>@@ -4,7 +4,7 @@
> 
> # rpmbuild < 4.6 support
> %if ! 0%{?__isa_bits}
>-%ifarch x86_64 ia64 ppc64 sparc64 s390x alpha
>+%ifarch x86_64 ia64 ppc64 sparc64 s390x alpha ppc64le
> %global __isa_bits 64
> %else
> %global __isa_bits 32
>@@ -21,7 +21,7 @@
> 
> Name:           java-service-wrapper
> Version:        3.2.5
>-Release:        15%{?dist}
>+Release:        16%{?dist}
> Summary:        Java service wrapper
> License:        MIT
> URL:            https://bitbucket.org/ivertex/yaja-wrapper
>@@ -41,7 +41,7 @@ Patch2:         %{name}-3.2.4-docbuild.patch
> # Use strcpy instead sprintf to copy C string
> # Forwarded upstream: https://bitbucket.org/ivertex/yaja-wrapper/issue/6
> Patch3:         %{name}-3.2.5-rhbz1037144.patch
>-
>+Patch99:	ppc64le-support.patch
> BuildRequires:  ant
> BuildRequires:  java-devel
> BuildRequires:  jpackage-utils
>@@ -66,6 +66,7 @@ install -pm 644 %{SOURCE1} doc/template.init
> sed -e 's|@LIBPATH@|%{_libdir}/%{name}|' %{PATCH1} | %{__patch} -p1 -F 0
> %patch2 -p0
> %patch3
>+%patch99 -p1
> %if %{with docs}
> mkdir tools ; cd tools
> %{__tar} xf %{SOURCE3}
>@@ -111,6 +112,10 @@ cp -pR javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %doc doc/license.txt
> 
> %changelog
>+* Tue Mar 18 2014 Brent Baude <baude@us.ibm.com> - 3.2.5-16
>+- Add ppc64le support
>+- Resolves: rhbz#1077783
>+
> * Fri Mar  7 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.5-15
> - Use strcpy instead sprintf to copy C string
> - Resolves: rhbz#1037144
>diff --git a/ppc64le-support.patch b/ppc64le-support.patch
>new file mode 100644
>index 0000000..7006b2f
>--- /dev/null
>+++ b/ppc64le-support.patch
>@@ -0,0 +1,68 @@
>+diff -Naur ivertex-yaja-wrapper-3290d306074a.orig/src/c/Makefile-linux-ppc64le-64.make ivertex-yaja-wrapper-3290d306074a/src/c/Makefile-linux-ppc64le-64.make
>+--- ivertex-yaja-wrapper-3290d306074a.orig/src/c/Makefile-linux-ppc64le-64.make	1969-12-31 18:00:00.000000000 -0600
>++++ ivertex-yaja-wrapper-3290d306074a/src/c/Makefile-linux-ppc64le-64.make	2014-03-17 16:35:25.920002695 -0500
>+@@ -0,0 +1,64 @@
>++# Copyright (c) 1999, 2007 Tanuki Software Inc.
>++# 
>++# Permission is hereby granted, free of charge, to any person
>++# obtaining a copy of the Java Service Wrapper and associated
>++# documentation files (the "Software"), to deal in the Software
>++# without  restriction, including without limitation the rights
>++# to use, copy, modify, merge, publish, distribute, sub-license,
>++# and/or sell copies of the Software, and to permit persons to
>++# whom the Software is furnished to do so, subject to the
>++# following conditions:
>++# 
>++# The above copyright notice and this permission notice shall be
>++# included in all copies or substantial portions of the Software.
>++# 
>++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
>++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
>++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
>++# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
>++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
>++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
>++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>++# OTHER DEALINGS IN THE SOFTWARE.
>++
>++# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
>++# If you know how to fix it then please help out.
>++COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC --pedantic
>++
>++INCLUDE=$(JAVA_HOME)/include
>++
>++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
>++
>++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
>++
>++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
>++
>++BIN = ../../bin
>++LIB = ../../lib
>++
>++all: init wrapper libwrapper.so
>++
>++clean:
>++	rm -f *.o
>++
>++cleanall: clean
>++	rm -rf *~ .deps
>++	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
>++
>++init:
>++	if test ! -d .deps; then mkdir .deps; fi
>++
>++wrapper: $(wrapper_SOURCE)
>++	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
>++
>++libwrapper.so: $(libwrapper_so_OBJECTS)
>++	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
>++
>++%.o: %.c
>++	@echo '$(COMPILE) -c $<'; \
>++	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
>++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
>++	tr ' ' '\012' < .deps/$(*F).pp \
>++	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>++	>> .deps/$(*F).P; \
>++	rm .deps/$(*F).pp
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1077783: 875978