Enabled php bindings on ppc

This commit is contained in:
Jaroslav Škarvada 2014-08-12 09:56:00 +02:00
parent 85ee154a84
commit ebe5094eb5
2 changed files with 18 additions and 6 deletions

View File

@ -0,0 +1,11 @@
--- a/php4/ltconfig 2014-08-11 13:01:13.020065855 +0000
+++ a/php4/ltconfig 2014-08-11 13:01:23.870060274 +0000
@@ -1939,7 +1939,7 @@
else
# Only the GNU ld.so supports shared libraries on MkLinux.
case "$host_cpu" in
- powerpc*) dynamic_linker=no ;;
+# powerpc*) dynamic_linker=no ;;
*) dynamic_linker='Linux ld.so' ;;
esac
fi

View File

@ -17,7 +17,7 @@
Summary: Round Robin Database Tool to store and display time-series data Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool Name: rrdtool
Version: 1.4.8 Version: 1.4.8
Release: 15%{?dist} Release: 16%{?dist}
License: GPLv2+ with exceptions License: GPLv2+ with exceptions
Group: Applications/Databases Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/ URL: http://oss.oetiker.ch/rrdtool/
@ -33,6 +33,8 @@ Patch5: rrdtool-1.4.7-lua-5.2.patch
Patch6: rrdtool-1.4.8-imginfo-check.patch Patch6: rrdtool-1.4.8-imginfo-check.patch
# patch sent upstream # patch sent upstream
Patch7: rrdtool-1.4.8-doc-fix.patch Patch7: rrdtool-1.4.8-doc-fix.patch
# enable php bindings on ppc
Patch8: rrdtool-1.4.8-php-ppc-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dejavu-sans-mono-fonts Requires: dejavu-sans-mono-fonts
@ -101,11 +103,6 @@ Provides: python-%{name} = %{version}-%{release}
Python RRDtool bindings. Python RRDtool bindings.
%endif %endif
%ifarch %{power64}
# php bits busted on ppc64 at the moment
%define with_php 0
%endif
%if %{with_php} %if %{with_php}
%package php %package php
Summary: PHP RRDtool bindings Summary: PHP RRDtool bindings
@ -182,6 +179,7 @@ The %{name}-lua package includes RRDtool bindings for Lua.
%patch5 -p1 -b .lua-52 %patch5 -p1 -b .lua-52
%patch6 -p1 -b .imginfo-check %patch6 -p1 -b .imginfo-check
%patch7 -p1 -b .doc-fix %patch7 -p1 -b .doc-fix
%patch8 -p1 -b .php-ppc-fix
# Fix to find correct python dir on lib64 # Fix to find correct python dir on lib64
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \ %{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
@ -395,6 +393,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%endif %endif
%changelog %changelog
* Tue Aug 12 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-16
- Enabled php bindings on ppc
* Fri Aug 8 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-15 * Fri Aug 8 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-15
- Fixed conditionalized patch to be according to Packaging guidelines - Fixed conditionalized patch to be according to Packaging guidelines