Skip to contentSkip to conversation

triggerhappy: use target pkg-config

PATCH New Baruch Siach 2 participants 8 messages Jun 11, 2018 – Jul 17, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 triggerhappy: use target pkg-config

triggerhappy uses pkg-config to detect the systemd library. Make sure it uses the target pkg-config, not the host one.

Fixes build failure when the host has systemd pkg-config files:

.../host/bin/arm-linux-gcc -static th-cmd.o cmdsocket.o -lsystemd -o th-cmd .../host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/6.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lsystemd

Cc Peter Korsgaard <[email protected]>
---
 package/triggerhappy/triggerhappy.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/triggerhappy/triggerhappy.mk +3 -1
index 9f74c486f10e..4c39ab5e5d4e 100644
@@ -8,9 +8,11 @@ TRIGGERHAPPY_VERSION = b822888066129350e51ad79f1cf307fa38dae4f7
 TRIGGERHAPPY_SITE = $(call github,wertarbyte,triggerhappy,$(TRIGGERHAPPY_VERSION))
 TRIGGERHAPPY_LICENSE = GPL-3.0+
 TRIGGERHAPPY_LICENSE_FILES = COPYING
+TRIGGERHAPPY_DEPENDENCIES = host-pkgconf
 
 define TRIGGERHAPPY_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) thd th-cmd
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		-C $(@D) thd th-cmd
 endef
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 triggerhappy: add optional dependency on systemd

triggerhappy can use systemd for socket activation.

Cc Peter Korsgaard <[email protected]>
---
 package/triggerhappy/triggerhappy.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/triggerhappy/triggerhappy.mk +4 -0
index 4c39ab5e5d4e..7c4bf4047650 100644
@@ -10,6 +10,10 @@ TRIGGERHAPPY_LICENSE = GPL-3.0+
 TRIGGERHAPPY_LICENSE_FILES = COPYING
 TRIGGERHAPPY_DEPENDENCIES = host-pkgconf
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+TRIGGERHAPPY_DEPENDENCIES += systemd
+endif
+
 define TRIGGERHAPPY_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		-C $(@D) thd th-cmd
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/2 triggerhappy: add optional dependency on systemd

Hi Peter,

Quoted 8 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

triggerhappy can use systemd for socket activation.

Cc Peter Korsgaard <[email protected]>

Committed, thanks.

Not in master as of d06d70d28db37 (modem-manager: update to version 1.8.0).

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#4 lore raw

PATCH 2/2 triggerhappy: add optional dependency on systemd

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Hi Peter,

Quoted 2 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

triggerhappy can use systemd for socket activation.

Cc Peter Korsgaard <[email protected]>

Committed, thanks.

Not in master as of d06d70d28db37 (modem-manager: update to version 1.8.0).

It is now ;)

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 triggerhappy: use target pkg-config

In reply to Baruch Siach
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

triggerhappy uses pkg-config to detect the systemd library. Make sure it uses the target pkg-config, not the host one.

Quoted 8 lines

Fixes build failure when the host has systemd pkg-config files:

.../host/bin/arm-linux-gcc -static th-cmd.o cmdsocket.o -lsystemd -o th-cmd .../host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/6.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld:
cannot find -lsystemd

Cc Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/2 triggerhappy: use target pkg-config

In reply to Baruch Siach
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

triggerhappy uses pkg-config to detect the systemd library. Make sure it uses the target pkg-config, not the host one.

Quoted 8 lines

Fixes build failure when the host has systemd pkg-config files:

.../host/bin/arm-linux-gcc -static th-cmd.o cmdsocket.o -lsystemd -o th-cmd .../host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/6.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld:
cannot find -lsystemd

Cc Peter Korsgaard <[email protected]>

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/2 triggerhappy: use target pkg-config

In reply to Baruch Siach
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

triggerhappy uses pkg-config to detect the systemd library. Make sure it uses the target pkg-config, not the host one.

Quoted 8 lines

Fixes build failure when the host has systemd pkg-config files:

.../host/bin/arm-linux-gcc -static th-cmd.o cmdsocket.o -lsystemd -o th-cmd .../host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/6.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld:
cannot find -lsystemd

Cc Peter Korsgaard <[email protected]>

Committed to 2018.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard