diff options
| -rw-r--r-- | jtools/openjdk/Makefile | 1 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile index 17fe6bbf8..3b5ee21e3 100644 --- a/jtools/openjdk/Makefile +++ b/jtools/openjdk/Makefile @@ -50,6 +50,7 @@ OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$( install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java +do-extract: $(WRKDIST)/.extract: $(WRKDIST)/.extract_done cd ${WRKDIST}; mkdir openjdk-$(PKG_VERSION); \ tar xzf $(TOPDIR)/dl/openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C openjdk-$(PKG_VERSION) diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index ea8922674..7d94f5976 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -79,6 +79,10 @@ if [[ -n $ADK_COMPILE_KRB5 ]]; then NEED_BISON="$NEED_BISON krb5" fi +if [[ -n $ADK_COMPILE_OPENJDK ]]; then + NEED_ANT="$NEED_ANT openjdk" +fi + if [[ -n $ADK_PACKAGE_LIBXCB ]]; then NEED_XSLTPROC="$NEED_XSLTPROC libxcb" fi @@ -344,6 +348,13 @@ if [[ -n $NEED_FLEX ]]; then fi fi +if [[ -n $NEED_ANT ]]; then + if ! which ant >/dev/null 2>&1; then + echo >&2 You need ant to build $NEED_OPENJDK + out=1 + fi +fi + if [[ -n $NEED_YASM ]]; then if ! which yasm >/dev/null 2>&1; then echo >&2 You need yasm to build $NEED_YASM |