From 7f1b0cd321a8294754a7193918aef48c27cbe216 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:20:33 +0100 Subject: [PATCH] package/xxhash: optimize XXHASH_{TARGETS, INSTALL_TARGETS} Optimize XXHASH_{TARGETS,INSTALL_TARGETS} as suggested by Thomas Petazzoni in https://patchwork.ozlabs.org/project/buildroot/patch/20221228221522.280696-1-fontaine.fabrice@gmail.com/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3de4ae012141803bdf8abda12e27d10e55f6953f) Signed-off-by: Peter Korsgaard --- package/xxhash/xxhash.mk | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 6932113f14..04bc98690f 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -10,28 +10,20 @@ XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES -XXHASH_TARGETS = xxhsum -XXHASH_INSTALL_TARGETS = install_xxhsum +XXHASH_TARGETS = xxhsum libxxhash.pc +XXHASH_INSTALL_TARGETS = \ + install_libxxhash.includes \ + install_libxxhash.pc \ + install_xxhsum -ifeq ($(BR2_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_LIBS),y) -XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash \ - install_libxxhash.includes \ - install_libxxhash.pc +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash.a +XXHASH_INSTALL_TARGETS += install_libxxhash.a +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash +XXHASH_INSTALL_TARGETS += install_libxxhash endif define XXHASH_BUILD_CMDS