* [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config
@ 2018-06-11 18:24 Baruch Siach
2018-06-11 18:24 ` [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd Baruch Siach
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Baruch Siach @ 2018-06-11 18:24 UTC (permalink / raw)
To: buildroot
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 <peter@korsgaard.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/triggerhappy/triggerhappy.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk
index 9f74c486f10e..4c39ab5e5d4e 100644
--- a/package/triggerhappy/triggerhappy.mk
+++ b/package/triggerhappy/triggerhappy.mk
@@ -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)
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd
2018-06-11 18:24 [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Baruch Siach
@ 2018-06-11 18:24 ` Baruch Siach
2018-06-11 19:39 ` Peter Korsgaard
2018-06-11 19:39 ` [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Peter Korsgaard
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2018-06-11 18:24 UTC (permalink / raw)
To: buildroot
triggerhappy can use systemd for socket activation.
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/triggerhappy/triggerhappy.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk
index 4c39ab5e5d4e..7c4bf4047650 100644
--- a/package/triggerhappy/triggerhappy.mk
+++ b/package/triggerhappy/triggerhappy.mk
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config
2018-06-11 18:24 [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Baruch Siach
2018-06-11 18:24 ` [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd Baruch Siach
@ 2018-06-11 19:39 ` Peter Korsgaard
2018-06-17 15:53 ` Peter Korsgaard
2018-07-17 7:26 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2018-06-11 19:39 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 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 <peter@korsgaard.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd
2018-06-11 18:24 ` [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd Baruch Siach
@ 2018-06-11 19:39 ` Peter Korsgaard
2018-06-11 19:53 ` Baruch Siach
0 siblings, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2018-06-11 19:39 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> triggerhappy can use systemd for socket activation.
>
> Cc: Peter Korsgaard <peter@korsgaard.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd
2018-06-11 19:39 ` Peter Korsgaard
@ 2018-06-11 19:53 ` Baruch Siach
2018-06-11 20:11 ` Peter Korsgaard
0 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2018-06-11 19:53 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Mon, Jun 11, 2018 at 09:39:50PM +0200, Peter Korsgaard wrote:
> >>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
>
> > triggerhappy can use systemd for socket activation.
> >
> > Cc: Peter Korsgaard <peter@korsgaard.com>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>
> Committed, thanks.
Not in master as of d06d70d28db37 (modem-manager: update to version 1.8.0).
baruch
--
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 -
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd
2018-06-11 19:53 ` Baruch Siach
@ 2018-06-11 20:11 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2018-06-11 20:11 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Hi Peter,
> On Mon, Jun 11, 2018 at 09:39:50PM +0200, Peter Korsgaard wrote:
>> >>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
>>
>> > triggerhappy can use systemd for socket activation.
>> >
>> > Cc: Peter Korsgaard <peter@korsgaard.com>
>> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>>
>> Committed, thanks.
> Not in master as of d06d70d28db37 (modem-manager: update to version 1.8.0).
It is now ;)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config
2018-06-11 18:24 [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Baruch Siach
2018-06-11 18:24 ` [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd Baruch Siach
2018-06-11 19:39 ` [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Peter Korsgaard
@ 2018-06-17 15:53 ` Peter Korsgaard
2018-07-17 7:26 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2018-06-17 15:53 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 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 <peter@korsgaard.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2018.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config
2018-06-11 18:24 [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Baruch Siach
` (2 preceding siblings ...)
2018-06-17 15:53 ` Peter Korsgaard
@ 2018-07-17 7:26 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2018-07-17 7:26 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 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 <peter@korsgaard.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2018.05.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-07-17 7:26 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-11 18:24 [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Baruch Siach
2018-06-11 18:24 ` [Buildroot] [PATCH 2/2] triggerhappy: add optional dependency on systemd Baruch Siach
2018-06-11 19:39 ` Peter Korsgaard
2018-06-11 19:53 ` Baruch Siach
2018-06-11 20:11 ` Peter Korsgaard
2018-06-11 19:39 ` [Buildroot] [PATCH 1/2] triggerhappy: use target pkg-config Peter Korsgaard
2018-06-17 15:53 ` Peter Korsgaard
2018-07-17 7:26 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.