0e07a5edeb
Since 834893a965, 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>
51 lines
1.6 KiB
Makefile
51 lines
1.6 KiB
Makefile
################################################################################
|
|
#
|
|
# procps-ng
|
|
#
|
|
################################################################################
|
|
|
|
PROCPS_NG_VERSION = 3.3.11
|
|
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
|
|
PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
|
|
PROCPS_NG_LICENSE = GPLv2+, libproc and libps LGPLv2+
|
|
PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
|
|
PROCPS_NG_INSTALL_STAGING = YES
|
|
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf
|
|
# For 0002-use-pkgconfig-for-ncursesw-cflags.patch
|
|
PROCPS_NG_AUTORECONF = YES
|
|
PROCPS_NG_GETTEXTIZE = YES
|
|
|
|
# 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_NEEDS_GETTEXT_IF_LOCALE),y)
|
|
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
|
|
else
|
|
PROCPS_NG_CONF_OPTS += --without-systemd
|
|
endif
|
|
|
|
# Make sure binaries get installed in /bin, so that they overwrite
|
|
# their busybox counterparts.
|
|
# 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)
|
|
PROCPS_NG_CONF_OPTS += \
|
|
--enable-watch8bit
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|