diff --git a/cross/java-11-openjdk/Makefile b/cross/java-11-openjdk/Makefile index 6cdadaab3d5..a62635f2d82 100644 --- a/cross/java-11-openjdk/Makefile +++ b/cross/java-11-openjdk/Makefile @@ -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 @@ -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://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 diff --git a/cross/java-17-openjdk/Makefile b/cross/java-17-openjdk/Makefile index 35beee4bbd1..0031d0cf326 100644 --- a/cross/java-17-openjdk/Makefile +++ b/cross/java-17-openjdk/Makefile @@ -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 @@ -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 @@ -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. diff --git a/cross/rabbitmq/Makefile b/cross/rabbitmq/Makefile index 5be975c6acc..3277559f40c 100644 --- a/cross/rabbitmq/Makefile +++ b/cross/rabbitmq/Makefile @@ -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 = @@ -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) diff --git a/native/zip/Makefile b/native/zip/Makefile deleted file mode 100644 index 7495b211c02..00000000000 --- a/native/zip/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -PKG_NAME = zip -PKG_VERS = 30 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://altushost-swe.dl.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0 -PKG_DIR = $(PKG_NAME)$(PKG_VERS) - -HOMEPAGE = http://infozip.sourceforge.net/ -COMMENT = Zip - a compressor/archiver for creating and modifying zipfiles. -LICENSE = BSD-like - -COMPILE_MAKE_OPTIONS += -f unix/Makefile -COMPILE_MAKE_OPTIONS += generic - -CONFIGURE_TARGET = nop -INSTALL_TARGET = native_zip_install - -include ../../mk/spksrc.native-cc.mk - -.PHONY: native_zip_install -native_zip_install: - $(RUN) $(MAKE) -f unix/Makefile prefix=$(INSTALL_DIR)$(INSTALL_PREFIX) install - cd $(INSTALL_DIR)$(INSTALL_PREFIX)/bin && ln -s zip unzip diff --git a/native/zip/digests b/native/zip/digests deleted file mode 100644 index 9a36d939a4f..00000000000 --- a/native/zip/digests +++ /dev/null @@ -1,3 +0,0 @@ -zip30.tar.gz SHA1 c9f4099ecf2772b53c2dd4a8e508064ce015d182 -zip30.tar.gz SHA256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 -zip30.tar.gz MD5 7b74551e63f8ee6aab6fbc86676c0d37