Skip to content

Commit

Permalink
remove native/zip (#5836)
Browse files Browse the repository at this point in the history
* remove native/zip
- as zip is now in the dev. env, we can remove native/zip
  • Loading branch information
hgy59 committed Aug 7, 2023
1 parent 63de214 commit e02c6c3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 39 deletions.
5 changes: 1 addition & 4 deletions cross/java-11-openjdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PKG_DIR = $(JAVA_REPO_NAME)-$(JAVA_NAME)-$(JAVA_VERSION)-$(JAVA_RELEASE)
# build instructions:
# https://openjdk.java.net/groups/build/doc/building.html

BUILD_DEPENDS = native/openjdk-11 native/zip
BUILD_DEPENDS = native/openjdk-11
# Dependencies are required at build time only.
BUILD_DEPENDS += cross/cups
BUILD_DEPENDS += cross/alsa-lib
Expand All @@ -26,9 +26,6 @@ DEPENDS += cross/libjpeg
DEPENDS += cross/giflib
DEPENDS += cross/lcms2

ZIP_BIN_DIR = $(realpath $(WORK_DIR)/../../../native/zip/work-native/install/usr/local/bin)
ENV += PATH=$$PATH:$(ZIP_BIN_DIR)

HOMEPAGE = http:https://openjdk.java.net/
COMMENT = OpenJDK 11 is the open-source reference implementation of version 11 of the Java SE Platform as specified by by JSR 384 in the Java Community Process.
LICENSE = ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
Expand Down
7 changes: 2 additions & 5 deletions cross/java-17-openjdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PKG_DIR = $(JAVA_REPO_NAME)-$(JAVA_NAME)-$(JAVA_VERSION)-$(JAVA_RELEASE)
# build instructions:
# https://openjdk.java.net/groups/build/doc/building.html

BUILD_DEPENDS = native/openjdk-17 native/zip
BUILD_DEPENDS = native/openjdk-17
# Dependencies required at build time only:
BUILD_DEPENDS += cross/cups
BUILD_DEPENDS += cross/alsa-lib
Expand All @@ -29,9 +29,6 @@ DEPENDS += cross/libjpeg
DEPENDS += cross/giflib
DEPENDS += cross/lcms2

ZIP_BIN_DIR = $(realpath $(WORK_DIR)/../../../native/zip/work-native/install/usr/local/bin)
ENV += PATH=$$PATH:$(ZIP_BIN_DIR)

HOMEPAGE = https://openjdk.org/projects/jdk/17/
COMMENT = OpenJDK 17 is the open-source reference implementation of version 17 of the Java SE Platform as specified by JSR 390 in the Java Community Process.
LICENSE = GPLv2 with the Classpath Exception
Expand Down Expand Up @@ -108,7 +105,7 @@ include ../../mk/spksrc.cross-cc.mk
# Disable the normal host build target triplets since openjdk uses its own openjdk-target
# Avoid the use of $(RUN) since configure complains about env variables
java-17-openjdk_configure:
cd $(WORK_DIR)/$(PKG_DIR) && PATH=$$PATH:$(ZIP_BIN_DIR) && bash ./configure $(CONFIGURE_ARGS)
cd $(WORK_DIR)/$(PKG_DIR) && bash ./configure $(CONFIGURE_ARGS)

.PHONY: java-17-openjdk_pre_compile
# As DESTDIR is not supported we must patch the make file for make install.
Expand Down
6 changes: 2 additions & 4 deletions cross/rabbitmq/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-server-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-server-$(PKG_VERS)

BUILD_DEPENDS = native/erlang native/elixir native/zip
BUILD_DEPENDS = native/erlang native/elixir

DEPENDS =

Expand All @@ -15,11 +15,9 @@ LICENSE = MPL 2.0

ERLANG_BIN_DIR = $(realpath $(WORK_DIR)/../../../native/erlang/work-native/install/usr/local/bin)
ELIXIR_BIN_DIR = $(realpath $(WORK_DIR)/../../../native/elixir/work-native/install/usr/local/bin)
ZIP_BIN_DIR = $(realpath $(WORK_DIR)/../../../native/zip/work-native/install/usr/local/bin)

# Build requires native erlang and elixir
# Install requires native zip
ENV += PATH=$$PATH:$(ERLANG_BIN_DIR):$(ELIXIR_BIN_DIR):$(ZIP_BIN_DIR)
ENV += PATH=$$PATH:$(ERLANG_BIN_DIR):$(ELIXIR_BIN_DIR)

CONFIGURE_TARGET = nop
INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX) RMQ_ROOTDIR=$(INSTALL_PREFIX)
Expand Down
23 changes: 0 additions & 23 deletions native/zip/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions native/zip/digests

This file was deleted.

0 comments on commit e02c6c3

Please sign in to comment.