From a222e5b58667646b7c390732f938873e378aa069 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 26 Oct 2019 10:45:56 +0200 Subject: [PATCH] package/ligpgme: don't use :=, use += and subst This makes it more in-line with how we handle such case in the rest of Buildroot. Also, move the variable assignment before its use. Even though in a makefile that does not matter, it makes it cleaner, more logical, and easier to follow (for us mere humans). Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libgpgme/libgpgme.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 1a045862dd..1951cc6675 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -11,9 +11,14 @@ LIBGPGME_LICENSE = LGPL-2.1+ LIBGPGME_LICENSE_FILES = COPYING.LESSER LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error -LIBGPGME_LANGUAGE_BINDINGS = cl LIBGPGME_CONFIG_SCRIPTS = gpgme-config +LIBGPGME_LANGUAGE_BINDINGS = cl +# C++ bindings require a C++11 capable gcc, and -Wsuggest-override support +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),yy) +LIBGPGME_LANGUAGE_BINDINGS += cpp +endif + LIBGPGME_CONF_OPTS = \ --with-gpg-error-prefix=$(STAGING_DIR)/usr \ --with-libassuan-prefix=$(STAGING_DIR)/usr \ @@ -21,12 +26,7 @@ LIBGPGME_CONF_OPTS = \ --disable-gpgconf-test \ --disable-g13-test \ --disable-gpg-test \ - --enable-languages=$(LIBGPGME_LANGUAGE_BINDINGS) - -# C++ bindings require a C++11 capable gcc, and -Wsuggest-override support -ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),yy) -LIBGPGME_LANGUAGE_BINDINGS := $(LIBGPGME_LANGUAGE_BINDINGS),cpp -endif + --enable-languages=$(subst $(space),$(comma),$(LIBGPGME_LANGUAGE_BINDINGS)) # Handle argp-standalone or it errors out during build ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -- 2.30.2