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

Fix 32-bit RPM build w/ newer RHEL/Fedora releases

Browse Source 
The version of RPM on RHEL 5 and older platforms defines _libdir
as %{_exec_prefix}/%{_lib}, so defining _lib in the spec file redefined
_libdir.  However, newer versions of RPM (probably >= 4.6, since that
was the version that introduced the ISA macros) define _libdir as either
%{_prefix}/lib or %{_prefix}/lib64.  Thus, we need to explicitly
override _libdir in our spec file.
This commit is contained in:
DRC
2017-09-19 13:03:49 -05:00
parent 01b74c101e
commit 8d403aeb6a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,11 @@
# Path under which headers should be installed # Path under which headers should be installed
%define _includedir %{__includedir} %define _includedir %{__includedir}
# _libdir is set to %{_prefix}/%{_lib} by default
%ifarch x86_64 %ifarch x86_64
%define _lib lib64 %define _libdir %{_exec_prefix}/lib64
%else %else
%if "%{_prefix}" == "/opt/libjpeg-turbo" %if "%{_prefix}" == "/opt/libjpeg-turbo"
%define _lib lib32 %define _libdir %{_exec_prefix}/lib32
%endif %endif
%endif %endif
@@ -87,7 +86,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
LJT_LIBDIR=%{__libdir} LJT_LIBDIR=%{__libdir}
if [ ! "$LJT_LIBDIR" = "%{_libdir}" ]; then if [ ! "$LJT_LIBDIR" = "%{_libdir}" ]; then
echo ERROR: libjpeg-turbo must be configured with libdir=%{_prefix}/%{_lib} when generating an in-tree RPM for this architecture. echo ERROR: libjpeg-turbo must be configured with libdir=%{_libdir} when generating an in-tree RPM for this architecture.
exit 1 exit 1
fi fi