750fb4ec3e
Commit 057e27029c (package/openjdk{, -bin}: bump latest to version
16.0.1+9) partially switched over to using the Github repository (which
is the new official publication channel for OpenJDK).
However, only the JDK16 was switched, because of concerns about a change
in the hash of Github-generated archives for the JDK11, due to a missing
Hg-related file on Github.
But as Arnout put it:
There's a trivial workaround: drop OPENJDK_SOURCE = .... That way,
the tarball name becomes openjdk-... instead of jdk-... and it's a
different file.
There is indeed no good reason to force a non-default filename for the
archive, so we do drop it.
As a consequence, we can fully switch over to Github for openjdk, using
the new version scheme. Of course the hash changes, but it is a new
file, so that's OK.
The filename for the JDK16 changes, but the content does not change, so
the hash does not change.
For consistency, the version scheme is also applied to openjdk-bin. Even
though it was already using Github, using that new version scheme also
allows to commonalise the variables too. The archives are the exact
same: no change in filename or content, so no hash to fixup.
Reported-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
cc: Adam Duskett <aduskett@gmail.com>
Tested-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
38 lines
1.5 KiB
Makefile
38 lines
1.5 KiB
Makefile
################################################################################
|
|
#
|
|
# host-openjdk-bin
|
|
#
|
|
################################################################################
|
|
|
|
ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
|
|
HOST_OPENJDK_BIN_VERSION_MAJOR = 16
|
|
HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_9
|
|
else
|
|
HOST_OPENJDK_BIN_VERSION_MAJOR = 11
|
|
HOST_OPENJDK_BIN_VERSION_MINOR = 0.11_9
|
|
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_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz
|
|
HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk$(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)/usr/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
|