Skip to contentSkip to conversation

rpcbind: use pkg-config for libtirpc flags

PATCH New Thomas De Schampheleire 2 participants 7 messages Jul 26, 2015

lore
Share & tools
lore

Thomas De Schampheleire

author
#0 lore raw

PATCH 1/6 rpcbind: use pkg-config for libtirpc flags

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/rpcbind/rpcbind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpcbind/rpcbind.mk +1 -1
index d879de1..1e28af9 100644
@@ -11,7 +11,7 @@ RPCBIND_LICENSE = BSD-3c
 RPCBIND_LICENSE_FILES = COPYING
 
 RPCBIND_CONF_ENV += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
+	CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
 RPCBIND_DEPENDENCIES += libtirpc host-pkgconf
 RPCBIND_CONF_OPTS += --with-rpcuser=root
 RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
Signature · 1 line
1.8.5.1
author
#1 lore raw

PATCH 2/6 conntrack-tools: use pkg-config for libtirpc flags

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/conntrack-tools/conntrack-tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/conntrack-tools/conntrack-tools.mk +2 -2
index c01501a..983f954 100644
@@ -15,8 +15,8 @@ CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
 CONNTRACK_TOOLS_CONF_ENV += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
-CONNTRACK_TOOLS_DEPENDENCIES += libtirpc
+	CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
+CONNTRACK_TOOLS_DEPENDENCIES += libtirpc host-pkgconf
 endif
 
 $(eval $(autotools-package))
Signature · 1 line
1.8.5.1
author
#2 lore raw

PATCH 3/6 busybox: use pkg-config for libtirpc flags

In reply to Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/busybox/busybox.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/busybox/busybox.mk +3 -3
index 65ce7ef..6e302f4 100644
@@ -19,11 +19,11 @@ BUSYBOX_LDFLAGS = \
 # Link against libtirpc if available so that we can leverage its RPC
 # support for NFS mounting with BusyBox
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
-BUSYBOX_DEPENDENCIES += libtirpc
-BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+BUSYBOX_DEPENDENCIES += libtirpc host-pkgconf
+BUSYBOX_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
 # Don't use LDFLAGS for -ltirpc, because LDFLAGS is used for
 # the non-final link of modules as well.
-BUSYBOX_CFLAGS_busybox += -ltirpc
+BUSYBOX_CFLAGS_busybox += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
 endif
 
 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
Signature · 1 line
1.8.5.1
author
#3 lore raw

PATCH 4/6 quota: use pkg-config for libtirpc flags

In reply to Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/quota/quota.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/quota/quota.mk +3 -3
index 332f42e..5e5e637 100644
@@ -19,9 +19,9 @@ QUOTA_LIBS += -lintl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
-QUOTA_DEPENDENCIES += libtirpc
-QUOTA_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
-QUOTA_LIBS += -ltirpc
+QUOTA_DEPENDENCIES += libtirpc host-pkgconf
+QUOTA_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
+QUOTA_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
 endif
 
 QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LIBS="$(QUOTA_LIBS)"
Signature · 1 line
1.8.5.1
author
#4 lore raw

PATCH 5/6 xinetd: use pkg-config for libtirpc flags

In reply to Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/xinetd/xinetd.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/xinetd/xinetd.mk +3 -3
index 92d0d53..9818512 100644
@@ -17,9 +17,9 @@ XINETD_CFLAGS = $(TARGET_CFLAGS)
 #     flags (so this case 2 is implicit and not visible below)
 #  3. We don't have RPC support, pass -DNO_RPC to disable it
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
-XINETD_DEPENDENCIES += libtirpc
-XINETD_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
-XINETD_LIBS += -ltirpc
+XINETD_DEPENDENCIES += libtirpc host-pkgconf
+XINETD_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
+XINETD_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
 else ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),)
 XINETD_CFLAGS += -DNO_RPC
 endif
Signature · 1 line
1.8.5.1
author
#5 lore raw

PATCH 6/6 argus: use pkg-config for libtirpc flags

In reply to Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config. The linker flags are added to LIBS rather than LDFLAGS, which is more correct in case of static builds.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/argus/argus.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/argus/argus.mk +3 -3
index c39b664..bd1c559 100644
@@ -13,10 +13,10 @@ ARGUS_LICENSE = GPLv2+
 ARGUS_LICENSE_FILES = README
 
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
-ARGUS_DEPENDENCIES += libtirpc
+ARGUS_DEPENDENCIES += libtirpc host-pkgconf
 ARGUS_CONF_ENV += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/" \
-	LDFLAGS="$(TARGET_LDFLAGS) -ltirpc"
+	CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" \
+	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
 endif
 
 $(eval $(autotools-package))
Signature · 1 line
1.8.5.1
#6 lore raw

PATCH 1/6 rpcbind: use pkg-config for libtirpc flags

In reply to Thomas De Schampheleire

Dear Thomas De Schampheleire,

Quoted 8 lines · Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

Instead of hardcoding the flags needed for libtirpc, use pkg-config.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/rpcbind/rpcbind.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

All 6 patches applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com