Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f0a898e7e948e86dc80e3d817a1fa447a38ca24c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f0a898e7e948e86dc80e3d817a1fa447a38ca24c)
  • Date: Wed, 9 Mar 2016 20:11:14 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 17 ++++++++++++++---
audio-creation/guitarix2/BUILD | 3 +++
audio-creation/guitarix2/HISTORY | 3 +++
4 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit f0a898e7e948e86dc80e3d817a1fa447a38ca24c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

guitarix2: fix build with C++11

commit d8d7070502998e6907ca5298ec727a543cf6df53
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

FUNCTIONS: CXXFLAGS in waf_build (needed for guitarix2)

diff --git a/ChangeLog b/ChangeLog
index 1810da2..036aea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-03-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: hack waf_build to enable CXXFLAGS, if possible
+
2016-03-07 Ismael Luceno <ismael AT sourcemage.org>
* libs/libieee1284: new spell, library for parallel port access

diff --git a/FUNCTIONS b/FUNCTIONS
index 7115c44..bd075d8 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -537,9 +537,20 @@ function waf_build() {
if ./waf --help | grep -q -- --nocache; then
waf_opts="$waf_opts --nocache"
fi
- ./waf configure $waf_opts \
- -j $MAKE_NJOBS \
- $OPTS &&
+ if ./waf --help | grep -q -- --cxxflags=CXXFLAGS; then
+ # Hack added for guitarix, maybe useful for others, too.
+ # Needed to be able to enable C++11 mode. We hope to be able
+ # Slip in something here. Full control ist still in waf's hands and
+ # it probably will add flags as it wants:-/
+ ./waf configure $waf_opts \
+ -j $MAKE_NJOBS \
+ --cxxflags="$CXXFLAGS" \
+ $OPTS
+ else
+ ./waf configure $waf_opts \
+ -j $MAKE_NJOBS \
+ $OPTS
+ fi &&
./waf build
}

diff --git a/audio-creation/guitarix2/BUILD b/audio-creation/guitarix2/BUILD
index 577e986..e330e5f 100755
--- a/audio-creation/guitarix2/BUILD
+++ b/audio-creation/guitarix2/BUILD
@@ -1,3 +1,6 @@
# zita-convolver external spelly may come... but that project seems troubled
OPTS="$OPTS --includeresampler --includeconvolver" &&
+# This depends on waf_build magically inserting CXXFLAGS.
+# Appending to $OPTS does not work because of spaces in $CXXFLAGS ...
+CXXFLAGS+=" -std=gnu++11" &&
waf_build
diff --git a/audio-creation/guitarix2/HISTORY
b/audio-creation/guitarix2/HISTORY
index 5d84480..eee0e16 100644
--- a/audio-creation/guitarix2/HISTORY
+++ b/audio-creation/guitarix2/HISTORY
@@ -1,3 +1,6 @@
+2016-03-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: C++11
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f0a898e7e948e86dc80e3d817a1fa447a38ca24c), Thomas Orgis, 03/09/2016

Archive powered by MHonArc 2.6.24.

Top of Page