Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (513820372c556b4d9834ff589b0dd63d60347075)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (513820372c556b4d9834ff589b0dd63d60347075)
  • Date: Wed, 6 Oct 2010 17:45:22 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/procps/HISTORY | 5 +++++
utils/procps/PRE_BUILD | 5 +++++
utils/procps/make.patch | 12 ++++++++++++
3 files changed, 22 insertions(+)

New commits:
commit 513820372c556b4d9834ff589b0dd63d60347075
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

procps: Fix overzealous make 3.82 syntax
http://old.nabble.com/make-3.81.91---procps-3.2.8-td29281048.html

diff --git a/utils/procps/HISTORY b/utils/procps/HISTORY
index 7441b9f..395726e 100644
--- a/utils/procps/HISTORY
+++ b/utils/procps/HISTORY
@@ -1,3 +1,8 @@
+2010-10-06 Eric Sandall <sandalle AT 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 AT 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 e26d46f..5387f93 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 0000000..a3c1530
--- /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)
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (513820372c556b4d9834ff589b0dd63d60347075), Eric Sandall, 10/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page