d9ff62c4cd
It's been ages (5 years at the next release) that we've not installed host packages in $(HOST_DIR)/usr, but we still have a few packages that reference it or install things in there. Drop all of those in one fell swoop. The run-time test still succeeds, and the following defconfig, which should exercise all touched packages [*], does build: BR2_x86_i686=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_GAWK=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_ABOOTIMG=y BR2_PACKAGE_DBUS_PYTHON=y BR2_PACKAGE_OLA=y BR2_PACKAGE_JIMTCL=y BR2_PACKAGE_LUA=y # BR2_PACKAGE_LUA_32BITS is not set BR2_PACKAGE_ARGPARSE=y BR2_PACKAGE_PERL=y BR2_PACKAGE_PHP=y BR2_PACKAGE_PHP_APCU=y BR2_PACKAGE_PHP_LUA=y BR2_PACKAGE_PHP_PAM=y BR2_PACKAGE_PHP_PECL_DBUS=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y BR2_PACKAGE_PYTHON_PLY=y BR2_PACKAGE_PYTHON_PYBIND=y BR2_PACKAGE_LIBVA=y BR2_PACKAGE_BIND=y BR2_PACKAGE_BIND_SERVER=y BR2_PACKAGE_BIND_TOOLS=y BR2_PACKAGE_APPARMOR=y BR2_PACKAGE_APPARMOR_BINUTILS=y BR2_PACKAGE_APPARMOR_UTILS=y BR2_PACKAGE_APPARMOR_UTILS_EXTRA=y BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_REFPOLICY=y BR2_PACKAGE_URANDOM_SCRIPTS=y BR2_PACKAGE_BASH=y # embiggen-disk to exercise go BR2_PACKAGE_EMBIGGEN_DISK=y BR2_TARGET_GRUB2=y BR2_TARGET_GRUB2_I386_PC=y BR2_TARGET_GRUB2_I386_EFI=y [*] exceptions: - zfs was not tested: it needs a kernel to be built; - compiler-rt was not tsted: it needs llvm to be built, that takes ages, and other packages already reference the correct location for llvm-config, so it was assumed that is OK. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Angelo Compagnucci <angelo.compagnucci@gmail.com> Cc: Anisse Astier <anisse@astier.eu> Cc: Antoine Tenart <atenart@kernel.org> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Cc: Asaf Kahlon <asafka7@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Cc: Christian Stewart <christian@paral.in> Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Cc: Francois Perrad <francois.perrad@gadz.org> Cc: Guillaume William Brs <guillaume.bressaix@gmail.com> Cc: Hervé Codina <herve.codina@bootlin.com> Cc: James Hilliard <james.hilliard1@gmail.com> Cc: José Luis Salvador Rufo <salvador.joseluis@gmail.com> Cc: Julien Boibessot <julien.boibessot@armadeus.com> Cc: Julien Olivain <ju.o@free.fr> Cc: Matt Weber <matthew.weber@collins.com> Cc: Nicolas Carrier <nicolas.carrier@orolia.com> Cc: Peter Korsgaard <peter@korsgaard.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Vadim Kochan <vadim4j@gmail.com> Cc: Yegor Yefremov <yegorslists@googlemail.com> Reviewed-by: Romain Naour <romain.naour@smile.fr> --- Changes v1 -> v2: - fix new instance that have crept in (Romain)
46 lines
1.7 KiB
Makefile
46 lines
1.7 KiB
Makefile
################################################################################
|
|
#
|
|
# host-openjdk-bin
|
|
#
|
|
################################################################################
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
|
|
HOST_OPENJDK_BIN_VERSION_MAJOR = 17
|
|
HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8
|
|
else
|
|
HOST_OPENJDK_BIN_VERSION_MAJOR = 11
|
|
HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1
|
|
endif
|
|
|
|
ifeq ($(HOSTARCH),x86_64)
|
|
HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME = x64
|
|
endif
|
|
ifeq ($(HOSTARCH),aarch64)
|
|
HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME = aarch64
|
|
endif
|
|
|
|
HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR)
|
|
HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_$(HOST_OPENJDK_BIN_DOWNLOAD_ARCH_NAME)_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
|
|
HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION))
|
|
|
|
HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception
|
|
HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION
|
|
|
|
HOST_OPENJDK_BIN_ROOT_DIR = $(HOST_DIR)/lib/jvm
|
|
|
|
# unpack200 has an invalid RPATH and relies on libzlib. When
|
|
# host-libzlib is installed on the system, the error "ERROR: package
|
|
# host-libzlib installs executables without proper RPATH: will occur.
|
|
# Because unpack200 is a deprecated tool, removing it to fix this
|
|
# issue is safe.
|
|
define HOST_OPENJDK_BIN_INSTALL_CMDS
|
|
mkdir -p $(HOST_OPENJDK_BIN_ROOT_DIR)
|
|
cp -dpfr $(@D)/* $(HOST_OPENJDK_BIN_ROOT_DIR)
|
|
$(RM) -f $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/unpack200
|
|
endef
|
|
|
|
$(eval $(host-generic-package))
|
|
|
|
# variables used by other packages
|
|
JAVAC = $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/javac
|