diff options
| author | Dongkyun Son <dongkyun.s@samsung.com> | 2020-01-31 17:06:59 +0900 |
|---|---|---|
| committer | Dongkyun Son <dongkyun.s@samsung.com> | 2020-01-31 17:08:48 +0900 |
| commit | b9f36ab5c6a91132b78c261b645efd279b90d61f (patch) | |
| tree | 92ee3af4f1ac92df473dc535e77e771b8d0a7525 | |
| parent | 5db6932f5f64e12daef09e156d98d1d52cfc1068 (diff) | |
| download | rpm-b9f36ab5c6a91132b78c261b645efd279b90d61f.tar.gz rpm-b9f36ab5c6a91132b78c261b645efd279b90d61f.tar.bz2 rpm-b9f36ab5c6a91132b78c261b645efd279b90d61f.zip | |
Revert "Adding -std=gnu++11 command-line option to CXXFLAGS"submit/tizen_base/20200205.104845accepted/tizen/base/20200207.013601
This reverts commit 4998addba8f80a46875b84d7a9a20f4ccddff863.
From https://gcc.gnu.org/gcc-6/changes.html
The default mode for C++ is now -std=gnu++14 instead of -std=gnu++98.
Change-Id: I6a0ea547436bc22352ca15df9da52fab73de582c
| -rw-r--r-- | macros.in | 2 | ||||
| -rw-r--r-- | packaging/rpm-tizen_macros | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -855,7 +855,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir")); %_configure ./configure %configure \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; 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 6820739ae..e5798b399 100644 --- a/packaging/rpm-tizen_macros +++ b/packaging/rpm-tizen_macros @@ -90,7 +90,7 @@ # %configure \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags -std=gnu++11}" ; export CXXFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; 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 -std=gnu++11}" ; export CXXFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; 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 -std=gnu++11}" ; export CXXFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; 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 -std=gnu++11}" ; export CXXFLAGS ; \ +CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \ LDFLAGS="${LDFLAGS:-%{?global_LDFLAGS}}"; export LDFLAGS ; \ %{nil} |