diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2018-07-08 11:45:43 +0200 |
|---|---|---|
| committer | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2018-07-08 12:22:14 +0200 |
| commit | bb47802facc682221bf169fa83b2676838503504 (patch) | |
| tree | eeca646a2f979c90eab60015bde703c907d4d6e2 /package/procps-ng | |
| parent | d1a6280fe629896795b20b09013501cfa0094a1e (diff) | |
| download | buildroot-bb47802facc682221bf169fa83b2676838503504.tar.gz buildroot-bb47802facc682221bf169fa83b2676838503504.zip | |
package/busybox: invert dependency with procps-ng
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'package/procps-ng')
| -rw-r--r-- | package/procps-ng/procps-ng.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index e1fddea32c..03b74784d2 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -13,12 +13,6 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) -# If both procps-ng and busybox are selected, make certain procps-ng -# wins the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PROCPS_NG_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) PROCPS_NG_DEPENDENCIES += systemd PROCPS_NG_CONF_OPTS += --with-systemd @@ -26,8 +20,8 @@ else PROCPS_NG_CONF_OPTS += --without-systemd endif -# Make sure binaries get installed in /bin, so that they overwrite -# their busybox counterparts. +# Make sure binaries get installed in /bin, as busybox does, so that we +# don't end up with two versions. # 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. |
