Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Jaka Kranjc : 5083047be344920e5083d34ed0d3f15a68193e86

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Jaka Kranjc : 5083047be344920e5083d34ed0d3f15a68193e86
  • Date: Mon, 29 May 2006 09:38:42 -0500

GIT changes to test grimoire by Jaka Kranjc :
5083047be344920e5083d34ed0d3f15a68193e86 <lynxlynxlynx AT sourcemage.org>:

libs/libsafe-old/BUILD | 2 +-
libs/libsafe-old/HISTORY | 4 ++++
libs/libsafe-old/PRE_REMOVE | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5083047be344920e5083d34ed0d3f15a68193e86
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libsafe-old: fixed #11449

diff --git a/libs/libsafe-old/BUILD b/libs/libsafe-old/BUILD
index d30f03c..36d3a8c 100755
--- a/libs/libsafe-old/BUILD
+++ b/libs/libsafe-old/BUILD
@@ -1,4 +1,4 @@
bzcat $SCRIPT_DIRECTORY/glibc-2.2.4-cleanup_region_start.diff.bz2 | patch
-p1 &&
make &&
# Hack to avoid mayhem if libsafe is removed by dispel
- perl -i -pe 's:\S*/libsafe.\S*::' $INSTALL_ROOT/etc/ld.so.preload &&
+ perl -i -pe 's:\S*/libsafe.\S*::' $INSTALL_ROOT/etc/ld.so.preload
diff --git a/libs/libsafe-old/HISTORY b/libs/libsafe-old/HISTORY
index b941e2b..760351b 100644
--- a/libs/libsafe-old/HISTORY
+++ b/libs/libsafe-old/HISTORY
@@ -1,3 +1,7 @@
+2006-05-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: removed last &&, fixes #11449
+ * PRE_REMOVE: added $INSTALL_ROOT to the perl hack
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/libs/libsafe-old/PRE_REMOVE b/libs/libsafe-old/PRE_REMOVE
index 67d4f37..52e75da 100755
--- a/libs/libsafe-old/PRE_REMOVE
+++ b/libs/libsafe-old/PRE_REMOVE
@@ -1,3 +1,3 @@
# If /lib/libsafe.so is removed then ld.so will complain
# So remove libsafe from ld.so.preload before removing libsafe
-perl -i -pe 's:\S*/libsafe.\S*::' /etc/ld.so.preload
+perl -i -pe 's:\S*/libsafe.\S*::' $INSTALL_ROOT/etc/ld.so.preload



  • [SM-Commit] GIT changes to test grimoire by Jaka Kranjc : 5083047be344920e5083d34ed0d3f15a68193e86, Jaka Kranjc, 05/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page