浏览代码

Revert "zstd: install to staging directory"

This reverts commit 95c15aaf15f4bd5b1ebcf87d204ddf5a345197d5. It was
mistakenly pushed, and causes problems because it installs the shared
library to staging, but not to target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 7 年之前
父节点
当前提交
61fc25af83
共有 1 个文件被更改,包括 0 次插入6 次删除
  1. 0 6
      package/zstd/zstd.mk

+ 0 - 6
package/zstd/zstd.mk

@@ -6,7 +6,6 @@
 
 
 ZSTD_VERSION = v1.3.2
 ZSTD_VERSION = v1.3.2
 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION))
 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION))
-ZSTD_INSTALL_STAGING = YES
 ZSTD_LICENSE = BSD-3-Clause, GPL-2.0
 ZSTD_LICENSE = BSD-3-Clause, GPL-2.0
 ZSTD_LICENSE_FILES = LICENSE COPYING
 ZSTD_LICENSE_FILES = LICENSE COPYING
 
 
@@ -47,9 +46,4 @@ define ZSTD_INSTALL_TARGET_CMDS
 		DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install
 		DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install
 endef
 endef
 
 
-define ZSTD_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
-		DESTDIR=$(STAGING_DIR) PREFIX=/usr -C $(@D)/lib install
-endef
-
 $(eval $(generic-package))
 $(eval $(generic-package))