[packages/libjpeg-turbo] force use of openjdk8 for consistent build deps

atler atler at pld-linux.org
Sun Aug 14 00:29:27 CEST 2022


commit 24713fa91a13300f366a9145cc302648d4a629d2
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Aug 14 00:26:43 2022 +0200

    force use of openjdk8 for consistent build deps
    
    somehow jdk might be satisfied by openjdk8 while jre-X11 by openjdk11

 libjpeg-turbo.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index 64e6370..5a663b7 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -5,6 +5,7 @@
 #
 %define		libjpeg_ver	8c
 %define		libjpeg_ver_lt	9-1
+%define		use_jdk		openjdk8
 Summary:	SIMD accelerated library for manipulating JPEG image files
 Summary(pl.UTF-8):	Biblioteka do obróbki plików obrazów JPEG z akceleracją SIMD
 Name:		libjpeg-turbo
@@ -18,8 +19,8 @@ Source0:	https://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.
 Patch0:		%{name}-x32-java.patch
 URL:		https://libjpeg-turbo.org/
 BuildRequires:	cmake >= 3.9.0
-%{?with_java:BuildRequires:	jdk}
-%{?with_java:BuildRequires:	jre-X11}
+%{?with_java:%buildrequires_jdk}
+%{?with_java:BuildRequires:	openjdk8-jre-base-X11}
 BuildRequires:	libstdc++-devel
 # x86* SIMD code uses NASM; ARM and MIPS use gas, PowerPC uses gcc intrinsics, no SIMD code for other archs
 %ifarch %{ix86} %{x8664}
@@ -174,6 +175,7 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
 %patch0 -p1
 
 %build
+export JAVA_HOME="%{java_home}"
 install -d build
 cd build
 %cmake .. \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libjpeg-turbo.git/commitdiff/c3ecd27bc7f4eb0e51122676c4bb4ad70bfbf877



More information about the pld-cvs-commit mailing list