From c8face08d4db4705a1a3b8ac66884db9d275ba8d Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 16 Dec 2019 15:28:26 +0100 Subject: [PATCH] jre.zulu: cleanup and use the "sysroot" build flag As with system-tools before. --- .../jre-depends/apache-ant/package.mk | 2 +- .../jre-depends/jre-libXinerama/package.mk | 5 +---- .../jre-depends/jre-libbluray/package.mk | 9 +++------ packages/addons/tools/jre.zulu/package.mk | 19 ++++++++++--------- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/packages/addons/addon-depends/jre-depends/apache-ant/package.mk b/packages/addons/addon-depends/jre-depends/apache-ant/package.mk index ea9ddc0960..520c9cd100 100644 --- a/packages/addons/addon-depends/jre-depends/apache-ant/package.mk +++ b/packages/addons/addon-depends/jre-depends/apache-ant/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="a4adf371696089e1730d4f55fd4d0c6f3784dea1eee402fcc981f2330f8d6fc1" PKG_LICENSE="Apache License 2.0" PKG_SITE="https://ant.apache.org/" PKG_URL="https://archive.apache.org/dist/ant/source/${PKG_NAME}-${PKG_VERSION}-src.tar.xz" -PKG_DEPENDS_HOST="jdk-x86_64-zulu:host" +PKG_DEPENDS_UNPACK="jdk-x86_64-zulu" PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk b/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk index 02e8b4788d..2d03adf45f 100644 --- a/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk +++ b/packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk @@ -7,6 +7,7 @@ PKG_NAME="jre-libXinerama" PKG_LONGDESC="libXinerama for JRE" PKG_URL="" PKG_DEPENDS_UNPACK+=" libXinerama" +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET+=" --disable-static --enable-shared" @@ -14,7 +15,3 @@ unpack() { mkdir -p $PKG_BUILD tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk index bf733cb1db..fb773baec8 100644 --- a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk +++ b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk @@ -4,11 +4,12 @@ . $(get_pkg_directory libbluray)/package.mk PKG_NAME="jre-libbluray" -PKG_DEPENDS_TARGET+=" jdk-x86_64-zulu:host apache-ant:host" +PKG_DEPENDS_TARGET+=" apache-ant:host" PKG_LONGDESC="libbluray jar for BD-J menus" PKG_URL="" -PKG_DEPENDS_UNPACK+=" libbluray" +PKG_DEPENDS_UNPACK+=" jdk-x86_64-zulu libbluray" PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches" +PKG_BUILD_FLAGS="-sysroot" unpack() { mkdir -p $PKG_BUILD @@ -27,7 +28,3 @@ make_target() { make all-local ) } - -makeinstall_target() { - : -} diff --git a/packages/addons/tools/jre.zulu/package.mk b/packages/addons/tools/jre.zulu/package.mk index 427a3ae158..8185b4508e 100644 --- a/packages/addons/tools/jre.zulu/package.mk +++ b/packages/addons/tools/jre.zulu/package.mk @@ -5,7 +5,8 @@ PKG_NAME="jre.zulu" PKG_VERSION="1.0" PKG_REV="100" PKG_LICENSE="GPL2" -PKG_DEPENDS_TARGET="jdk-${TARGET_ARCH}-zulu jre-libbluray libXext chrome-libXtst chrome-libXi chrome-libXrender jre-libXinerama" +PKG_DEPENDS_TARGET="jre-libbluray libXext chrome-libXtst chrome-libXi chrome-libXrender jre-libXinerama" +PKG_DEPENDS_UNPACK="jdk-${TARGET_ARCH}-zulu" PKG_SECTION="tools" PKG_SHORTDESC="Java Runtime Environment 8 for Blu-ray Disc Java menus from Azul Systems." PKG_LONGDESC="$PKG_SHORTDESC" @@ -17,7 +18,7 @@ PKG_ADDON_TYPE="xbmc.python.script" # find $1.so.[0-9]* in $2 and copy it to dest _pkg_copy_lib() { - find "$2" -regextype sed -regex ".*/$1\.so\.[0-9]*" \ + find "$2/usr/lib" -regextype sed -regex ".*/$1\.so\.[0-9]*" \ -exec cp {} "$ADDON_BUILD/$PKG_ADDON_ID/lib" \; } @@ -25,18 +26,18 @@ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -a $(get_build_dir jdk-${TARGET_ARCH}-zulu)/jre \ - $(get_build_dir jre-libbluray)/.$TARGET_NAME/.libs/*.jar \ + $(get_install_dir jre-libbluray)/usr/share/java/*.jar \ ${PKG_DIR}/profile.d \ $ADDON_BUILD/$PKG_ADDON_ID # copy required libraries for JRE - _pkg_copy_lib libXtst $(get_build_dir chrome-libXtst)/.$TARGET_NAME/src/.libs - _pkg_copy_lib libXi $(get_build_dir chrome-libXi)/.$TARGET_NAME/src/.libs - _pkg_copy_lib libXrender $(get_build_dir chrome-libXrender)/.$TARGET_NAME/src/.libs - _pkg_copy_lib libXinerama $(get_build_dir jre-libXinerama)/.$TARGET_NAME/src/.libs + _pkg_copy_lib libXtst $(get_install_dir chrome-libXtst) + _pkg_copy_lib libXi $(get_install_dir chrome-libXi) + _pkg_copy_lib libXrender $(get_install_dir chrome-libXrender) + _pkg_copy_lib libXinerama $(get_install_dir jre-libXinerama) if [ "$TARGET_ARCH" = "arm" ]; then - _pkg_copy_lib libX11 $(get_build_dir libX11)/.$TARGET_NAME/src/.libs - _pkg_copy_lib libXext $(get_build_dir libXext)/.$TARGET_NAME/src/.libs + _pkg_copy_lib libX11 $(get_install_dir libX11) + _pkg_copy_lib libXext $(get_install_dir libXext) fi }