From fd778bba4698721716fcc764a927e0093cf40a21 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 19 Sep 2017 20:01:34 +0000 Subject: [PATCH] Fix PowerPC 32-bit RPM build --- configure.ac | 4 ++++ release/libjpeg-turbo.spec.in | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3b0151c07..92a65ffc7 100644 --- a/configure.ac +++ b/configure.ac @@ -565,6 +565,10 @@ case "$host_cpu" in RPMARCH=`uname -m` DEBARCH=ppc64el ;; + powerpc) + RPMARCH=ppc + DEBARCH=ppc + ;; *) RPMARCH=`uname -m` DEBARCH=$RPMARCH diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in index 8ba87c7d9..e4e4b9c02 100644 --- a/release/libjpeg-turbo.spec.in +++ b/release/libjpeg-turbo.spec.in @@ -13,7 +13,18 @@ # Path under which headers should be installed %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 %else %if "%{_prefix}" == "/opt/libjpeg-turbo" @@ -35,7 +46,7 @@ Release: @BUILD@ License: BSD-style BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release} Prereq: /sbin/ldconfig -%ifarch x86_64 +%if "%{_bits}" == "64" Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so()(64bit) %else Provides: %{name} = %{version}-%{release}, @PACKAGE_NAME@ = %{version}-%{release}, libturbojpeg.so