Skip to Content.
Sympa Menu

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

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 (8817a34c7248299355d62ccf4d456faa231aaf40)
  • Date: Mon, 1 Feb 2010 15:25:16 -0600

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

database/firebird25/BUILD | 16 ++++++++++------
database/firebird25/CONFIGURE | 2 +-
database/firebird25/DEPENDS | 18 +++---------------
database/firebird25/DETAILS | 4 ++--
database/firebird25/HISTORY | 13 +++++++++++++
database/firebird25/PREPARE | 6 ++++++
database/firebird25/PRE_BUILD | 6 ------
database/firebird25/UP_TRIGGERS | 16 ----------------
database/firebird25/fb25.patch.bz2 |binary
9 files changed, 35 insertions(+), 46 deletions(-)

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

firebird25: => 2.5.0.25916-ReleaseCandidate2

commit 50cb7cc6c6eb3c29b4faa8cc4c2ae41a2d0edc3a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird25 - build fixes for multiple jobs

Conflicts:

database/firebird25/HISTORY
database/firebird25/PRE_BUILD

diff --git a/database/firebird25/BUILD b/database/firebird25/BUILD
index 4e9e1dc..96e3d15 100755
--- a/database/firebird25/BUILD
+++ b/database/firebird25/BUILD
@@ -14,7 +14,14 @@
./configure \
--prefix=$FB_PREFIX \
$OPTS &&
+
+# the first stage must be single-threaded
+make_single &&
+make Makefile.boot.gpre &&
+make_normal &&
+
if [[ $FB_CLIENT == n ]]; then
+# build everything else
make &&
cd $SOURCE_DIRECTORY/gen/firebird &&
# fix ownership and permissions
@@ -41,11 +48,8 @@ if [[ $FB_CLIENT == n ]]; then
chown firebird:firebird $DB
done
else
- cd gen &&
- make includes &&
- make -f Makefile.boot.gpre &&
- make -f Makefile.libfbclient &&
- make -f Makefile.client.isql
+ make Makefile.libfbclient &&
+ make Makefile.client.isql
# probably need to build gbak and then restore messages and help fdb
-# make -f Makefile.client.gbak
+# make Makefile.client.gbak
fi
diff --git a/database/firebird25/CONFIGURE b/database/firebird25/CONFIGURE
index 3afa864..c76f707 100755
--- a/database/firebird25/CONFIGURE
+++ b/database/firebird25/CONFIGURE
@@ -1,4 +1,4 @@
-#source $GRIMOIRE/FUNCTIONS &&
+source $GRIMOIRE/FUNCTIONS &&
config_query FB_CLIENT "Build only client library?" n
if [ $FB_CLIENT == n ]; then
config_query_multi FB_GPRE "which additional GPRE languages to support?" \
diff --git a/database/firebird25/DEPENDS b/database/firebird25/DEPENDS
index 12f8074..db1afc8 100755
--- a/database/firebird25/DEPENDS
+++ b/database/firebird25/DEPENDS
@@ -3,20 +3,8 @@ depends libtool &&
depends openssl &&
depends libmcrypt &&
depends ncurses &&
-case $FB_VER in
- 2.0) depends bison &&
- depends icu &&
- optional_depends libedit \
- "--with-editline" \
+depends btyacc &&
+depends icu '--with-system-icu' &&
+optional_depends libedit "-with-system-editline" \
"--without-editline" \
"for fancy line editing"
- ;;
- 2.1 | 2.5)
- depends btyacc &&
- depends icu '--with-system-icu' &&
- optional_depends libedit \
- "-with-system-editline" \
- "--without-editline" \
- "for fancy line editing"
- ;;
-esac
diff --git a/database/firebird25/DETAILS b/database/firebird25/DETAILS
index 8f32056..673930c 100755
--- a/database/firebird25/DETAILS
+++ b/database/firebird25/DETAILS
@@ -1,7 +1,7 @@
SPELL=firebird25
SPELLX=Firebird
- VERSION=2.5.0.25784-ReleaseCandidate1
-
SOURCE_HASH=sha512:7227b39cd73477dc50123999f819b52cdaaf19a37bc583bae77b4ae68743a7fff51b67eebab28e4faa8ba15af47e9560b94d5284fac639ac74e882879f652fd0
+ VERSION=2.5.0.25916-ReleaseCandidate2
+
SOURCE_HASH=sha512:f9781d3993a7f6943ab5e63d095550b87cfc975a0927d549b0a46c4f68700d41c4b386a08ae1973aa1af2addb66e511c668dbc023a63c394acc09c851ac094e6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION/-0\.RC?/}
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
diff --git a/database/firebird25/HISTORY b/database/firebird25/HISTORY
index 44bdf16..adba1de 100644
--- a/database/firebird25/HISTORY
+++ b/database/firebird25/HISTORY
@@ -1,3 +1,16 @@
+2010-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.0.25916-ReleaseCandidate2
+ * fb25.oatch.bz2: updated
+ * PREPARE, CONFIGURE: fix typos
+
+2010-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: remove some old files
+ * BUILD: use make_single for first part of build
+ * PREPARE: added, check for running server
+ * PRE_BUILD: remove server check
+ * DEPENDS: remove obsolete stuff
+ * UP_TRIGGERS: deleted, not relevant
+
2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* PROVIDES: add FIREBIRD
create separate firebird25 spell
diff --git a/database/firebird25/PREPARE b/database/firebird25/PREPARE
new file mode 100755
index 0000000..859e68a
--- /dev/null
+++ b/database/firebird25/PREPARE
@@ -0,0 +1,6 @@
+# check for running server
+ (ps -u firebird | grep fb*) &&
+ message ${PROBLEM_COLOR}please stop the firebird server and try again\
+ ${DEFAULT_COLOR} &&
+ return 1
+return 0
diff --git a/database/firebird25/PRE_BUILD b/database/firebird25/PRE_BUILD
index 9ac431a..52118ff 100755
--- a/database/firebird25/PRE_BUILD
+++ b/database/firebird25/PRE_BUILD
@@ -1,9 +1,3 @@
- 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 &&
diff --git a/database/firebird25/UP_TRIGGERS b/database/firebird25/UP_TRIGGERS
deleted file mode 100755
index e9e98d5..0000000
--- a/database/firebird25/UP_TRIGGERS
+++ /dev/null
@@ -1,16 +0,0 @@
-# up_trigger everything on major version updates
-
-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if test "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}"; then
- message "This is a possibly incompatible update of firebird..."
- message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libfbclient.so.${OLD_SPELL_VERSION:0:1}"; then
- up_trigger $each cast_self
- fi
- done
- fi
-fi
diff --git a/database/firebird25/fb25.patch.bz2
b/database/firebird25/fb25.patch.bz2
index db885b4..68685c1 100644
Binary files a/database/firebird25/fb25.patch.bz2 and
b/database/firebird25/fb25.patch.bz2 differ



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8817a34c7248299355d62ccf4d456faa231aaf40), Treeve Jelbert, 02/01/2010

Archive powered by MHonArc 2.6.24.

Top of Page