| 1 |
hasufell 12/12/27 23:14:16 |
| 2 |
|
| 3 |
Added: libechonest-1.2.1-Werror.patch |
| 4 |
libechonest-2.0.1-Werror.patch |
| 5 |
Log: |
| 6 |
remove Werror wrt #448160 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-libs/libechonest/files/libechonest-1.2.1-Werror.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libechonest/files/libechonest-1.2.1-Werror.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libechonest-1.2.1-Werror.patch |
| 17 |
=================================================================== |
| 18 |
From: Julian Ospald <hasufell@g.o> |
| 19 |
Date: Thu Dec 27 22:58:59 UTC 2012 |
| 20 |
Subject: build system |
| 21 |
|
| 22 |
only enable Werror for development |
| 23 |
|
| 24 |
--- CMakeLists.txt |
| 25 |
+++ CMakeLists.txt |
| 26 |
@@ -5,13 +5,16 @@ |
| 27 |
|
| 28 |
cmake_minimum_required( VERSION 2.6 ) |
| 29 |
|
| 30 |
+# options |
| 31 |
+option(WERROR "enable -Werror for development" OFF) |
| 32 |
+option(ECHONEST_BUILD_TESTS "Build all unit tests" ON) |
| 33 |
+ |
| 34 |
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) |
| 35 |
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) |
| 36 |
|
| 37 |
find_package( Qt4 COMPONENTS QtCore QtNetwork QtTest REQUIRED ) |
| 38 |
set( QT_DONT_USE_QTGUI TRUE ) |
| 39 |
|
| 40 |
- |
| 41 |
find_package(QJSON REQUIRED) |
| 42 |
|
| 43 |
include( ${QT_USE_FILE} ) |
| 44 |
@@ -26,7 +29,10 @@ |
| 45 |
if (CMAKE_COMPILER_IS_GNUCXX) |
| 46 |
ADD_DEFINITIONS( -Wall -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith |
| 47 |
-Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute |
| 48 |
- -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor -Werror ) |
| 49 |
+ -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor ) |
| 50 |
+ if (WERROR) |
| 51 |
+ ADD_DEFINITIONS( -Werror ) |
| 52 |
+ endif() |
| 53 |
if ( NOT WIN32 ) |
| 54 |
add_definitions( -fvisibility=hidden ) |
| 55 |
endif() |
| 56 |
@@ -43,8 +49,6 @@ |
| 57 |
endif(MSVC) |
| 58 |
|
| 59 |
|
| 60 |
-option(ECHONEST_BUILD_TESTS "Build all unit tests" ON) |
| 61 |
- |
| 62 |
if(ECHONEST_BUILD_TESTS) |
| 63 |
enable_testing() |
| 64 |
endif(ECHONEST_BUILD_TESTS) |
| 65 |
--- src/CMakeLists.txt |
| 66 |
+++ src/CMakeLists.txt |
| 67 |
@@ -40,10 +40,6 @@ |
| 68 |
|
| 69 |
QT4_WRAP_CPP( ${LIBECHONEST_H} ) |
| 70 |
|
| 71 |
-if (CMAKE_COMPILER_IS_GNUCXX) |
| 72 |
- add_definitions( -Werror ) |
| 73 |
-endif (CMAKE_COMPILER_IS_GNUCXX) |
| 74 |
- |
| 75 |
SET( OS_SPECIFIC_LINK_LIBRARIES "" ) |
| 76 |
IF( APPLE OR MINGW ) |
| 77 |
SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LIBRARIES} ) |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.1 media-libs/libechonest/files/libechonest-2.0.1-Werror.patch |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch?rev=1.1&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libechonest/files/libechonest-2.0.1-Werror.patch?rev=1.1&content-type=text/plain |
| 85 |
|
| 86 |
Index: libechonest-2.0.1-Werror.patch |
| 87 |
=================================================================== |
| 88 |
From: Julian Ospald <hasufell@g.o> |
| 89 |
Date: Thu Dec 27 22:58:59 UTC 2012 |
| 90 |
Subject: build system |
| 91 |
|
| 92 |
only enable Werror for development |
| 93 |
|
| 94 |
--- CMakeLists.txt |
| 95 |
+++ CMakeLists.txt |
| 96 |
@@ -5,6 +5,10 @@ |
| 97 |
|
| 98 |
cmake_minimum_required( VERSION 2.6 ) |
| 99 |
|
| 100 |
+# options |
| 101 |
+option(WERROR "enable -Werror for development" OFF) |
| 102 |
+option(ECHONEST_BUILD_TESTS "Build all unit tests" ON) |
| 103 |
+ |
| 104 |
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) |
| 105 |
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) |
| 106 |
|
| 107 |
@@ -32,8 +36,12 @@ |
| 108 |
endif() |
| 109 |
|
| 110 |
# disable -Werror on ARM since Qt containers cause a lot of alignment warnings |
| 111 |
- if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" ) |
| 112 |
- add_definitions( -Werror ) |
| 113 |
+ if (WERROR) |
| 114 |
+ if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" ) |
| 115 |
+ add_definitions( -Werror ) |
| 116 |
+ else() |
| 117 |
+ message( STATUS "-Werror breaks this package on ARM, disabled!" ) |
| 118 |
+ endif() |
| 119 |
endif() |
| 120 |
|
| 121 |
# to be added: |
| 122 |
@@ -48,8 +56,6 @@ |
| 123 |
endif(MSVC) |
| 124 |
|
| 125 |
|
| 126 |
-option(ECHONEST_BUILD_TESTS "Build all unit tests" ON) |
| 127 |
- |
| 128 |
if(ECHONEST_BUILD_TESTS) |
| 129 |
enable_testing() |
| 130 |
endif(ECHONEST_BUILD_TESTS) |
Archives