0
0
mirror of https://github.com/termux/termux-packages.git synced 2025-05-11 20:13:22 +00:00
Files
termux-packages/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch
Robert Kirkman 4b5aa04efa bump(main/openjdk-17): 17.0.15
- fixes https://github.com/termux/termux-packages/issues/24527

- enable `littlecms`

- change `TERMUX_PKG_SRCURL` to match the same format as `openjdk-21`

- enable auto update

- add `--with-vendor-name="Termux"` and strip extra version strings like `openjdk-21`

- enable `TERMUX_PKG_MAKE_PROCESSES`

- remove directory before installation to fix building the same architecture twice in the same docker container

- some patches are present in the new upstream repository or are unnecessary

- some patches copied from `openjdk-21` because the code associated with them appeared in the new upstream repository
2025-05-07 07:29:19 +03:00

32 lines
1.1 KiB
Diff

From 2230460cbf0015f7d37b627aad0841e9b17b30ce Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.dev>
Date: Mon, 13 Feb 2023 13:49:47 +0100
Subject: [PATCH] make: cflags: handle arm like other arches
---
make/autoconf/flags-cflags.m4 | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index c0626e8f9a45..3cd0550eb314 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -58,13 +58,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
- # arm specific settings
- if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
- # '-Wl,-z,origin' isn't used on arm.
- SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
- else
- SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
- fi
+ SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
fi
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
--
2.44.0