From: Mikko Rasa Date: Tue, 13 Oct 2015 19:52:18 +0000 (+0300) Subject: Recent versions of sigc++ require C++11 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=74ea8208bb1aa1d9afc9657a4cdfac6714241887;p=builder.git Recent versions of sigc++ require C++11 --- diff --git a/bootstrap.sh b/bootstrap.sh index 02fbd33..9497096 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -6,6 +6,9 @@ INCLUDEDIR=temp/bootstrap/include REQUIRED="core datafile" CFLAGS="-I$INCLUDEDIR `pkg-config --cflags sigc++-2.0`" LIBS="`pkg-config --libs sigc++-2.0` -lpthread" +if pkg-config --exists "sigc++-2.0 >= 2.5.1"; then + CFLAGS="$CFLAGS -std=c++11" +fi MACHINE="`uname -m`" SYSTEM="`uname -s`" if [ "$MACHINE" = "x86_64" ]; then diff --git a/packages/sigc++-2.0.bpk b/packages/sigc++-2.0.bpk new file mode 100644 index 0000000..88cd3be --- /dev/null +++ b/packages/sigc++-2.0.bpk @@ -0,0 +1,32 @@ +binary_package "sigc++-2.0" +{ + build_info + { + library "sigc-2.0"; + incpath "include/sigc++-2.0"; + standard CXX "c++11"; + }; + if_arch "linux-64" + { + build_info + { + incpath "lib/x86_64-linux-gnu/sigc++-2.0/include"; + }; + }; + if_arch "linux-32" + { + build_info + { + incpath "lib/i386-linux-gnu/sigc++-2.0/include"; + }; + }; + if_arch "!linux" + { + build_info + { + incpath "lib/sigc++-2.0/include"; + }; + }; + header "sigc++/sigc++.h"; + header "sigc++config.h"; +};