Correct host-cpu values on PowerPC
Resolves: rhbz#1484366
This commit is contained in:
parent
80f50d08c5
commit
2abf00db24
|
@ -1,16 +1,25 @@
|
||||||
diff -up commons-daemon-1.0.15-src/src/native/unix/configure.secondary commons-daemon-1.0.15-src/src/native/unix/configure
|
--- commons-daemon-1.0.15-src/src/native/unix/configure.secondary 2017-08-23 12:52:35.697817597 +0200
|
||||||
--- commons-daemon-1.0.15-src/src/native/unix/configure.secondary 2013-09-26 14:58:41.000000000 +0200
|
+++ commons-daemon-1.0.15-src/src/native/unix/configure 2017-08-23 12:53:15.313367933 +0200
|
||||||
+++ commons-daemon-1.0.15-src/src/native/unix/configure 2013-09-26 14:58:59.000000000 +0200
|
@@ -2611,8 +2611,16 @@ echo "$as_me: error: Unsupported operati
|
||||||
@@ -2610,7 +2610,7 @@ echo "$as_me: error: Unsupported operati
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
case $host_cpu in
|
case $host_cpu in
|
||||||
- powerpc)
|
powerpc)
|
||||||
+ powerpc*)
|
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||||
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
- HOST_CPU=$host_cpu
|
||||||
HOST_CPU=$host_cpu
|
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\""
|
||||||
|
+ HOST_CPU=ppc
|
||||||
|
+ ;;
|
||||||
|
+ powerpc64)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64\\\""
|
||||||
|
+ HOST_CPU=ppc64
|
||||||
|
+ ;;
|
||||||
|
+ powerpc64le)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64le\\\""
|
||||||
|
+ HOST_CPU=ppc64le
|
||||||
;;
|
;;
|
||||||
@@ -2687,7 +2687,7 @@ echo "$as_me: error: Unsupported operati
|
sparc*)
|
||||||
|
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||||
|
@@ -2687,7 +2695,7 @@ echo "$as_me: error: Unsupported operati
|
||||||
HOST_CPU=ia64
|
HOST_CPU=ia64
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
@ -19,19 +28,28 @@ diff -up commons-daemon-1.0.15-src/src/native/unix/configure.secondary commons-d
|
||||||
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
|
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
|
||||||
supported_os="s390"
|
supported_os="s390"
|
||||||
HOST_CPU=s390
|
HOST_CPU=s390
|
||||||
diff -up commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
|
|
||||||
--- commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary 2013-03-27 09:09:02.000000000 +0100
|
--- commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary 2013-03-27 09:09:02.000000000 +0100
|
||||||
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4 2013-09-26 14:57:54.000000000 +0200
|
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4 2017-08-23 12:53:01.391525956 +0200
|
||||||
@@ -79,7 +79,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
@@ -80,8 +80,16 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
case $host_cpu in
|
case $host_cpu in
|
||||||
- powerpc)
|
powerpc)
|
||||||
+ powerpc*)
|
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||||
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
- HOST_CPU=$host_cpu
|
||||||
HOST_CPU=$host_cpu
|
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\""
|
||||||
|
+ HOST_CPU=ppc
|
||||||
|
+ ;;
|
||||||
|
+ powerpc64)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64\\\""
|
||||||
|
+ HOST_CPU=ppc64
|
||||||
|
+ ;;
|
||||||
|
+ powerpc64le)
|
||||||
|
+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64le\\\""
|
||||||
|
+ HOST_CPU=ppc64le
|
||||||
;;
|
;;
|
||||||
@@ -156,7 +156,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
sparc*)
|
||||||
|
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
|
||||||
|
@@ -156,7 +164,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
|
||||||
HOST_CPU=ia64
|
HOST_CPU=ia64
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.0.15
|
Version: 1.0.15
|
||||||
Release: 15%{?dist}
|
Release: 16%{?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
|
||||||
|
@ -106,6 +106,10 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.15-16
|
||||||
|
- Correct host-cpu values on PowerPC
|
||||||
|
- Resolves: rhbz#1484366
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-15
|
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-15
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue