From f0ef8732a2f66c678b94d6038339e4fa558f475f Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 12 Nov 2017 23:22:12 +0000 Subject: [PATCH] .uppbox git-svn-id: svn://ultimatepp.org/upp/trunk@11458 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/Scripts/CLANGMK.bm | 2 +- uppbox/Scripts/GCCMK.bm | 2 +- uppbox/Scripts/upp-devel.spec | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/uppbox/Scripts/CLANGMK.bm b/uppbox/Scripts/CLANGMK.bm index 998f75f32..f1649a1a8 100644 --- a/uppbox/Scripts/CLANGMK.bm +++ b/uppbox/Scripts/CLANGMK.bm @@ -1,7 +1,7 @@ BUILDER = "CLANG"; COMPILER = "clang++"; COMMON_OPTIONS = "-Wno-logical-op-parentheses"; -COMMON_CPP_OPTIONS = "-std=c++14"; +COMMON_CPP_OPTIONS = "-std=c++11"; COMMON_C_OPTIONS = ""; COMMON_FLAGS = ""; DEBUG_INFO = "2"; diff --git a/uppbox/Scripts/GCCMK.bm b/uppbox/Scripts/GCCMK.bm index 07c845459..48500c6e0 100644 --- a/uppbox/Scripts/GCCMK.bm +++ b/uppbox/Scripts/GCCMK.bm @@ -1,5 +1,5 @@ BUILDER = "GCC"; -COMMON_CPP_OPTIONS = "-std=c++14"; +COMMON_CPP_OPTIONS = "-std=c++11"; DEBUG_INFO = "2"; DEBUG_BLITZ = "1"; DEBUG_LINKMODE = "1"; diff --git a/uppbox/Scripts/upp-devel.spec b/uppbox/Scripts/upp-devel.spec index 1c0f15a86..9b375771e 100644 --- a/uppbox/Scripts/upp-devel.spec +++ b/uppbox/Scripts/upp-devel.spec @@ -128,7 +128,7 @@ LIBDIR=$( pkg-config --libs-only-L gtk+-2.0 libnotify x11 | awk ' { gsub ( / /, cat > %{buildroot}/%{_datadir}/%{name}/GCC.bm << EOF BUILDER = "GCC"; COMPILER = "g++"; -COMMON_CPP_OPTIONS = "-std=c++14"; +COMMON_CPP_OPTIONS = "-std=c++11"; DEBUG_INFO = "2"; DEBUG_BLITZ = "1"; DEBUG_LINKMODE = "1"; @@ -156,7 +156,7 @@ cat > %{buildroot}/%{_datadir}/%{name}/CLANG.bm << EOF BUILDER = "CLANG"; COMPILER = "clang++"; COMMON_OPTIONS = "-Wno-logical-op-parentheses"; -COMMON_CPP_OPTIONS = "-std=c++14"; +COMMON_CPP_OPTIONS = "-std=c++11"; COMMON_C_OPTIONS = ""; COMMON_FLAGS = ""; DEBUG_INFO = "2"; @@ -206,7 +206,6 @@ rm -fr %{buildroot} %changelog * %date Amrein-Marie Christophe %version-1 - New snapshot -- Used stdc++14 instead of stdc++11 in build method files (.bm) * Tue Jan 31 2017 Amrein-Marie Christophe 2017.1-1 - New release