Commit 502133c4 authored by Adam Wujek's avatar Adam Wujek 💬

patches/buildroot: don't add libprocps.pc to the image

Buildroot forces procps-ng to install binaries in the /bin insted of /usr/bin.
As a side effect libprocps.pc was installed at /lib/pkgconfig instead of
/usr/lib/pkgconfig. Which directory is not included into final image.

Added patch taken from buildroot's repo:
0e07a5ede package/procps-ng: install libprocps.pc in staging/usr/lib/pkgconfig/
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 7768670b
From 0e07a5edeb1c596e1af9cd9de153b80761b45aef Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Sat, 26 Mar 2016 14:27:36 +0100
Subject: [PATCH] package/procps-ng: install libprocps.pc in
staging/usr/lib/pkgconfig/
Since 834893a965a993e8a73e30b448426f626419f3c8, pkg-config --libs libprocps
doesn't work anymore because libprocps.pc is installed in
STAGING_DIR/lib/pkgconfig/ instead of STAGING_DIR/usr/lib/pkgconfig/.
Add --libdir=/usr/lib in PROCPS_NG_CONF_OPTS to fixes the issue.
Note that libprocps.so is now installed in /usr/lib/ instead of /lib/.
Fixes:
http://autobuild.buildroot.net/results/2e5/2e5100ccf1ed336c26b83930e7149941c97fc4d2/
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/procps-ng/procps-ng.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index fb1b236..51a70a5 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -35,7 +35,11 @@ endif
# Make sure binaries get installed in /bin, so that they overwrite
# their busybox counterparts.
-PROCPS_NG_CONF_OPTS += --exec-prefix=/
+# Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/
+# otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking
+# pkg-config --libs libprocps.
+PROCPS_NG_CONF_OPTS += --exec-prefix=/ \
+ --libdir=/usr/lib
# Allows unicode characters to show in 'watch'
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
--
1.9.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment