From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86D47CEB2DA for ; Sat, 15 Nov 2025 15:40:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 36CA240FE5; Sat, 15 Nov 2025 15:40:40 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DZAfUcltKFxq; Sat, 15 Nov 2025 15:40:38 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B15B240FE6 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id B15B240FE6; Sat, 15 Nov 2025 15:40:38 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id B5C7A158 for ; Sat, 15 Nov 2025 15:40:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9212D40FE6 for ; Sat, 15 Nov 2025 15:40:37 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id N1mUnN5CgwBN for ; Sat, 15 Nov 2025 15:40:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.221.47; helo=mail-wr1-f47.google.com; envelope-from=thomas.devoogdt@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CD82C40FE5 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CD82C40FE5 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by smtp4.osuosl.org (Postfix) with ESMTPS id CD82C40FE5 for ; Sat, 15 Nov 2025 15:40:35 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-42bb288c1bfso543820f8f.2 for ; Sat, 15 Nov 2025 07:40:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763221234; x=1763826034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=u+QuJnOuZTo4vQbomo67vEmvfGiqAdLn+NGEA+75vno=; b=MO2Xrud4PCcV3fd538nOE/zvK7/jKNwHQFvdzSUuy4sTYjaG961uDp/gt3uoAMJvca WbSqsK/r2DGOLVYPSOGKiVXuUxmiLfNYUPQwZBY9kD6NOdummBShyxxV0Zr7zXsIeFs9 zE83Oq6VAf+CTTd6NHjAstde7w+JqCpBZ08gli+hi5wbiJEo2EPZX71jPjG/BaltuBal RBG6/r2FytxWDnmuv5PWVnEVg99C/vhhnpMhOfHfEv2sns26V8X8c3a8tx6YRUheh26t icI1NfZ+TgNmo4sKuR63hS+vhgDl5kr+/OcoS0FuMTaEyCADMucX9h+ZlOOM+P9krIjt zzXw== X-Gm-Message-State: AOJu0YwlHtjZXRZW5txXFYcCb48xcWnu5+R6b8ZGndl9fedOnqnwl0SH QcOENy/yqMTFa1l+MSHaR3vUSDrzcEMfXTP65RJC8/hPcSwEy+WlkCjb X-Gm-Gg: ASbGnct+vjzR9Eup04+L7y4mpVtnTwMVY8/NHrnQypRifprwITFZsrEftSDXAyjAGoa ue6N52aSosKPzvRqTYMKRCODac0vhYr5Mni58YO44mEs6adWVWnx9JmLr8XFoj+Xh9F34LO9Ksa lzx2bI0QPR6xrSajLftkIYfVBey2yikiPGiI3qWQEzyPqtyFpRowWRfBQZy6WYogC/qfeK9wP6G VGeO4JSxxnWN/ADnw8S5b68KVoP1LivieMGqQApPzuzEGdQuskhe/aGCve/4mpjixcYk+/DX/8n OqKQim0c91cLkVxg+KUnQwGocxX6vuGuBvp2fvvDCJOlcuepf6lGm9ltMseIno7vPEUFOwNwQUk x8bBQV54W+KRFnS+DaJQ8l7WhqbLSii0lA7nkOfperk3eTXCIKEL6t3s4N37NJDPnXTVt7NVjTM a0Bs/xpuShtD7SPTecgHWWXIyWMr8n3WaGl1fHCA== X-Google-Smtp-Source: AGHT+IE0l5Ue0NrNK58lMJjGf+/hF2JDV+tY2f83wEKBvjaMzI3Q4pJvim0XdD99AVyUJqhzpCCs/w== X-Received: by 2002:a05:6000:2509:b0:429:bca4:6b3c with SMTP id ffacd0b85a97d-42b59345769mr5323738f8f.9.1763221233446; Sat, 15 Nov 2025 07:40:33 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:eb6f:7900:c7f8:99c7:69e0:edb4]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42b53dea1c9sm16814039f8f.0.2025.11.15.07.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Nov 2025 07:40:33 -0800 (PST) From: Thomas Devoogdt To: thomas@devoogdt.com Cc: buildroot@buildroot.org, buildroot@tudorholton.com, thomas.devoogdt@barco.com Date: Sat, 15 Nov 2025 16:40:30 +0100 Message-ID: <20251115154030.1746780-1-thomas@devoogdt.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251115135734.1532379-1-thomas@devoogdt.com> References: <20251115135734.1532379-1-thomas@devoogdt.com> MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=devoogdt.com Subject: [Buildroot] [PATCH v3] package/openjdk: allow compiling without X11 support X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Devoogdt Added patches (17.0.12+7 and 21.0.4+7) to allow compilation without X11 support. 0003-autoconf-libraries-drop-the-need-for-X11-in-headless.patch is only needed for 21.0.4+7, 17.0.12+7 has already this commit: https://github.com/openjdk/jdk17u/commit/f97ec359ec688346956c29002edb28703d3ba032 Next to that, add a new option BR2_PACKAGE_OPENJDK_X11, to allow compilation with both head and headless support. This commit also fixes the wrong patch folders which should have been fixed in commit 475c79d "package/openjdk{-bin}: bump versions to 17.0.12+7 and 21.0.4+7" Signed-off-by: Thomas Devoogdt --- v3: Changed BR2_PACKAGE_OPENJDK_HEADLESS to BR2_PACKAGE_OPENJDK_X11, to avoid any negation in the options. By this a better comment is possible. --- ...ARCv2-ISA-processors-support-to-Zero.patch | 18 ++-- ...fix-HEADLESS-compilation-without-X11.patch | 83 +++++++++++++++++++ ...ARCv2-ISA-processors-support-to-Zero.patch | 20 ++--- ...fix-HEADLESS-compilation-without-X11.patch | 83 +++++++++++++++++++ ...es-drop-the-need-for-X11-in-headless.patch | 35 ++++++++ package/openjdk/Config.in | 22 ++--- package/openjdk/openjdk.mk | 14 ++-- 7 files changed, 238 insertions(+), 37 deletions(-) rename package/openjdk/{17.0.9+9 => 17.0.12+7}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (87%) create mode 100644 package/openjdk/17.0.12+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch rename package/openjdk/{21.0.1+12 => 21.0.4+7}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (88%) create mode 100644 package/openjdk/21.0.4+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch create mode 100644 package/openjdk/21.0.4+7/0003-autoconf-libraries-drop-the-need-for-X11-in-headless.patch diff --git a/package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.12+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 87% rename from package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.12+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index afec2772c0..c4dda78fde 100644 --- a/package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.12+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -1,4 +1,4 @@ -From 9a3c2a0714420186ae8d5159d5416c6fa2009ad9 Mon Sep 17 00:00:00 2001 +From edf96f51d2c6d6e7a7762a879b916a5e58d8c23c Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Mon, 18 Oct 2021 05:20:05 -0700 Subject: [PATCH] Add ARCv2 ISA processors support to Zero @@ -20,11 +20,11 @@ Signed-off-by: Alexey Brodkin 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 -index 5120918aed2..f7a99955874 100644 +index 865feea36d9..30c224e4a99 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -152,6 +152,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -39,7 +39,7 @@ index 5120918aed2..f7a99955874 100644 if test "x$OPENJDK_TARGET_OS" = xaix; then BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat" diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 -index c0f2446dbd7..dc416ece885 100644 +index eb66266262b..3ca94b351b2 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -54,6 +54,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU], @@ -65,7 +65,7 @@ index c0f2446dbd7..dc416ece885 100644 HOTSPOT_$1_CPU_DEFINE=SPARC elif test "x$OPENJDK_$1_CPU" = xppc; then diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index b08caf4d5d3..2bf084895ba 100644 +index 63b7562f118..58b43241df4 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -1721,6 +1721,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { @@ -99,11 +99,11 @@ index b08caf4d5d3..2bf084895ba 100644 static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, LOONGARCH64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture -- -2.16.2 +2.43.0 diff --git a/package/openjdk/17.0.12+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch b/package/openjdk/17.0.12+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch new file mode 100644 index 0000000000..183f667dea --- /dev/null +++ b/package/openjdk/17.0.12+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch @@ -0,0 +1,83 @@ +From 8df09bb41f8aec8904a2231facc76660d2a83236 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Thu, 13 Nov 2025 17:23:44 +0100 +Subject: [PATCH] awt: fix HEADLESS compilation without X11 + +Upstream: https://github.com/openjdk/jdk/pull/28310 +Signed-off-by: Thomas Devoogdt +--- + make/modules/java.desktop/lib/Awt2dLibraries.gmk | 16 ++++++++++++++-- + .../unix/native/common/awt/utility/rect.h | 4 ++-- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk +index 46e3b1677f7..0e92ce6aeca 100644 +--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk ++++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk +@@ -77,6 +77,10 @@ ifeq ($(call isTargetOs, windows), true) + # + endif + ++ifeq ($(ENABLE_HEADLESS_ONLY), true) ++ LIBAWT_CFLAGS += -DHEADLESS ++endif ++ + ifeq ($(call isTargetOs, linux macosx aix), true) + LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c + endif +@@ -362,13 +366,20 @@ ifeq ($(call isTargetOs, windows macosx), false) + $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ + # + +- LIBAWT_HEADLESS_EXCLUDES := medialib ++ LIBAWT_HEADLESS_EXCLUDES := medialib opengl ++ ++ LIBAWT_HEADLESS_EXCLUDE_FILES := \ ++ GLXGraphicsConfig.c \ ++ GLXSurfaceData.c \ ++ X11PMBlitLoops.c \ ++ X11Renderer.c \ ++ X11SurfaceData.c \ ++ # + + LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \ + $(LIBAWT_DEFAULT_HEADER_DIRS) \ + common/awt/debug \ + common/font \ +- common/java2d/opengl \ + # + + LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ +@@ -378,6 +389,7 @@ ifeq ($(call isTargetOs, windows macosx), false) + NAME := awt_headless, \ + EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ + EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ ++ EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXCLUDE_FILES), \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(LIBAWT_HEADLESS_CFLAGS), \ +diff --git a/src/java.desktop/unix/native/common/awt/utility/rect.h b/src/java.desktop/unix/native/common/awt/utility/rect.h +index ceea38f4349..91b5a17ec58 100644 +--- a/src/java.desktop/unix/native/common/awt/utility/rect.h ++++ b/src/java.desktop/unix/native/common/awt/utility/rect.h +@@ -28,7 +28,7 @@ + #ifndef _AWT_RECT_H + #define _AWT_RECT_H + +-#ifndef MACOSX ++#if !defined(HEADLESS) && !defined(MACOSX) + #include + typedef XRectangle RECT_T; + #else +@@ -39,7 +39,7 @@ typedef struct { + int width; + int height; + } RECT_T; +-#endif /* !MACOSX */ ++#endif /* !HEADLESS && !MACOSX */ + + #define RECT_EQ_X(r1,r2) ((r1).x==(r2).x && (r1).width==(r2).width) + +-- +2.43.0 + diff --git a/package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/21.0.4+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 88% rename from package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/21.0.4+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 6c46ec7b42..89ec2996d3 100644 --- a/package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/21.0.4+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -1,4 +1,4 @@ -From 9a3c2a0714420186ae8d5159d5416c6fa2009ad9 Mon Sep 17 00:00:00 2001 +From c990ac56c441682b65a3dc699a753e1d924b40d1 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Mon, 18 Oct 2021 05:20:05 -0700 Subject: [PATCH] Add ARCv2 ISA processors support to Zero @@ -20,10 +20,10 @@ Signed-off-by: Alexey Brodkin 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 -index 5120918aed2..f7a99955874 100644 +index 51d4f724c33..41844933a14 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -163,6 +163,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], +@@ -157,6 +157,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lrt" fi @@ -39,7 +39,7 @@ index 5120918aed2..f7a99955874 100644 if test "x$OPENJDK_TARGET_OS" = xaix; then BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat" diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 -index c0f2446dbd7..dc416ece885 100644 +index df610cc489b..2e21572ba4d 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -54,6 +54,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU], @@ -65,10 +65,10 @@ index c0f2446dbd7..dc416ece885 100644 HOTSPOT_$1_CPU_DEFINE=SPARC elif test "x$OPENJDK_$1_CPU" = xppc; then diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index b08caf4d5d3..2bf084895ba 100644 +index 492300a37d4..3a10790f4a0 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1653,6 +1653,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1663,6 +1663,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1677,6 +1680,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1687,6 +1690,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1709,6 +1713,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1719,6 +1723,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,7 +95,7 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1731,7 +1737,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1741,7 +1747,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ @@ -105,5 +105,5 @@ index b08caf4d5d3..2bf084895ba 100644 // Identify compatibility class for VM's architecture and library's architecture -- -2.16.2 +2.43.0 diff --git a/package/openjdk/21.0.4+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch b/package/openjdk/21.0.4+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch new file mode 100644 index 0000000000..5bb59a0bdd --- /dev/null +++ b/package/openjdk/21.0.4+7/0002-awt-fix-HEADLESS-compilation-without-X11.patch @@ -0,0 +1,83 @@ +From 13a908b3d192e477b7572b522837efd771f5e2f9 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Thu, 13 Nov 2025 17:23:44 +0100 +Subject: [PATCH] awt: fix HEADLESS compilation without X11 + +Upstream: https://github.com/openjdk/jdk/pull/28310 +Signed-off-by: Thomas Devoogdt +--- + make/modules/java.desktop/lib/Awt2dLibraries.gmk | 16 ++++++++++++++-- + .../unix/native/common/awt/utility/rect.h | 4 ++-- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk +index a33f219e83e..de57e88a4ce 100644 +--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk ++++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk +@@ -77,6 +77,10 @@ ifeq ($(call isTargetOs, windows), true) + # + endif + ++ifeq ($(ENABLE_HEADLESS_ONLY), true) ++ LIBAWT_CFLAGS += -DHEADLESS ++endif ++ + ifeq ($(call isTargetOs, linux macosx aix), true) + LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c + endif +@@ -368,13 +372,20 @@ ifeq ($(call isTargetOs, windows macosx), false) + $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ + # + +- LIBAWT_HEADLESS_EXCLUDES := medialib ++ LIBAWT_HEADLESS_EXCLUDES := medialib opengl ++ ++ LIBAWT_HEADLESS_EXCLUDE_FILES := \ ++ GLXGraphicsConfig.c \ ++ GLXSurfaceData.c \ ++ X11PMBlitLoops.c \ ++ X11Renderer.c \ ++ X11SurfaceData.c \ ++ # + + LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \ + $(LIBAWT_DEFAULT_HEADER_DIRS) \ + common/awt/debug \ + common/font \ +- common/java2d/opengl \ + # + + LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ +@@ -384,6 +395,7 @@ ifeq ($(call isTargetOs, windows macosx), false) + NAME := awt_headless, \ + EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ + EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ ++ EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXCLUDE_FILES), \ + OPTIMIZATION := LOW, \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(LIBAWT_HEADLESS_CFLAGS), \ +diff --git a/src/java.desktop/unix/native/common/awt/utility/rect.h b/src/java.desktop/unix/native/common/awt/utility/rect.h +index ceea38f4349..91b5a17ec58 100644 +--- a/src/java.desktop/unix/native/common/awt/utility/rect.h ++++ b/src/java.desktop/unix/native/common/awt/utility/rect.h +@@ -28,7 +28,7 @@ + #ifndef _AWT_RECT_H + #define _AWT_RECT_H + +-#ifndef MACOSX ++#if !defined(HEADLESS) && !defined(MACOSX) + #include + typedef XRectangle RECT_T; + #else +@@ -39,7 +39,7 @@ typedef struct { + int width; + int height; + } RECT_T; +-#endif /* !MACOSX */ ++#endif /* !HEADLESS && !MACOSX */ + + #define RECT_EQ_X(r1,r2) ((r1).x==(r2).x && (r1).width==(r2).width) + +-- +2.43.0 + diff --git a/package/openjdk/21.0.4+7/0003-autoconf-libraries-drop-the-need-for-X11-in-headless.patch b/package/openjdk/21.0.4+7/0003-autoconf-libraries-drop-the-need-for-X11-in-headless.patch new file mode 100644 index 0000000000..bb182fa2b9 --- /dev/null +++ b/package/openjdk/21.0.4+7/0003-autoconf-libraries-drop-the-need-for-X11-in-headless.patch @@ -0,0 +1,35 @@ +From 46b9a0ad24f7f299ff23e13bc8ef01c188d246b6 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Thu, 13 Nov 2025 23:10:20 +0100 +Subject: [PATCH] autoconf: libraries: drop the need for X11 in headless mode + +Upstream: https://github.com/openjdk/jdk/pull/28310 +Signed-off-by: Thomas Devoogdt +--- + make/autoconf/libraries.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 +index 51d4f724c33..6a8b925c3f2 100644 +--- a/make/autoconf/libraries.m4 ++++ b/make/autoconf/libraries.m4 +@@ -42,12 +42,12 @@ m4_include([lib-tests.m4]) + AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], + [ + # Check if X11 is needed +- if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then +- # No X11 support on windows or macosx ++ if test "x$OPENJDK_TARGET_OS" = xwindows || ++ test "x$OPENJDK_TARGET_OS" = xmacosx || ++ test "x$ENABLE_HEADLESS_ONLY" = xtrue; then + NEEDS_LIB_X11=false + else +- # All other instances need X11, even if building headless only, libawt still +- # needs X11 headers. ++ # All other instances need X11 for libawt. + NEEDS_LIB_X11=true + fi + +-- +2.43.0 + diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 78775370ca..7f29e7a489 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -29,7 +29,6 @@ config BR2_PACKAGE_OPENJDK depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_USE_MMU # cups - depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_MIXER select BR2_PACKAGE_ALSA_LIB_PCM @@ -42,10 +41,6 @@ config BR2_PACKAGE_OPENJDK select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_ZLIB help OpenJDK is a free and open-source implementation of the @@ -71,6 +66,17 @@ config BR2_PACKAGE_OPENJDK_VERSION_21 endchoice +config BR2_PACKAGE_OPENJDK_X11 + bool "Build with AWT head support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXRENDER + select BR2_PACKAGE_XLIB_LIBXT + select BR2_PACKAGE_XLIB_LIBXTST + +comment "openjdk AWT head support needs X.org" + depends on !BR2_PACKAGE_XORG7 + config BR2_PACKAGE_OPENJDK_FULL_JDK bool "Build the full JDK" help @@ -155,12 +161,6 @@ config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO endchoice endif -comment "openjdk needs X.Org" - depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 - comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 6868ca191d..58b266c4e9 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -21,8 +21,6 @@ OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE OPENJDK_INSTALL_STAGING = YES -# OpenJDK requires Alsa, cups, and X11 even for a headless build. -# host-zip is needed for the zip executable. OPENJDK_DEPENDENCIES = \ host-gawk \ host-openjdk-bin \ @@ -37,10 +35,6 @@ OPENJDK_DEPENDENCIES = \ lcms2 \ libpng \ libusb \ - xlib_libXrandr \ - xlib_libXrender \ - xlib_libXt \ - xlib_libXtst \ zlib # JVM variants @@ -88,7 +82,6 @@ OPENJDK_CONF_OPTS = \ --disable-full-docs \ --disable-manpages \ --disable-warnings-as-errors \ - --enable-headless-only \ --enable-openjdk-only \ --enable-unlimited-crypto \ --openjdk-target=$(GNU_TARGET_NAME) \ @@ -112,6 +105,13 @@ OPENJDK_CONF_OPTS = \ --with-version-build="$(OPENJDK_VERSION_BUILD)" \ --with-version-string="$(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)" +ifeq ($(BR2_PACKAGE_OPENJDK_X11),y) +OPENJDK_CONF_OPTS += --disable-headless-only +OPENJDK_DEPENDENCIES += xlib_libXrandr xlib_libXrender xlib_libXt xlib_libXtst +else +OPENJDK_CONF_OPTS += --enable-headless-only +endif + # If building for AArch64, use the provided CPU port. ifeq ($(BR2_aarch64),y) OPENJDK_CONF_OPTS += --with-abi-profile=aarch64 -- 2.43.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot