diff options
| author | George McCollister <george.mccollister@gmail.com> | 2011-08-23 14:06:33 -0500 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-28 17:18:49 +0200 |
| commit | 247442f770e20581fa4b500b45c09d502e5cd5f9 (patch) | |
| tree | 69967241924a848692c99df630c0a978f034d006 | |
| parent | ef860295ea80101d7d992bb2450ff887fea0d288 (diff) | |
| download | ptxdist-247442f770e20581fa4b500b45c09d502e5cd5f9.tar.gz ptxdist-247442f770e20581fa4b500b45c09d502e5cd5f9.tar.xz | |
procps: make it build with make 3.82
Fix Makefile so procps builds with make 3.82. From upstream CVS. See patch
file for details.
Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/procps-3.2.8/0071-fix-build-with-make-3.82.patch | 36 | ||||
| -rw-r--r-- | patches/procps-3.2.8/series | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/patches/procps-3.2.8/0071-fix-build-with-make-3.82.patch b/patches/procps-3.2.8/0071-fix-build-with-make-3.82.patch new file mode 100644 index 000000000..9a963fe3a --- /dev/null +++ b/patches/procps-3.2.8/0071-fix-build-with-make-3.82.patch @@ -0,0 +1,36 @@ +From 7d6a81c2324575ad7d6f394e98b5ae231e99ab5d Mon Sep 17 00:00:00 2001 +From: George McCollister <george.mccollister@gmail.com> +Date: Tue, 23 Aug 2011 13:51:43 -0500 +Subject: [PATCH 71/71] fix build with make 3.82 + +I pulled this patch from upstream. +http://procps.cvs.sourceforge.net/viewvc/procps/procps/Makefile?r1=1.70&r2=1.71 + +Revision 1.71 +Mon Feb 28 02:51:09 2011 UTC (5 months, 3 weeks ago) by albert +Branch: MAIN +CVS Tags: HEAD +Changes since 1.70: +1 -1 lines +possible to build with make 3.82 gen303120 -- thanks Elias Pipping + +Signed-off-by: George McCollister <george.mccollister@gmail.com> +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index a83df5e..c1bf8f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES) + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ps/module.mk + + do_all: $(ALL) + +-- +1.7.6 + diff --git a/patches/procps-3.2.8/series b/patches/procps-3.2.8/series index 1a4bde253..7bceef968 100644 --- a/patches/procps-3.2.8/series +++ b/patches/procps-3.2.8/series @@ -68,3 +68,4 @@ 0068-top_username_parse.patch 0069-don-t-install-stuff-that-was-not-built.patch 0070-remove-frename-registers-option-due-to-ICE-on-gcc-4..patch +0071-fix-build-with-make-3.82.patch |