diff mbox

[1/1] Fix gcrypt library linker option on collectd.

Message ID 1482988838-6777-1-git-send-email-jackzzjack@gmail.com
State Changes Requested
Headers show

Commit Message

Jack Kao Dec. 29, 2016, 5:20 a.m. UTC
---
 package/collectd/collectd.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Gustavo Zacarias Jan. 3, 2017, 7:02 p.m. UTC | #1
On 2016-12-29 02:20, Yu-Ting, Kao wrote:

> @@ -177,6 +177,7 @@ ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
>  COLLECTD_DEPENDENCIES += libgcrypt
>  COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr
>  COLLECTD_CONF_ENV += 
> LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> +COLLECTD_CONF_ENV += LIBS="-lgcrypt"
>  else
>  COLLECTD_CONF_OPTS += --with-libgcrypt=no
>  endif

Hi.
This won't work as expected since you're potentially stomping over LIBS 
which is defined at the beginning of the package makefile, and also over 
the re-stomping when the postgresql option is turned on (which doesn't 
break the first one since it's defining both).
Probably better to do something like, at the beginning:

COLLECTD_CONF_ENV = LIBS="-lm $(COLLECTD_LIBS)"

And then:

ifeq ($(BR2_PACKAGE_POSTGRESQL,y)
COLLECTD_LIBS += -lpthread
....

ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
COLLECTD_LIBS += -lgcrypt
....

Regards.
Thomas Petazzoni Jan. 27, 2017, 8:52 a.m. UTC | #2
Hello,

On Thu, 29 Dec 2016 13:20:38 +0800, Yu-Ting, Kao wrote:
> ---
>  package/collectd/collectd.mk | 1 +
>  1 file changed, 1 insertion(+)

What problem is this commit fixing? An autobuilder failure? If so,
there should be a reference to it. I don't see any collectd issue
reported by the autobuilders:
http://autobuild.buildroot.net/?reason=collectd-5.7.1. Maybe this issue
has already been fixed?

Also, the commit title should always have the format:

	<package>: <short description>

so in your case, it should be:

	collectd: ...

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 28c1b31..c2d6f37 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -177,6 +177,7 @@  ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 COLLECTD_DEPENDENCIES += libgcrypt
 COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr
 COLLECTD_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+COLLECTD_CONF_ENV += LIBS="-lgcrypt"
 else
 COLLECTD_CONF_OPTS += --with-libgcrypt=no
 endif