Browse Source

procps: Update from 3.3.10 to 3.3.11

android-5
Fredrik Fornwall 9 years ago
parent
commit
b5dfb604e9
  1. 23
      packages/procps/Makefile.in.patch
  2. 9
      packages/procps/build.sh
  3. 22
      packages/procps/top-makefile.in.patch

23
packages/procps/Makefile.in.patch

@ -0,0 +1,23 @@
diff -u -r ../procps-ng-3.3.11/Makefile.in ./Makefile.in
--- ../procps-ng-3.3.11/Makefile.in 2015-08-09 03:57:07.937259593 -0400
+++ ./Makefile.in 2015-12-15 06:46:35.530449934 -0500
@@ -296,9 +296,11 @@
tload_LDADD = $(LDADD)
tload_DEPENDENCIES = ./proc/libprocps.la
am__top_top_SOURCES_DIST = top/top.h top/top.c top/top_nls.h \
+ top/strverscmp.c \
top/top_nls.c lib/fileutils.c
@WITH_NCURSES_TRUE@am_top_top_OBJECTS = top/top.$(OBJEXT) \
@WITH_NCURSES_TRUE@ top/top_nls.$(OBJEXT) \
+@WITH_NCURSES_TRUE@ top/strverscmp.$(OBJEXT) \
@WITH_NCURSES_TRUE@ lib/fileutils.$(OBJEXT)
top_top_OBJECTS = $(am_top_top_OBJECTS)
@WITH_NCURSES_TRUE@top_top_DEPENDENCIES = $(LDADD) \
@@ -661,6 +663,7 @@
@WITH_NCURSES_TRUE@top_top_SOURCES = \
@WITH_NCURSES_TRUE@ top/top.h \
@WITH_NCURSES_TRUE@ top/top.c \
+@WITH_NCURSES_TRUE@ top/strverscmp.c \
@WITH_NCURSES_TRUE@ top/top_nls.h \
@WITH_NCURSES_TRUE@ top/top_nls.c \
@WITH_NCURSES_TRUE@ lib/fileutils.c

9
packages/procps/build.sh

@ -1,7 +1,6 @@
TERMUX_PKG_HOMEPAGE=https://packages.debian.org/sid/procps TERMUX_PKG_HOMEPAGE=https://packages.debian.org/sid/procps
TERMUX_PKG_DESCRIPTION="Utilities that give information about processes using the /proc filesystem" TERMUX_PKG_DESCRIPTION="Utilities that give information about processes using the /proc filesystem"
TERMUX_PKG_VERSION=3.3.10 TERMUX_PKG_VERSION=3.3.11
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_FOLDERNAME=procps-ng-${TERMUX_PKG_VERSION} TERMUX_PKG_FOLDERNAME=procps-ng-${TERMUX_PKG_VERSION}
@ -10,9 +9,3 @@ TERMUX_PKG_DEPENDS="ncurses"
# https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/141168: # https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/141168:
# "For compatibility between distributions, can we have /bin/kill made available from coreutils?" # "For compatibility between distributions, can we have /bin/kill made available from coreutils?"
TERMUX_PKG_RM_AFTER_INSTALL="bin/kill share/man/man1/kill.1 usr/bin/w share/man/man1/w.1 usr/bin/slabtop share/man/man1/slabtop.1" TERMUX_PKG_RM_AFTER_INSTALL="bin/kill share/man/man1/kill.1 usr/bin/w share/man/man1/w.1 usr/bin/slabtop share/man/man1/slabtop.1"
CPPFLAGS+=" -Ddirect=dirent"
termux_step_post_massage () {
mv usr/bin/* bin/
}

22
packages/procps/top-makefile.in.patch

@ -1,22 +0,0 @@
diff -u -r ../procps-ng-3.3.9/top/Makefile.in ./top/Makefile.in
--- ../procps-ng-3.3.9/top/Makefile.in 2013-12-03 12:23:23.293820882 +0100
+++ ./top/Makefile.in 2014-07-06 07:50:12.794907542 +0200
@@ -103,8 +103,10 @@
"$(DESTDIR)$(procpsngdir)"
PROGRAMS = $(usrbin_exec_PROGRAMS)
am__top_SOURCES_DIST = top.h top.c top_nls.h top_nls.c \
+ strverscmp.c \
$(top_srcdir)/lib/fileutils.c
@WITH_NCURSES_TRUE@am_top_OBJECTS = top.$(OBJEXT) top_nls.$(OBJEXT) \
+@WITH_NCURSES_TRUE@ strverscmp.$(OBJEXT) \
@WITH_NCURSES_TRUE@ fileutils.$(OBJEXT)
top_OBJECTS = $(am_top_OBJECTS)
top_DEPENDENCIES =
@@ -359,6 +361,7 @@
@WITH_NCURSES_TRUE@top_SOURCES = \
@WITH_NCURSES_TRUE@ top.h \
@WITH_NCURSES_TRUE@ top.c \
+@WITH_NCURSES_TRUE@ strverscmp.c \
@WITH_NCURSES_TRUE@ top_nls.h \
@WITH_NCURSES_TRUE@ top_nls.c \
@WITH_NCURSES_TRUE@ $(top_srcdir)/lib/fileutils.c
Loading…
Cancel
Save