NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
279f4a0eaa
kumquat-buildroot/package/procps-ng/procps-ng.mk

51 lines
1.6 KiB
Makefile
Raw Normal View History

package/procps: bump version and rename to procps-ng procps is getting replaced by procps-ng, and there are new versions available! procps-ng is now an autotools package, so get rid of our custom build/install rules. Remove most patches, except for one that still half-applies, so update and rename it. procps is dead, long live procps-ng! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 22:27:22 +02:00
################################################################################
#
packages: fix the header package name According to the documentation: "Header: The file starts with a header. It contains the module name, preferably in lowercase, enclosed between separators made of 80 hashes." This patch makes the appropriate changes. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-24 09:34:20 +02:00
# procps-ng
package/procps: bump version and rename to procps-ng procps is getting replaced by procps-ng, and there are new versions available! procps-ng is now an autotools package, so get rid of our custom build/install rules. Remove most patches, except for one that still half-applies, so update and rename it. procps is dead, long live procps-ng! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 22:27:22 +02:00
#
################################################################################
package/procps-ng: bump version to 3.3.11 to fix musl build Rebased 0002-use-pkgconfig-for-ncursesw-cflags.patch The build error has not yet been found by the autobuilders: watch.c:564:37: error: request for member ‘chars’ in something not a structure or union exit_early = (wchar_t) c != oldc.chars[0]; ^ watch.c:573:5: error: unknown type name ‘cchar_t’ cchar_t oldc; Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-31 13:04:16 +01:00
PROCPS_NG_VERSION = 3.3.11
package/procps: bump version and rename to procps-ng procps is getting replaced by procps-ng, and there are new versions available! procps-ng is now an autotools package, so get rid of our custom build/install rules. Remove most patches, except for one that still half-applies, so update and rename it. procps is dead, long live procps-ng! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 22:27:22 +02:00
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: add INSTALL_STAGING=YES Procps-ng libraries needed in the staging directory by the new package openvmtools. Signed-off-by: Karoly Kasza <kaszak@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-02 16:57:33 +02:00
PROCPS_NG_INSTALL_STAGING = YES
procps-ng: add dependency on host-pkgconf procps-ng configure.ac script uses PKG_CHECK_MODULES(), which needs pkg-config. Until now, it wasn't mandatory since for the ncurses check it tries PKG_CHECK_MODULES() and then falls back to AC_CHECK_LIB(), but for the upcoming systemd support, pkg-config is really needed. Since pkg-config is used both for the ncurses and systemd checks, we make it a mandatory dependency. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-04 17:27:44 +02:00
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf
procps-ng: fix/patch wrong ncursesw headers assumption The configure script/code assumes ncursesw headers live in /usr/include/ncursesw. That's a distribution-ism where they want to have both versions for ABI/API compatibility, but not the case for embedded where that's not a concern. Hence kill the hard-coding and use pkg-config to find this out instead of the half-made effort about it. Fixes: http://autobuild.buildroot.net/results/97d/97dc7f238457609c861c24f81b556973f5dec9c1/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 00:50:06 +02:00
# For 0002-use-pkgconfig-for-ncursesw-cflags.patch
PROCPS_NG_AUTORECONF = YES
procps-ng: needs gettextize Fixes: http://autobuild.buildroot.org/results/904/90401cdb471f9e9582e2ca2ad07fb3db148420d7/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-10 20:26:49 +02:00
PROCPS_NG_GETTEXTIZE = YES
package/procps: bump version and rename to procps-ng procps is getting replaced by procps-ng, and there are new versions available! procps-ng is now an autotools package, so get rid of our custom build/install rules. Remove most patches, except for one that still half-applies, so update and rename it. procps is dead, long live procps-ng! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 22:27:22 +02:00
procps-ng: Fix installation and take precedence over busybox Currently procps-ng binaries are installed under $(TARGET_DIR)/usr/usr instead of $(TARGET_DIR)/usr, which would be the expected. This is caused because the default value of the --exec-prefix configure option is /usr, and Buildroot always adds --prefix=/usr to the configure option. We fix this by setting --exec-prefix to an empty value. At the same time we make sure the procps-ng binaries have precedence over the busybox ones. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Markos.Chandras <Markos.Chandras@imgtec.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-10 16:30:06 +02:00
# 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
package/procps-ng: fix linking with intl procps-ng doesn't build with (e)glibc toolchain when gettext package is selected. With (e)glibc libintl is provided by the libc whereas with uClibc it's provided by gettext. Linking with intl is only needed if the toolchain needs gettext and locale is set. Fixes: http://autobuild.buildroot.net/results/3e8/3e8464e0b00ce22fa02a6337159fca250d86425c/build-end.log Signed-off-by: Romain Naour <romain.naour@openwide.fr> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-21 15:56:07 +02:00
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
package/procps-ng: needs gettext if locales Fixes: http://autobuild.buildroot.net/results/88a/88a2c8907dce0e5abe0d544ce9a2875dfdcc9e7c/ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-03 12:11:14 +02:00
PROCPS_NG_DEPENDENCIES += gettext
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
PROCPS_NG_CONF_OPTS += LIBS=-lintl
package/procps-ng: needs gettext if locales Fixes: http://autobuild.buildroot.net/results/88a/88a2c8907dce0e5abe0d544ce9a2875dfdcc9e7c/ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-03 12:11:14 +02:00
endif
package/procps-ng: if building with systemd, enable systemd-specific features [Thomas: add explicit --without-systemd option when systemd is not available.] Signed-off-by: Steven Noonan <steven@uplinklabs.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-18 22:44:42 +01:00
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
PROCPS_NG_DEPENDENCIES += systemd
PROCPS_NG_CONF_OPTS += --with-systemd
else
PROCPS_NG_CONF_OPTS += --without-systemd
endif
package/procps-ng: Fix install, procps-ng does not use /usr/bin anymore We do not need to move binaries around anymore since this commit: https://gitlab.com/procps-ng/procps/commit/430b559ba2826f80dffa840622ae0fc744000b13 Removing PROCPS_NG_CONF_OPTS completely leads to binaries being installed to /usr/bin, we still have to define a custom --exec-prefix to get binaries in /bin: libtool: install: /usr/bin/install -c free /home/bernd/buildroot/output/target/bin/free libtool: install: /usr/bin/install -c pgrep /home/bernd/buildroot/output/target/bin/pgrep libtool: install: /usr/bin/install -c pkill /home/bernd/buildroot/output/target/bin/pkill libtool: install: /usr/bin/install -c pmap /home/bernd/buildroot/output/target/bin/pmap libtool: install: /usr/bin/install -c pwdx /home/bernd/buildroot/output/target/bin/pwdx libtool: install: /usr/bin/install -c tload /home/bernd/buildroot/output/target/bin/tload libtool: install: /usr/bin/install -c uptime /home/bernd/buildroot/output/target/bin/uptime libtool: install: /usr/bin/install -c vmstat /home/bernd/buildroot/output/target/bin/vmstat libtool: install: /usr/bin/install -c w /home/bernd/buildroot/output/target/bin/w libtool: install: /usr/bin/install -c pidof /home/bernd/buildroot/output/target/bin/pidof libtool: install: /usr/bin/install -c kill /home/bernd/buildroot/output/target/bin/kill libtool: install: /usr/bin/install -c slabtop /home/bernd/buildroot/output/target/bin/slabtop libtool: install: /usr/bin/install -c watch /home/bernd/buildroot/output/target/bin/watch libtool: install: /usr/bin/install -c top/top /home/bernd/buildroot/output/target/bin/top Fixes: http://autobuild.buildroot.net/results/ab7/ab7ed83d60823c1b023c7b76fcbe9c20d537ed4c// Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Thomas: pass --exec-prefix=/ instead of an empty prefix.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-01 23:21:27 +01:00
# Make sure binaries get installed in /bin, so that they overwrite
# their busybox counterparts.
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>
2016-03-26 14:27:36 +01:00
# 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
procps-ng: Fix installation and take precedence over busybox Currently procps-ng binaries are installed under $(TARGET_DIR)/usr/usr instead of $(TARGET_DIR)/usr, which would be the expected. This is caused because the default value of the --exec-prefix configure option is /usr, and Buildroot always adds --prefix=/usr to the configure option. We fix this by setting --exec-prefix to an empty value. At the same time we make sure the procps-ng binaries have precedence over the busybox ones. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Markos.Chandras <Markos.Chandras@imgtec.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-10 16:30:06 +02:00
package/procps-ng: enable UTF-8 support For an example of why to enable this: https://bugs.archlinux.org/task/38614 Signed-off-by: Steven Noonan <steven@uplinklabs.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-18 22:44:44 +01:00
# Allows unicode characters to show in 'watch'
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
PROCPS_NG_CONF_OPTS += \
--enable-watch8bit
endif
package/procps: bump version and rename to procps-ng procps is getting replaced by procps-ng, and there are new versions available! procps-ng is now an autotools package, so get rid of our custom build/install rules. Remove most patches, except for one that still half-applies, so update and rename it. procps is dead, long live procps-ng! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 22:27:22 +02:00
$(eval $(autotools-package))
Reference in New Issue Copy Permalink