| 1 |
commit: 62dd0d84ce139e725fb8890b85fc1cfbff2e0c4e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 7 00:08:53 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 7 07:05:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62dd0d84 |
| 7 |
|
| 8 |
media-gfx/exiv2: Fix build with clang |
| 9 |
|
| 10 |
Reported-by: David Carlos Manuelda <StormByte <AT> gmail.com> |
| 11 |
Closes: https://bugs.gentoo.org/662934 |
| 12 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
| 13 |
|
| 14 |
media-gfx/exiv2/exiv2-0.26_p20180319.ebuild | 3 +- |
| 15 |
.../files/exiv2-0.26_p20180319-clang-fix.patch | 47 ++++++++++++++++++++++ |
| 16 |
2 files changed, 49 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild |
| 19 |
index 478ea7a79b1..eb2572dfcf3 100644 |
| 20 |
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild |
| 21 |
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild |
| 22 |
@@ -48,9 +48,10 @@ DOCS=( README doc/ChangeLog doc/cmd.txt ) |
| 23 |
S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}" |
| 24 |
|
| 25 |
PATCHES=( |
| 26 |
- # master, pending backports for 0.26 |
| 27 |
+ # 0.26 branch |
| 28 |
"${FILESDIR}"/${P}-CVE-2018-4868.patch |
| 29 |
"${FILESDIR}"/${P}-CVE-2017-18005.patch |
| 30 |
+ "${FILESDIR}"/${P}-clang-fix.patch |
| 31 |
# TODO: Take to upstream |
| 32 |
"${FILESDIR}"/${PN}-0.26-fix-docs.patch |
| 33 |
"${FILESDIR}"/${PN}-0.26-tools-optional.patch |
| 34 |
|
| 35 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch |
| 36 |
new file mode 100644 |
| 37 |
index 00000000000..a80543a5ecd |
| 38 |
--- /dev/null |
| 39 |
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch |
| 40 |
@@ -0,0 +1,47 @@ |
| 41 |
+From 176ba44cc31064183fdfbce55a7dd7e6b5e2a962 Mon Sep 17 00:00:00 2001 |
| 42 |
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@×××××××××××××××.com> |
| 43 |
+Date: Fri, 8 Jun 2018 23:46:04 +0200 |
| 44 |
+Subject: [PATCH] Fix C & C++ flag adding in CMakeLists.txt |
| 45 |
+ |
| 46 |
+--- |
| 47 |
+ CMakeLists.txt | 22 ++++++++++++---------- |
| 48 |
+ 1 file changed, 12 insertions(+), 10 deletions(-) |
| 49 |
+ |
| 50 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 51 |
+index 2e179bf5..98a172ed 100644 |
| 52 |
+--- a/CMakeLists.txt |
| 53 |
++++ b/CMakeLists.txt |
| 54 |
+@@ -74,21 +74,23 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") |
| 55 |
+ |
| 56 |
+ if( MINGW OR UNIX ) |
| 57 |
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) |
| 58 |
+- ADD_DEFINITIONS(-Wall |
| 59 |
+- -Wcast-align |
| 60 |
+- -Wpointer-arith |
| 61 |
+- -Wformat-security |
| 62 |
+- -Wmissing-format-attribute |
| 63 |
+- -Woverloaded-virtual |
| 64 |
+- -W |
| 65 |
+- ) |
| 66 |
++ string(CONCAT WARNING_FLAGS " -Wall" |
| 67 |
++ " -Wcast-align" |
| 68 |
++ " -Wpointer-arith" |
| 69 |
++ " -Wformat-security" |
| 70 |
++ " -Wmissing-format-attribute" |
| 71 |
++ " -Woverloaded-virtual" |
| 72 |
++ " -W" |
| 73 |
++ ) |
| 74 |
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") |
| 75 |
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") |
| 76 |
+ ENDIF() |
| 77 |
+ |
| 78 |
+ message(STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}") |
| 79 |
+ IF ( CYGWIN OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)) |
| 80 |
+- ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf |
| 81 |
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98" ) # to support snprintf |
| 82 |
+ ELSE() |
| 83 |
+- ADD_DEFINITIONS( -std=c++98 ) |
| 84 |
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" ) |
| 85 |
+ ENDIF() |
| 86 |
+ |
| 87 |
+ ENDIF( MINGW OR UNIX ) |
| 88 |
\ No newline at end of file |
Archives