diff options
| author | Eric Sandall | 2010-10-06 15:45:37 -0700 |
|---|---|---|
| committer | George Sherwood | 2010-10-16 14:54:53 -0500 |
| commit | 3168ed53c71167c78676fe0b72ab6cc4549dd0e5 (patch) | |
| tree | 749549d6010eb829b7d73de9166ea773b87c23f4 | |
| parent | 9165a3edd7497ef84f08a726578772e8505474ed (diff) | |
procps: Fix overzealous make 3.82 syntax
http://old.nabble.com/make-3.81.91---procps-3.2.8-td29281048.html
(cherry picked from commit 513820372c556b4d9834ff589b0dd63d60347075)
| -rw-r--r-- | utils/procps/HISTORY | 5 | ||||
| -rwxr-xr-x | utils/procps/PRE_BUILD | 5 | ||||
| -rw-r--r-- | utils/procps/make.patch | 12 |
3 files changed, 22 insertions, 0 deletions
diff --git a/utils/procps/HISTORY b/utils/procps/HISTORY index 7441b9f35c..395726e83a 100644 --- a/utils/procps/HISTORY +++ b/utils/procps/HISTORY @@ -1,3 +1,8 @@ +2010-10-06 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Apply make.patch + * make.patch: Fix overzealous make 3.82 syntax + http://old.nabble.com/make-3.81.91---procps-3.2.8-td29281048.html + 2010-09-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * BUILD, PRE_BUILD: moved sediting to PRE_BUILD diff --git a/utils/procps/PRE_BUILD b/utils/procps/PRE_BUILD index e26d46f2f2..5387f930c9 100755 --- a/utils/procps/PRE_BUILD +++ b/utils/procps/PRE_BUILD @@ -1,5 +1,10 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && + +message "${MESSAGE_COLOR}Patching for make 3.82 syntax...${DEFAULT_COLOR}" && +patch "$SOURCE_DIRECTORY"/Makefile \ + "$SPELL_DIRECTORY"/make.patch && + sedit "s/-O2/${CFLAGS}/" Makefile && sedit "s/^lib64 .*/lib64 := lib/" Makefile && sedit "s/-ffast-math//" Makefile && diff --git a/utils/procps/make.patch b/utils/procps/make.patch new file mode 100644 index 0000000000..a3c15309dd --- /dev/null +++ b/utils/procps/make.patch @@ -0,0 +1,12 @@ +diff -Naur procps-3.2.8.orig/Makefile procps-3.2.8/Makefile +--- procps-3.2.8.orig/Makefile 2010-10-06 15:42:36.599000041 -0700 ++++ procps-3.2.8/Makefile 2010-10-06 15:43:11.465000303 -0700 +@@ -174,7 +174,7 @@ + # 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) + |