rpms/apache-commons-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add s390x as known arch

Browse Source
This commit is contained in:
Dan Horák 2012-04-23 12:41:15 +02:00
parent 56d58edb23
commit 38c161e224
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apache-commons-daemon-s390x.patch Normal file
View File

@ -0,0 +1,28 @@
diff -up commons-daemon-1.0.10-src/src/native/unix/configure.s390x commons-daemon-1.0.10-src/src/native/unix/configure
--- commons-daemon-1.0.10-src/src/native/unix/configure.s390x 2012-04-23 11:55:56.000000000 +0200
+++ commons-daemon-1.0.10-src/src/native/unix/configure 2012-04-23 11:57:18.000000000 +0200
@@ -2671,6 +2671,10 @@ echo "$as_me: error: Unsupported operati
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
supported_os="s390"
HOST_CPU=s390;;
+ s390x)
+ CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
+ supported_os="s390x"
+ HOST_CPU=s390x;;
arm*)
CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
supported_os="arm"
diff -up commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4
--- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x 2012-04-23 11:56:04.000000000 +0200
+++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4 2012-04-23 11:56:41.000000000 +0200
@@ -140,6 +140,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
supported_os="s390"
HOST_CPU=s390;;
+ s390x)
+ CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
+ supported_os="s390x"
+ HOST_CPU=s390x;;
arm*)
CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
supported_os="arm"

7
apache-commons-daemon.spec
View File

@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.0.10
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@ -12,6 +12,7 @@ URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: 0001-execve-path-warning.patch
Patch1: apache-commons-daemon-JAVA_OS.patch
Patch2: apache-commons-daemon-s390x.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven
@ -63,6 +64,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1 -b .execve
%patch1 -p1 -b .java_os
%patch2 -p1 -b .s390x
# remove java binaries from sources
rm -rf src/samples/build/
@ -134,6 +136,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
* Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 1.0.10-3
- add s390x as known arch
* Thu Mar 29 2012 Dennis Gilmore <dennis@ausil.us> - 1.0.10-2
- $supported_os and $JAVA_OS in configure do not always match
- on arches that override supported_os to be the arch we can not find headers