Source: openjdk-21
Version: 21~28ea-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

openjdk-21 fails to cross build from source, because the native build
pass misses libffi. I'm attaching a patch for your convenience.

Helmut
diff --minimal -Nru openjdk-21-21~28ea/debian/changelog 
openjdk-21-21~28ea/debian/changelog
--- openjdk-21-21~28ea/debian/changelog 2023-06-26 07:48:49.000000000 +0200
+++ openjdk-21-21~28ea/debian/changelog 2023-06-28 09:55:10.000000000 +0200
@@ -1,3 +1,10 @@
+openjdk-21 (21~28ea-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Add libffi-dev:native to B-D. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Wed, 28 Jun 2023 09:55:10 +0200
+
 openjdk-21 (21~28ea-1) unstable; urgency=medium
 
   * OpenJDK 21 snapshot, Build 28.
diff --minimal -Nru openjdk-21-21~28ea/debian/control 
openjdk-21-21~28ea/debian/control
--- openjdk-21-21~28ea/debian/control   2023-06-16 06:36:19.000000000 +0200
+++ openjdk-21-21~28ea/debian/control   2023-06-28 09:55:08.000000000 +0200
@@ -12,7 +12,7 @@
   g++-12 <!cross>,
   openjdk-20-jdk-headless:native | openjdk-21-jdk-headless:native,
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, 
libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), 
libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, 
libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0, libharfbuzz-dev,
-  libffi-dev,
+  libffi-dev, libffi-dev:native,
   zlib1g-dev:native, zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, 
libgif-dev, 
   libnss3-dev (>= 2:3.17.1),
   openjdk-21-jdk-headless <cross>,
diff --minimal -Nru openjdk-21-21~28ea/debian/rules 
openjdk-21-21~28ea/debian/rules
--- openjdk-21-21~28ea/debian/rules     2023-06-26 07:39:35.000000000 +0200
+++ openjdk-21-21~28ea/debian/rules     2023-06-28 09:54:58.000000000 +0200
@@ -676,10 +676,11 @@
 
 pkg_ffidev = libffi-dev
 
-bd_zero = \
-       $(pkg_ffidev) [$(foreach a,$(hotspot_archs),!$(a))],
-bd_zero = \
-       $(pkg_ffidev),
+ifneq (,$(filter $(distrel),precise))
+  bd_zero = $(pkg_ffidev), $(pkg_ffidev):native,
+else
+  bd_zero = $(pkg_ffidev),
+endif
 
 bd_ant = ant, ant-optional,
 

Reply via email to