1 |
reavertm 10/04/10 02:13:17 |
2 |
|
3 |
Added: poppler-0.12.3-preserve-cflags.patch |
4 |
Log: |
5 |
Fix bug 309297 - preserve compiler flags |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-text/poppler/files/poppler-0.12.3-preserve-cflags.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.3-preserve-cflags.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/files/poppler-0.12.3-preserve-cflags.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: poppler-0.12.3-preserve-cflags.patch |
15 |
=================================================================== |
16 |
diff -ru ../poppler-0.12.3/cmake/modules/PopplerMacros.cmake ./cmake/modules/PopplerMacros.cmake |
17 |
--- ../poppler-0.12.3/cmake/modules/PopplerMacros.cmake 2009-10-05 00:20:41.000000000 +0200 |
18 |
+++ ./cmake/modules/PopplerMacros.cmake 2010-04-10 03:57:46.763786638 +0200 |
19 |
@@ -86,12 +86,9 @@ |
20 |
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
21 |
|
22 |
if(CMAKE_COMPILER_IS_GNUCXX) |
23 |
- # set the default compile warnings |
24 |
- set(DEFAULT_COMPILE_WARNINGS_NO) |
25 |
- set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings") |
26 |
- set(DEFAULT_COMPILE_WARNINGS_KDE "-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") |
27 |
- |
28 |
- set(CMAKE_CXX_FLAGS "-Woverloaded-virtual") |
29 |
+ set(CMAKE_C_FLAGS "-Wall -Wno-write-strings -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common ${CMAKE_C_FLAGS}") |
30 |
+ set(CMAKE_CXX_FLAGS "-Wall -Woverloaded-virtual -Wno-write-strings -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-check-new -fno-common ${CMAKE_CXX_FLAGS}") |
31 |
+ add_definitions(-D_XOPEN_SOURCE=500 -D_BSD_SOURCE) |
32 |
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") |
33 |
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") |
34 |
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") |
35 |
diff -ru ../poppler-0.12.3/CMakeLists.txt ./CMakeLists.txt |
36 |
--- ../poppler-0.12.3/CMakeLists.txt 2009-12-24 11:50:12.000000000 +0100 |
37 |
+++ ./CMakeLists.txt 2010-04-10 03:29:23.799102761 +0200 |
38 |
@@ -115,21 +115,6 @@ |
39 |
include_directories(${LCMS_INCLUDE_DIR}) |
40 |
endif(LCMS_FOUND) |
41 |
|
42 |
-if(DEFINED COMPILE_WARNINGS) |
43 |
-else(DEFINED COMPILE_WARNINGS) |
44 |
- set(COMPILE_WARNINGS "yes") |
45 |
-endif(DEFINED COMPILE_WARNINGS) |
46 |
-string(TOLOWER "${COMPILE_WARNINGS}" _comp_warnings) |
47 |
-if(_comp_warnings STREQUAL "no") |
48 |
- add_definitions(${DEFAULT_COMPILE_WARNINGS_NO}) |
49 |
-endif(_comp_warnings STREQUAL "no") |
50 |
-if(_comp_warnings STREQUAL "yes") |
51 |
- add_definitions(${DEFAULT_COMPILE_WARNINGS_YES}) |
52 |
-endif(_comp_warnings STREQUAL "yes") |
53 |
-if(_comp_warnings STREQUAL "kde") |
54 |
- set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_KDE} ${CMAKE_CXX_FLAGS}") |
55 |
-endif(_comp_warnings STREQUAL "kde") |
56 |
- |
57 |
|
58 |
include(ConfigureChecks.cmake) |
59 |
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) |