Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (eb48303d2e92ee728f94224d9faa1f9abded55b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (eb48303d2e92ee728f94224d9faa1f9abded55b5)
  • Date: Mon, 5 Jan 2015 21:06:49 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 3 +++
database/db48/BUILD | 16 ++++++++++++++++
database/db48/DEPENDS | 1 +
database/db48/DETAILS | 22 ++++++++++++++++++++++
database/db48/HISTORY | 9 +++++++++
net/bitcoin/BUILD | 6 +++++-
net/bitcoin/DEPENDS | 7 ++++---
net/bitcoin/DETAILS | 8 ++++----
net/bitcoin/HISTORY | 7 +++++++
net/bitcoin/INSTALL | 1 -
net/bitcoin/PRE_BUILD | 2 +-
11 files changed, 72 insertions(+), 10 deletions(-)

New commits:
commit eb48303d2e92ee728f94224d9faa1f9abded55b5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bitcoin 0.9.3

commit e677c27beb4c9b2a307b1d339392cebbe8487d23
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

db48: new spell, Berkeley DB 4.8

Adapted from older version of db, installs to /opt/db48.

Disables everything but what's required for bitcoin and related packages
(i.e no utilities, docs, java, tcl, tests, nor old APIs).

Copied-from: ae123c114f5bd2b76dc0b0cfd95159ecb55bf76a
Cherry-picked: 359a5dc56d10928caaa217a234fb6d5d2a89b954

diff --git a/ChangeLog b/ChangeLog
index f586b05..bf18e71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-01-05 Ismael Luceno <ismael AT sourcemage.org>
+ * database/db48: new spell, Berkeley DB 4.8
+
2015-01-03 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/wok: new spell, static site generator

diff --git a/database/db48/BUILD b/database/db48/BUILD
new file mode 100755
index 0000000..fc00c8d
--- /dev/null
+++ b/database/db48/BUILD
@@ -0,0 +1,16 @@
+# this is needed to make db using stuff work on nptl glibc, do _not_ remove
it!
+if glibc_is_nptl; then
+ LDFLAGS="$LDFLAGS -lpthread"
+fi &&
+
+cd build_unix &&
+
+../dist/configure \
+ --prefix=$INSTALL_ROOT/opt/db48 \
+ --build=$BUILD \
+ --disable-java \
+ --disable-tcl \
+ --disable-test \
+ $OPTS &&
+echo 'install_utilities install_docs:; true' >> Makefile &&
+make
diff --git a/database/db48/DEPENDS b/database/db48/DEPENDS
new file mode 100755
index 0000000..218f15e
--- /dev/null
+++ b/database/db48/DEPENDS
@@ -0,0 +1 @@
+depends -sub CXX gcc --enable-cxx
diff --git a/database/db48/DETAILS b/database/db48/DETAILS
new file mode 100755
index 0000000..47eeaf2
--- /dev/null
+++ b/database/db48/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=db48
+ SPELLX=${SPELL%[0-9][0-9]}
+ VERSION=4.8.30
+
SOURCE_HASH=sha512:d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ GATHER_DOCS=off
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=http://download.oracle.com/berkeley-db/$SOURCE
+ LICENSE[0]=http://www.sleepycat.com/company/licensing.html
+ WEB_SITE=http://www.sleepycat.com/
+ ENTERED=20010922
+ KEYWORDS="db database"
+ SHORT='Berkeley DB 4.8'
+cat << EOF
+Berkeley DB is a programmatic toolkit that provides fast, reliable,
+scalable, and mission-critical database support in software ranging from
+applications running on hand-held appliances to enterprise-scale
+servers.
+
+NOTE: This version in deprecated, needed only by a handful of packages for
+compatibility reasons (e.g. bitcoin).
+EOF
diff --git a/database/db48/HISTORY b/database/db48/HISTORY
new file mode 100644
index 0000000..51e77cf
--- /dev/null
+++ b/database/db48/HISTORY
@@ -0,0 +1,9 @@
+2015-01-05 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS:
+ Spell copied from older version of db
+ Adapted to new name
+ Edited description
+ Install to /opt/db48
+ Removed db-1.85 compatibility build flag
+ Disabled Java and Tcl support, and tests
+ Disabled documents and utilities installation
diff --git a/net/bitcoin/BUILD b/net/bitcoin/BUILD
index cea1d16..9fb5ff1 100755
--- a/net/bitcoin/BUILD
+++ b/net/bitcoin/BUILD
@@ -1 +1,5 @@
-make -C src -f makefile.unix 'USE_UPNP='
+PATH="${QTDIR:-$INSTALL_ROOT/usr}/bin/qt4:$PATH" &&
+db48="$INSTALL_ROOT/opt/db48" &&
+CPPFLAGS="$CPPFLAGS -I$db48/include" &&
+LDFLAGS="$LDFLAGS -L$db48/lib" &&
+default_build
diff --git a/net/bitcoin/DEPENDS b/net/bitcoin/DEPENDS
index f7bef0b..918eb2d 100755
--- a/net/bitcoin/DEPENDS
+++ b/net/bitcoin/DEPENDS
@@ -1,5 +1,6 @@
depends -sub CXX gcc &&
-depends wxgtk-new &&
+depends qt4 &&
depends boost &&
-depends db &&
-depends SSL
+depends db48 &&
+depends SSL &&
+optional_depends miniupnpc --with{,out}-miniupnpc 'for UPnP support'
diff --git a/net/bitcoin/DETAILS b/net/bitcoin/DETAILS
index 281106d..f3f25bb 100755
--- a/net/bitcoin/DETAILS
+++ b/net/bitcoin/DETAILS
@@ -1,8 +1,8 @@
SPELL=bitcoin
- VERSION=0.3.22rc3
- SOURCE=$SPELL-$VERSION-src.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:51ba8d034d05e96a15fd5f336a630cc707ceabe8a27eebe0c76edcda6462e318232ce740f94a75e07cc0f646d22577a4c58321ada5be9e290f0ef14f708918bd
+ VERSION=0.9.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://bitcoin.org";
LICENSE[0]=MIT
diff --git a/net/bitcoin/HISTORY b/net/bitcoin/HISTORY
index 1338ca4..be90aed 100644
--- a/net/bitcoin/HISTORY
+++ b/net/bitcoin/HISTORY
@@ -1,3 +1,10 @@
+2015-01-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.3, new SOURCE_URL
+ * BUILD, DEPENDS: Added optional dependency on miniupnpc
+ Switched deps, wxWidgets => Qt4, db => db48
+ * PRE_BUILD: run ./autogen.sh
+ * INSTALL: Removed, not needed anymore
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/net/bitcoin/INSTALL b/net/bitcoin/INSTALL
deleted file mode 100755
index c31c1be..0000000
--- a/net/bitcoin/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-install -m755 src/bitcoin $INSTALL_ROOT/usr/bin/
diff --git a/net/bitcoin/PRE_BUILD b/net/bitcoin/PRE_BUILD
index 2196b68..5a7638b 100755
--- a/net/bitcoin/PRE_BUILD
+++ b/net/bitcoin/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i -e '/-Wl,-Bstatic/d' src/makefile.unix
+./autogen.sh



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (eb48303d2e92ee728f94224d9faa1f9abded55b5), Ismael Luceno, 01/05/2015

Archive powered by MHonArc 2.6.24.

Top of Page