Skip to contentSkip to conversation

package/procps-ng: if building with systemd, enable systemd-specific features

PATCH New Steven Noonan 2 participants 4 messages Mar 18, 2015 – Apr 4, 2015

lore
Share & tools
lore

Steven Noonan

author
#0 lore raw

PATCH 1/3 package/procps-ng: if building with systemd, enable systemd-specific features

Signed-off-by Steven Noonan <[email protected]>
---
 package/procps-ng/procps-ng.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/procps-ng/procps-ng.mk +5 -0
index 71e32dd..1483662 100644
@@ -24,6 +24,11 @@ PROCPS_NG_DEPENDENCIES += gettext
 PROCPS_NG_CONF_OPTS += LIBS=-lintl
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+PROCPS_NG_DEPENDENCIES += systemd
+PROCPS_NG_CONF_OPTS += --with-systemd
+endif
+
 # We need this to make procps-ng binaries installed in $(TARGET_DIR)/usr
 # instead of $(TARGET_DIR)/usr/usr
 PROCPS_NG_CONF_OPTS += --exec-prefix=
Signature · 1 line
2.3.3
author
#1 lore raw

PATCH 2/3 package/procps-ng: use more complete installation prefix

Otherwise we get a /lib/pkgconfig/libprocps.pc for example.

Signed-off-by Steven Noonan <[email protected]>
---
 package/procps-ng/procps-ng.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/procps-ng/procps-ng.mk +7 -1
index 1483662..f7e3e3c 100644
@@ -31,6 +31,12 @@ endif
 
 # We need this to make procps-ng binaries installed in $(TARGET_DIR)/usr
 # instead of $(TARGET_DIR)/usr/usr
-PROCPS_NG_CONF_OPTS += --exec-prefix=
+PROCPS_NG_CONF_OPTS += \
+	--prefix=/usr \
+	--exec-prefix=/ \
+	--sysconfdir=/etc \
+	--libdir=/usr/lib \
+	--bindir=/usr/bin \
+	--sbindir=/usr/sbin
 
 $(eval $(autotools-package))
Signature · 1 line
2.3.3
author
#2 lore raw

PATCH 3/3 package/procps-ng: enable UTF-8 support

In reply to Steven Noonan

For an example of why to enable this: https://bugs.archlinux.org/task/38614

Signed-off-by Steven Noonan <[email protected]>
---
 package/procps-ng/procps-ng.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/procps-ng/procps-ng.mk +6 -0
index f7e3e3c..90289e2 100644
@@ -39,4 +39,10 @@ PROCPS_NG_CONF_OPTS += \
 	--bindir=/usr/bin \
 	--sbindir=/usr/sbin
 
+# Allows unicode characters to show in 'watch'
+ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
+PROCPS_NG_CONF_OPTS += \
+	--enable-watch8bit
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.3.3
#3 lore raw

PATCH 1/3 package/procps-ng: if building with systemd, enable systemd-specific features

In reply to Steven Noonan

Dear Steven Noonan,

Quoted 10 lines · Steven Noonan
Signed-off-by Steven Noonan <[email protected]>
---
 package/procps-ng/procps-ng.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/procps-ng/procps-ng.mk +0 -0
index 71e32dd..1483662 100644

package/procps-ng/procps-ng.mk PROCPS_NG_DEPENDENCIES += gettext · line 30

Quoted 7 lines
package/procps-ng/procps-ng.mk +4 -0
@@ -24,6 +24,11 @@ PROCPS_NG_DEPENDENCIES += gettext
 PROCPS_NG_CONF_OPTS += LIBS=-lintl
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+PROCPS_NG_DEPENDENCIES += systemd
+PROCPS_NG_CONF_OPTS += --with-systemd
+endif

I've added an 'else' clause to explicitly disable systemd support when systemd is not available and applied.

I've also applied your patches 2/3 and 3/3 of this series.

Thanks a lot!

Thomas

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