summaryrefslogtreecommitdiffstats
path: root/package/solarus/0001-cmake-remove-Werror.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
commit1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch)
treedd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/solarus/0001-cmake-remove-Werror.patch
parent57dcad243e6daefefbe21109e1fc97272053a7a0 (diff)
parent787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff)
downloadbuildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz
buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release cycle back into the master branch. A few conflicts had to be resolved: - In the DEVELOPERS file, because Fabrice Fontaine was added as a developer for libupnp in master, and for libupnp18 in next. Resolution is simple: add him for both. - linux/Config.in, because we updated the 4.13.x release used by default in master, while we moved to 4.14 in next. Resolution: use 4.14. - package/libupnp/libupnp.hash: a hash for the license file was added in master, while the package was bumped into next. Resolution: keep the hash for the license file, and keep the hash for the newest version of libupnp. - package/linux-headers/Config.in.host: default version of the kernel headers for 4.13 was bumped to the latest 4.13.x in master, but was changed to 4.14 in next. Resolution: use 4.14. - package/samba4/: samba was bumped to 4.6.11 in master for security reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/solarus/0001-cmake-remove-Werror.patch')
-rw-r--r--package/solarus/0001-cmake-remove-Werror.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/package/solarus/0001-cmake-remove-Werror.patch b/package/solarus/0001-cmake-remove-Werror.patch
new file mode 100644
index 0000000000..b27908c829
--- /dev/null
+++ b/package/solarus/0001-cmake-remove-Werror.patch
@@ -0,0 +1,27 @@
+From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Thu, 22 Jun 2017 00:19:56 +0200
+Subject: [PATCH] cmake: remove Werror
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ cmake/AddCompilationFlags.cmake | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake
+index 5159ff9..a506033 100644
+--- a/cmake/AddCompilationFlags.cmake
++++ b/cmake/AddCompilationFlags.cmake
+@@ -24,9 +24,6 @@ endif()
+ # Be less pedantic in release builds for users.
+ set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}")
+
+-# Be more pedantic in debug mode for developers.
+-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}")
+-
+ # Platform-specific flags.
+ if(WIN32)
+ # MinGW: disable the console by default.
+--
+2.9.4
+
OpenPOWER on IntegriCloud