ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PowerPC 32-bit RPM build

Browse Source
This commit is contained in:
DRC
2017-09-19 20:01:34 +00:00
parent 8d403aeb6a
commit fd778bba46
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -565,6 +565,10 @@ case "$host_cpu" in
RPMARCH=`uname -m` RPMARCH=`uname -m`
DEBARCH=ppc64el DEBARCH=ppc64el
;; ;;
powerpc)
RPMARCH=ppc
DEBARCH=ppc
;;
*) *)
RPMARCH=`uname -m` RPMARCH=`uname -m`
DEBARCH=$RPMARCH DEBARCH=$RPMARCH

15
release/libjpeg-turbo.spec.in
View File

@@ -13,7 +13,18 @@
# Path under which headers should be installed # Path under which headers should be installed
%define _includedir %{__includedir} %define _includedir %{__includedir}
%ifarch x86_64 %if "%{?__isa_bits:1}" == "1"
%define _bits %{__isa_bits}
%else
# RPM < 4.6
%if "%{_lib}" == "lib64"
%define _bits 64
%else
%define _bits 32
%endif
%endif
%if "%{_bits}" == "64"
%define _libdir %{_exec_prefix}/lib64 %define _libdir %{_exec_prefix}/lib64
%else %else
%if "%{_prefix}" == "/opt/libjpeg-turbo" %if "%{_prefix}" == "/opt/libjpeg-turbo"
@@ -35,7 +46,7 @@ Release: @BUILD@
License: BSD-style License: BSD-style
BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release} BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release}
Prereq: /sbin/ldconfig Prereq: /sbin/ldconfig
%ifarch x86_64 %if "%{_bits}" == "64"
Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so()(64bit) Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so()(64bit)
%else %else
Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so