Add AArch64 support from upstream.
Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com> Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This commit is contained in:
parent
3331571519
commit
e7aca3fb0b
|
@ -0,0 +1,43 @@
|
||||||
|
backport from http://svn.apache.org/viewvc?view=revision&revision=1533345
|
||||||
|
|
||||||
|
https://issues.apache.org/jira/browse/DAEMON-308
|
||||||
|
|
||||||
|
---
|
||||||
|
src/native/unix/configure | 4 ++++
|
||||||
|
src/native/unix/support/apsupport.m4 | 4 ++++
|
||||||
|
2 files changed, 8 insertions(+)
|
||||||
|
|
||||||
|
--- commons-daemon-1.0.15-src.orig/src/native/unix/configure
|
||||||
|
+++ commons-daemon-1.0.15-src/src/native/unix/configure
|
||||||
|
@@ -2695,10 +2695,14 @@ echo "$as_me: error: Unsupported operati
|
||||||
|
arm*)
|
||||||
|
CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
|
||||||
|
supported_os="arm"
|
||||||
|
HOST_CPU=arm
|
||||||
|
;;
|
||||||
|
+ aarch64*)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
|
||||||
|
+ supported_os="aarch64"
|
||||||
|
+ HOST_CPU=aarch64;;
|
||||||
|
*)
|
||||||
|
echo "$as_me:$LINENO: result: failed" >&5
|
||||||
|
echo "${ECHO_T}failed" >&6
|
||||||
|
{ { echo "$as_me:$LINENO: error: Unsupported CPU architecture \"$host_cpu\"" >&5
|
||||||
|
echo "$as_me: error: Unsupported CPU architecture \"$host_cpu\"" >&2;}
|
||||||
|
--- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
|
||||||
|
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
|
||||||
|
@@ -164,10 +164,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
||||||
|
arm*)
|
||||||
|
CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
|
||||||
|
supported_os="arm"
|
||||||
|
HOST_CPU=arm
|
||||||
|
;;
|
||||||
|
+ aarch64*)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
|
||||||
|
+ supported_os="aarch64"
|
||||||
|
+ HOST_CPU=aarch64;;
|
||||||
|
*)
|
||||||
|
AC_MSG_RESULT([failed])
|
||||||
|
AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
|
||||||
|
esac
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.0.15
|
Version: 1.0.15
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Defines API to support an alternative invocation mechanism
|
Summary: Defines API to support an alternative invocation mechanism
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
|
@ -13,6 +13,9 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{sho
|
||||||
Patch1: apache-commons-daemon-JAVA_OS.patch
|
Patch1: apache-commons-daemon-JAVA_OS.patch
|
||||||
# backport from https://fisheye6.atlassian.com/changelog/commons?cs=1458896
|
# backport from https://fisheye6.atlassian.com/changelog/commons?cs=1458896
|
||||||
Patch2: apache-commons-daemon-secondary.patch
|
Patch2: apache-commons-daemon-secondary.patch
|
||||||
|
# backport from http://svn.apache.org/viewvc?view=revision&revision=1533345
|
||||||
|
# https://issues.apache.org/jira/browse/DAEMON-308
|
||||||
|
Patch3: apache-commons-daemon-aarch64.patch
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: java-devel >= 1:1.6.0
|
BuildRequires: java-devel >= 1:1.6.0
|
||||||
BuildRequires: jpackage-utils
|
BuildRequires: jpackage-utils
|
||||||
|
@ -61,6 +64,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1
|
||||||
%setup -q -n %{short_name}-%{version}-src
|
%setup -q -n %{short_name}-%{version}-src
|
||||||
%patch1 -p1 -b .java_os
|
%patch1 -p1 -b .java_os
|
||||||
%patch2 -p1 -b .secondary
|
%patch2 -p1 -b .secondary
|
||||||
|
%patch3 -p1 -b .aarch64
|
||||||
|
|
||||||
# remove java binaries from sources
|
# remove java binaries from sources
|
||||||
rm -rf src/samples/build/
|
rm -rf src/samples/build/
|
||||||
|
@ -110,6 +114,9 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 25 2013 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.15-5
|
||||||
|
- Add AArch64 support from upstream - Resolves: rhbz #1034162
|
||||||
|
|
||||||
* Thu Sep 26 2013 Dan Horák <dan[at]danny.cz> - 1.0.15-4
|
* Thu Sep 26 2013 Dan Horák <dan[at]danny.cz> - 1.0.15-4
|
||||||
- add back support for secondary arches (s390x, ppc64)
|
- add back support for secondary arches (s390x, ppc64)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue