diff mbox series

package/zip: install to staging

Message ID 20200706153406.430123-1-kamel.bouhara@bootlin.com
State Accepted
Headers show
Series package/zip: install to staging | expand

Commit Message

Kamel Bouhara July 6, 2020, 3:34 p.m. UTC
Install header files and libraries into the staging area.

Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
---
 package/zip/zip.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Yann E. MORIN July 7, 2020, 9 p.m. UTC | #1
Kamel, All,

On 2020-07-06 17:34 +0200, Kamel Bouhara spake thusly:
> Install header files and libraries into the staging area.
> 
> Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/zip/zip.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/zip/zip.mk b/package/zip/zip.mk
> index ca52c74fb1..c78efedc25 100644
> --- a/package/zip/zip.mk
> +++ b/package/zip/zip.mk
> @@ -10,6 +10,7 @@ ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz
>  ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
>  ZIP_LICENSE = Info-ZIP
>  ZIP_LICENSE_FILES = LICENSE
> +ZIP_INSTALL_STAGING = YES
>  
>  ifeq ($(BR2_PACKAGE_BZIP2),y)
>  ZIP_DEPENDENCIES += bzip2
> @@ -39,6 +40,11 @@ define ZIP_INSTALL_TARGET_CMDS
>  		prefix=$(TARGET_DIR)/usr
>  endef
>  
> +define ZIP_INSTALLING_STAGING_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
> +		prefix=$(STAGING_DIR)/usr
> +endef
> +
>  define HOST_ZIP_BUILD_CMDS
>  	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
>  		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
> -- 
> 2.26.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/zip/zip.mk b/package/zip/zip.mk
index ca52c74fb1..c78efedc25 100644
--- a/package/zip/zip.mk
+++ b/package/zip/zip.mk
@@ -10,6 +10,7 @@  ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz
 ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
 ZIP_LICENSE = Info-ZIP
 ZIP_LICENSE_FILES = LICENSE
+ZIP_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 ZIP_DEPENDENCIES += bzip2
@@ -39,6 +40,11 @@  define ZIP_INSTALL_TARGET_CMDS
 		prefix=$(TARGET_DIR)/usr
 endef
 
+define ZIP_INSTALLING_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
+		prefix=$(STAGING_DIR)/usr
+endef
+
 define HOST_ZIP_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
 		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \