sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (91b448c085c3874a0aab256fc9a2ddd7bb267a65)
- From: Treeve Jelbert <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (91b448c085c3874a0aab256fc9a2ddd7bb267a65)
- Date: Wed, 3 Jan 2007 10:43:41 -0600
GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:
database/firebird/HISTORY | 5 +++++
database/firebird/PRE_BUILD | 10 +++++++---
database/firebird/fb1.5.patch.bz2 |binary
database/firebird/fb15.patch.bz2 | 0
database/firebird/fb2.0.patch.bz2 |binary
database/firebird/fb2.patch.bz2 | 0
dev/null |binary
7 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 91b448c085c3874a0aab256fc9a2ddd7bb267a65
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>
firebird - fix PRE_BUILD
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 7f22c95..672bab8 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,8 @@
+2007-01-03 Treeve Jelbert <treeve AT pi.be>
+ * PRE_BUILD: fix typo, simplify logic
+ check for a running server
+ * fb*.patch.bz2: rename
+
2007-01-01 Treeve Jelbert <treeve AT pi.be>
* PRE_BUILD: simplify patching logic
* DETAILS, PREPARE, DEPENDS: change query variable for easier future
expansion
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index 68e2deb..7b1d0cb 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -1,3 +1,9 @@
+# check for running server
+ (ps -u firebird | grep fb*) &&
+ message ${PROBLEM_COLOR}please stop the firebird server and try again\
+ ${DEFAULT_COLOR} &&
+ return 1
+
create_account firebird &&
default_pre_build &&
cd $SOURCE_DIRECTORY &&
@@ -8,10 +14,8 @@
# remove supplied ICU & editline packages
rm -rf extern &&
# fix for gcc4 and smgl issues
- local PATCH &&
- PATCH=fb${FB_VER//.*}.patch.bz2 &&
#apply patches
- bzcat $SPELL_DIRECTORY/$PATCH | patch -p1 &&
+ bzcat ${SPELL_DIRECTORY}/fb${FB_VER}.patch.bz2 | patch -p1 &&
# run autogen
NOCONFIGURE=1 . ./autogen.sh
diff --git a/database/firebird/fb1.5.patch.bz2
b/database/firebird/fb1.5.patch.bz2
new file mode 100644
index 0000000..df466fb
Binary files /dev/null and b/database/firebird/fb1.5.patch.bz2 differ
diff --git a/database/firebird/fb15.patch.bz2
b/database/firebird/fb15.patch.bz2
deleted file mode 100644
index df466fb..0000000
Binary files a/database/firebird/fb15.patch.bz2 and /dev/null differ
diff --git a/database/firebird/fb2.0.patch.bz2
b/database/firebird/fb2.0.patch.bz2
new file mode 100644
index 0000000..91d8c09
Binary files /dev/null and b/database/firebird/fb2.0.patch.bz2 differ
diff --git a/database/firebird/fb2.patch.bz2 b/database/firebird/fb2.patch.bz2
deleted file mode 100644
index 91d8c09..0000000
Binary files a/database/firebird/fb2.patch.bz2 and /dev/null differ
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (91b448c085c3874a0aab256fc9a2ddd7bb267a65), Treeve Jelbert, 01/03/2007
Archive powered by MHonArc 2.6.24.