Skip to Content.
Sympa Menu

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

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 (98a5ce8ccccd249791dec52bbe4e5040dd33e42d)
  • Date: Sun, 13 Oct 2013 11:26:05 -0500

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

libs/boost/HISTORY | 5 +++++
libs/boost/PRE_BUILD | 5 +++--
libs/boost/PRE_SUB_DEPENDS | 1 +
libs/boost/SUB_DEPENDS | 1 +
libs/boost/atomic.diff | 14 ++++++++++++++
libs/upower/DETAILS | 4 ++--
libs/upower/HISTORY | 3 +++
7 files changed, 29 insertions(+), 4 deletions(-)

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

boost - fix build

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

upower: => 0.9.22

diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 4c80b25..fd80062 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,8 @@
+2013-10-13 Treeeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: apply atomic patch
+ * atomic.diff: added, upstream patch
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: add atomic
+
2013-09-12 Treeeve Jelbert <treeve AT sourcemage.org>
* CONFIGURE, PRE_SUB_DEPENDS, SUB_DEPENDS: add coroutine and log

diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index c70df8d..c3f9eb7 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -3,10 +3,11 @@ message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
$SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&

+cd $SOURCE_DIRECTORY &&
if is_depends_enabled $SPELL python3;then
- cd $SOURCE_DIRECTORY &&
sed -i 's/python$/&3/;s/sys.prefix/(&)/' bootstrap.sh
fi &&
-
+# fix for gcc-4.8.1 & glibc-2.18
+patch -p0 < $SCRIPT_DIRECTORY/atomic.diff &&
message "patching done"

diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index df28479..631c798 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -16,6 +16,7 @@ case $THIS_SUB_DEPENDS in
is_depends_enabled $SPELL python3 ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
+ ATOMIC) list_find "$BOOST_LIBS_AL" atomic ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
CONTEXT) list_find "$BOOST_LIBS_AL" context ;;
COROUTINE) list_find "$BOOST_LIBS_AL" coroutine ;;
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
index c850b32..a1574b0 100755
--- a/libs/boost/SUB_DEPENDS
+++ b/libs/boost/SUB_DEPENDS
@@ -14,6 +14,7 @@ case $THIS_SUB_DEPENDS in
depends PYTHON ;;
SYSTEM) list_add BOOST_LIBS_MZ system ;;
THREAD) list_add BOOST_LIBS_MZ thread ;;
+ ATOMIC) list_add BOOST_LIBS_AL atomic ;;
CHRONO) list_add BOOST_LIBS_AL chrono ;;
CONTEXT) list_add BOOST_LIBS_AL context ;;
COROUTINE) list_add BOOST_LIBS_AL coroutine ;;
diff --git a/libs/boost/atomic.diff b/libs/boost/atomic.diff
new file mode 100644
index 0000000..05df45e
--- /dev/null
+++ b/libs/boost/atomic.diff
@@ -0,0 +1,14 @@
+--- boost/cstdint.hpp 2013-10-13 17:44:03.000000000 +0200
++++ boost/cstdint.hpp.new 2013-10-13 17:45:41.000000000 +0200
+@@ -41,7 +41,10 @@
+ // so we disable use of stdint.h when GLIBC does not define
__GLIBC_HAVE_LONG_LONG.
+ // See https://svn.boost.org/trac/boost/ticket/3548 and
http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) ||
defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H) \
++ && (!defined(__GLIBC__) \
++ || defined(__GLIBC_HAVE_LONG_LONG) \
++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) &&
(__GLIBC_MINOR__ >= 17)))))
+
+ // The following #include is an implementation artifact; not part of
interface.
+ # ifdef __hpux
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 44c2bbf..02f6085 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.21
-
SOURCE_HASH=sha512:71f3d0bd328265094792cf1e91fb57952fa275415358c50286fb177b212867ac670a27b7caf84072552b5d84e665f9387a4998a5c04d2b9f92d4415a77885ab7
+ VERSION=0.9.22
+
SOURCE_HASH=sha512:48a85d007fa2b7e07772b8641f1b71e88b11b1fde708f6ea321df74743f3c8901eefa4eb4369dcc9a63d89b2203fa81cc872ff6b905ff6be501bca6d92f54f3a
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index 773c5f3..5fc9244 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2013-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.22
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.21
* DEPENDS: add LIBUSB



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (98a5ce8ccccd249791dec52bbe4e5040dd33e42d), Treeve Jelbert, 10/13/2013

Archive powered by MHonArc 2.6.24.

Top of Page