Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (32bad0b008b0addfb79bc7be90e1992148da2727)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (32bad0b008b0addfb79bc7be90e1992148da2727)
  • Date: Tue, 19 Jun 2007 10:44:31 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird/BUILD | 6 ++++--
database/firebird/DEPENDS | 26 +++++++++++++++++++++-----
database/firebird/DETAILS | 6 +++---
database/firebird/HISTORY | 6 ++++++
database/firebird/fb2.1.patch.bz2 |binary
5 files changed, 34 insertions(+), 10 deletions(-)

New commits:
commit a3365cc68131a28cf4d843ac78b28a8dcf275297
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird-2.1.0.15999-Beta1

diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index dc9bccd..b4e1a51 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -1,14 +1,16 @@
- local FF FileName DB LCK ll &&
+ local FF FileName DB LCK LL &&
persistent_add FB_PREFIX &&
FB_PREFIX=${INSTALL_ROOT}/usr/firebird &&
OPTS="${OPTS} ${FB_SS}" &&
+if [ $$FB_VER != 2.1 ];then
if spell_ok icu; then
ICU_FLAGS=`icu-config --ldflags-libsonly` &&
LDFLAGS="$LDFLAGS $ICU_FLAGS"
fi &&
if spell_ok libedit; then
LDFLAGS="$LDFLAGS -ledit"
- fi &&
+ fi
+fi &&
# prepare optional language support
for LL in $FB_GPRE; do
if [ $LL != none ]; then
diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index 249dc8b..c7c06f9 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -4,8 +4,24 @@ depends openssl &&
depends libmcrypt &&
depends ncurses &&
case $FB_VER in
- 1.5) depends bison;;
- 2.0) depends bison && depends icu;;
- 2.1) depends btyacc && depends icu;;
-esac &&
-optional_depends libedit "--with-editline" "--without-editline" "for fancy
line editing"
+ 1.5) depends bison &&
+ optional_depends libedit \
+ "--with-editline" \
+ "--without-editline" \
+ "for fancy line editing"
+ ;;
+ 2.0) depends bison &&
+ depends icu &&
+ optional_depends libedit \
+ "--with-editline" \
+ "--without-editline" \
+ "for fancy line editing"
+ ;;
+ 2.1) depends btyacc &&
+ depends icu '--with-system-icu' &&
+ optional_depends libedit \
+ "-with-system-editline" \
+ "--without-editline" \
+ "for fancy line editing"
+ ;;
+esac
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index b65d840..336efe6 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -17,10 +17,10 @@ case $FB_VER in
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
;;
2.1)
- VERSION=2.1.0.15199-Alpha1
+ VERSION=2.1.0.15999-Beta1
SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:e70e3e13b1f522018bcbf044fc0982a2da37c38f3d5ab27e0289507b36c90da597e83dcdcb0259edf3fbd6668107fbd0f80f0c4a57c95b24a4723bab9e523218
- SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/$SOURCE
+
SOURCE_HASH=sha512:fe6dfc42fb01ed1cc83c02cbbf49bcc5541c638d76a29eed405cea1185a45fa560e7d8df6364304d7c7304c870cdd05e86d38a2234dd058d15fa302c49df416f
+ SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
# SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION}
;;
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index fd7aea4..97cc27c 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,9 @@
+2007-06-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.0.15999-Beta1
+ * DEPENDS: use new --with-system-{icu,editline} options
+ * fb2.1.patch.bz2: updated
+ * BUILD: bypass icu/libedit related code for fb2.1
+
2007-05-07 Treeve Jelbert <treeve AT sourcemage.org>
* volatiles: fix typo
* REPAIR^a0c257655c2c986a126a1e0c0297d97a^volatiles: add
diff --git a/database/firebird/fb2.1.patch.bz2
b/database/firebird/fb2.1.patch.bz2
index 8c1ef97..f32c6e5 100644
Binary files a/database/firebird/fb2.1.patch.bz2 and
b/database/firebird/fb2.1.patch.bz2 differ



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (32bad0b008b0addfb79bc7be90e1992148da2727), Treeve Jelbert, 06/19/2007

Archive powered by MHonArc 2.6.24.

Top of Page