diff options
| -rw-r--r-- | package/procps/Makefile | 1 | ||||
| -rw-r--r-- | package/procps/patches/patch-Makefile | 39 | ||||
| -rw-r--r-- | package/procps/patches/patch-ps_module_mk | 13 |
3 files changed, 42 insertions, 11 deletions
diff --git a/package/procps/Makefile b/package/procps/Makefile index 375b8f8bb..738ce6bda 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -22,7 +22,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -TARGET_LDFLAGS+= -ltinfo procps-install: ${INSTALL_DIR} ${IDIR_PROCPS}/{bin,sbin,usr/bin} diff --git a/package/procps/patches/patch-Makefile b/package/procps/patches/patch-Makefile index 5849fc343..0f367caf9 100644 --- a/package/procps/patches/patch-Makefile +++ b/package/procps/patches/patch-Makefile @@ -1,16 +1,39 @@ $Id$ --- procps-3.2.8.orig/Makefile 2009-05-10 20:50:48.000000000 +0200 -+++ procps-3.2.8/Makefile 2013-12-23 16:53:06.000000000 +0100 -@@ -27,7 +27,7 @@ TARVERSION := $(VERSION).$(SUBVERSION) ++++ procps-3.2.8/Makefile 2016-08-27 12:47:04.973853763 +0200 +@@ -27,10 +27,7 @@ TARVERSION := $(VERSION).$(SUBVERSION) ldconfig := ldconfig ln_f := ln -f ln_sf := ln -sf -install := install -D --owner 0 --group 0 +- +-# Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) +install := install - # Lame x86-64 /lib64 and /usr/lib64 abomination: - lib64 := lib$(shell [ -d /lib64 ] && echo 64) -@@ -82,7 +82,7 @@ CURSES := -lncurses + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -39,8 +36,8 @@ usr/proc/bin := $(DESTDIR)/u + man1 := $(DESTDIR)/usr/share/man/man1/ + man5 := $(DESTDIR)/usr/share/man/man5/ + man8 := $(DESTDIR)/usr/share/man/man8/ +-lib := $(DESTDIR)/$(lib64)/ +-usr/lib := $(DESTDIR)/usr/$(lib64)/ ++lib := $(DESTDIR)/lib/ ++usr/lib := $(DESTDIR)/usr/lib/ + usr/include := $(DESTDIR)/usr/include/ + + #SKIP := $(bin)kill $(man1)kill.1 +@@ -67,7 +64,7 @@ TARFILES := AUTHORS BUGS NEWS README TOD + # plus the top-level Makefile to make it work stand-alone. + _TARFILES := Makefile + +-CURSES := -lncurses ++CURSES := -lncurses -ltinfo + + # This seems about right for the dynamic library stuff. + # Something like this is probably needed to make the SE Linux +@@ -82,7 +79,7 @@ CURSES := -lncurses # Preprocessor flags. PKG_CPPFLAGS := -D_GNU_SOURCE -I proc @@ -19,7 +42,7 @@ $Id$ ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS) # Left out -Wconversion due to noise in glibc headers. -@@ -102,11 +102,11 @@ PKG_CFLAGS := -fno-common -ffast-math +@@ -102,11 +99,11 @@ PKG_CFLAGS := -fno-common -ffast-math -Wstrict-prototypes -Wmissing-prototypes # Note that some stuff below is conditional on CFLAGS containing # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) @@ -33,7 +56,7 @@ $Id$ ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS) ############ Add some extra flags if gcc allows -@@ -128,7 +128,7 @@ check_gcc = $(shell if $(CC) $(ALL_CPPFL +@@ -128,7 +125,7 @@ check_gcc = $(shell if $(CC) $(ALL_CPPFL # i386 and x86-64, mips and mips64, sparc and sparc64, and so on. # Failure to do so will cause data corruption. m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) @@ -42,7 +65,7 @@ $Id$ ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) ALL_CFLAGS += $(call check_gcc,-Wpadded,) -@@ -222,10 +222,16 @@ clean: +@@ -222,10 +219,16 @@ clean: ###### install $(BINFILES) : all diff --git a/package/procps/patches/patch-ps_module_mk b/package/procps/patches/patch-ps_module_mk index 7d6798e03..6f38d8f12 100644 --- a/package/procps/patches/patch-ps_module_mk +++ b/package/procps/patches/patch-ps_module_mk @@ -1,6 +1,15 @@ $Id$ ---- procps-3.2.7.orig/ps/module.mk Sun Oct 30 03:19:24 2005 -+++ procps-3.2.7/ps/module.mk Tue May 22 14:32:45 2007 +--- procps-3.2.8.orig/ps/module.mk 2005-10-30 04:19:46.000000000 +0100 ++++ procps-3.2.8/ps/module.mk 2016-08-27 12:50:16.938076443 +0200 +@@ -19,7 +19,7 @@ PSSRC := $(addsuffix .c,$(PSNAMES)) + PS_X := COPYING HACKING TRANSLATION common.h module.mk it p ps.1 regression + TARFILES += $(PSSRC) $(addprefix ps/,$(PS_X)) + +-ps/ps: $(PSOBJ) $(LIBPROC) ++ps/ps: $(PSOBJ) proc/libproc.a + $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(ldl) + + # This just adds the stacktrace code @@ -33,8 +33,10 @@ ps/stacktrace.o: ps/stacktrace.c |