Browse Source

Merge pull request #9163 from neheb/nn

zstd: Use CP instead of INSTALL_BIN
lilik-openwrt-22.03
Rosen Penev 6 years ago
committed by GitHub
parent
commit
cf03afc1f4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      utils/zstd/Makefile

+ 8
- 8
utils/zstd/Makefile View File

@ -2,24 +2,25 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zstd PKG_NAME:=zstd
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/facebook/zstd/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/facebook/zstd/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=63be339137d2b683c6d19a9e34f4fb684790e864fee13c7dd40e197a64c705c1 PKG_HASH:=63be339137d2b683c6d19a9e34f4fb684790e864fee13c7dd40e197a64c705c1
PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
CMAKE_SOURCE_SUBDIR:=build/cmake CMAKE_SOURCE_SUBDIR:=build/cmake
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
ifeq ($(CONFIG_ZSTD_OPTIMIZE_O3),y) ifeq ($(CONFIG_ZSTD_OPTIMIZE_O3),y)
TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS))
TARGET_CFLAGS += -O3 TARGET_CFLAGS += -O3
@ -30,7 +31,6 @@ endif
define Package/zstd/Default define Package/zstd/Default
SUBMENU:=Compression SUBMENU:=Compression
URL:=https://github.com/facebook/zstd URL:=https://github.com/facebook/zstd
MAINTAINER:=Amol Bhave <ambhave@fb.com>
endef endef
define Package/libzstd define Package/libzstd
@ -68,12 +68,12 @@ endef
define Package/libzstd/install define Package/libzstd/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libzstd.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzstd.so* $(1)/usr/lib/
endef endef
define Package/zstd/install define Package/zstd/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{unzstd,zstd,zstdcat,zstdmt} $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/{unzstd,zstd,zstdcat,zstdmt} $(1)/usr/bin/
endef endef
$(eval $(call BuildPackage,libzstd)) $(eval $(call BuildPackage,libzstd))


Loading…
Cancel
Save