summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongkyun, Son <dongkyun.s@samsung.com>2017-04-24 21:25:18 +0900
committerDongkyun, Son <dongkyun.s@samsung.com>2017-04-24 21:34:04 +0900
commit4998addba8f80a46875b84d7a9a20f4ccddff863 (patch)
tree19373a4c975ef3135b65d15639e8ef4c13d95cc3
parent9ae4711ac53e224310aee10bfa7034d2a337f934 (diff)
downloadrpm-4998addba8f80a46875b84d7a9a20f4ccddff863.tar.gz
rpm-4998addba8f80a46875b84d7a9a20f4ccddff863.tar.bz2
rpm-4998addba8f80a46875b84d7a9a20f4ccddff863.zip
GCC 6 defaults to -std=gnu++14 instead of -std=gnu++98: the C++11 standard, plus GNU extensions. Tizen prefer to update to gnu++11, bringing in the C++11 changes but not the C++14 ones. Change-Id: Idd30e078bf3c9ec1d31c833b5ed68f686308d410 Signed-off-by: Dongkyun, Son <dongkyun.s@samsung.com>
-rw-r--r--macros.in2
-rw-r--r--packaging/rpm-tizen_macros8
2 files changed, 5 insertions, 5 deletions
diff --git a/macros.in b/macros.in
index 4779b85a8..789b33d36 100644
--- a/macros.in
+++ b/macros.in
@@ -854,7 +854,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir"));
%_configure ./configure
%configure \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
%{_configure} --host=%{_host} --build=%{_build} \\\
--program-prefix=%{?_program_prefix} \\\
diff --git a/packaging/rpm-tizen_macros b/packaging/rpm-tizen_macros
index 21fa6fd41..5df91fbee 100644
--- a/packaging/rpm-tizen_macros
+++ b/packaging/rpm-tizen_macros
@@ -90,7 +90,7 @@
#
%configure \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
./configure --build=%{_build} --host=%{_host} \\\
--program-prefix=%{?_program_prefix} \\\
@@ -111,7 +111,7 @@
%reconfigure \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
autoreconf -v --install --force || exit 1 \
./configure --build=%{_build} --host=%{_host} \\\
@@ -132,7 +132,7 @@
%autogen \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
./autogen.sh --build=%{_build} --host=%{_host} \\\
--program-prefix=%{?_program_prefix} \\\
@@ -217,7 +217,7 @@ LANG=C\
export LANG\
unset DISPLAY\
CFLAGS="%optflags" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
LDFLAGS="${LDFLAGS:-%{?global_LDFLAGS}}"; export LDFLAGS ; \
LD_AS_NEEDED=1; export LD_AS_NEEDED ; \