1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-12-23 23:50:51 +01:00

Bump procps-ng version

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-04-05 23:06:54 +02:00
parent 14c8a79268
commit 60efe6d501
3 changed files with 49 additions and 10 deletions

View file

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -16818,12 +16818,12 @@ if test -n "$NCURSES_CFLAGS"; then
@@ -16855,12 +16855,12 @@ if test -n "$NCURSES_CFLAGS"; then
pkg_cv_NCURSES_CFLAGS="$NCURSES_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@ -16,7 +16,7 @@
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16835,12 +16835,12 @@ if test -n "$NCURSES_LIBS"; then
@@ -16872,12 +16872,12 @@ if test -n "$NCURSES_LIBS"; then
pkg_cv_NCURSES_LIBS="$NCURSES_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@ -32,7 +32,7 @@
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -16861,21 +16861,21 @@ else
@@ -16898,21 +16898,21 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@ -60,7 +60,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16895,23 +16895,23 @@ return initscr ();
@@ -16932,23 +16932,23 @@ return initscr ();
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@ -90,7 +90,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
@@ -16930,19 +16930,19 @@ done
@@ -16967,19 +16967,19 @@ done
if test "x$have_ncurses" = xno; then
as_fn_error $? "ncurses support missing/incomplete (for partial build use --without-ncurses)" "$LINENO" 5
fi
@ -115,7 +115,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16962,23 +16962,23 @@ return initscr ();
@@ -16999,23 +16999,23 @@ return initscr ();
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@ -145,7 +145,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
@@ -16997,7 +16997,7 @@ done
@@ -17034,7 +17034,7 @@ done
if test "x$have_ncurses" = xno; then
as_fn_error $? "ncurses support missing/incomplete (for partial build use --without-ncurses)" "$LINENO" 5
fi

39
pkg/procps-ng/0002.patch Normal file
View file

@ -0,0 +1,39 @@
--- a/include/nls.h.old
+++ b/include/nls.h
@@ -6,7 +6,7 @@
#define PROCPS_NG_NLS_H
/* programs issuing textdomain() need PACKAGE string */
-#include "../config.h"
+#include "config.h"
/* programs issuing bindtextdomain() also need LOCALEDIR string */
#ifndef LOCALEDIR
--- a/procio.c.old
+++ b/procio.c
@@ -24,7 +24,6 @@
#endif
#include <errno.h>
#include <fcntl.h>
-#include <libio.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
--- a/proc/numa.h.old
+++ b/proc/numa.h
@@ -22,6 +22,14 @@
#include <features.h>
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
__BEGIN_DECLS
void numa_init (void);

View file

@ -1,8 +1,8 @@
VERSION="3.3.12"
VERSION="3.3.13"
SRCDIR="procps-ng-${VERSION}"
TARBALL="${SRCDIR}.tar.xz"
URL="https://sourceforge.net/projects/procps-ng/files/Production"
SHA256SUM="6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4"
SHA256SUM="52b05b2bd5b05f46f24766a10474337ebadd828df9915e2b178df291cf88f7d3"
DEPENDS="ncurses"
prepare() {
@ -14,7 +14,7 @@ build() {
ac_cv_func_realloc_0_nonnull=yes \
$1/configure --prefix="" --host="$TARGET" --disable-static \
--enable-watch8bit --with-ncurses --without-systemd \
--disable-kill --sbindir=/bin
--disable-kill --disable-numa --sbindir=/bin
make -j $NUMJOBS
}