Fix FTBFS - GCC '-pedantic' cannot be suppressed with pragma
Resolves: #1307305
This commit is contained in:
parent
83bfaaef59
commit
e3208be43e
3 changed files with 76 additions and 1 deletions
39
0013-Correct-includes-for-ABRT.patch
Normal file
39
0013-Correct-includes-for-ABRT.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
From c8951a1173327241be8d518b317498b25241b5af Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Filak <jfilak@redhat.com>
|
||||
Date: Mon, 15 Feb 2016 07:16:02 +0100
|
||||
Subject: [PATCH] Correct includes for ABRT
|
||||
|
||||
The libabrt.h file includes all libreport include files and the file
|
||||
belongs to ABRT.
|
||||
|
||||
"-pedantic" cannot be disabled through pragma any more.
|
||||
|
||||
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
||||
---
|
||||
src/internal_libabrt.h | 10 +---------
|
||||
1 file changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/internal_libabrt.h b/src/internal_libabrt.h
|
||||
index e40d642..527a90c 100644
|
||||
--- a/src/internal_libabrt.h
|
||||
+++ b/src/internal_libabrt.h
|
||||
@@ -22,15 +22,7 @@
|
||||
* Wrapper header for all ABRT includes
|
||||
*/
|
||||
|
||||
-/* libreport include file */
|
||||
-#pragma GCC diagnostic push
|
||||
-#pragma GCC diagnostic ignored "-pedantic"
|
||||
+/* abrt include files */
|
||||
#include <libabrt.h>
|
||||
-#include <internal_libreport.h>
|
||||
-#pragma GCC diagnostic pop
|
||||
-
|
||||
-#include <problem_data.h>
|
||||
-
|
||||
-/* ABRT is not necessary now */
|
||||
|
||||
#endif /* __INTERNAL_LIBABRT_H */
|
||||
--
|
||||
2.7.1
|
||||
|
||||
29
0014-Drop-pedantic-from-CFLAGS.patch
Normal file
29
0014-Drop-pedantic-from-CFLAGS.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From b465f6b6a9587fb2387d3e880227e936d6ba5d3b Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Filak <jfilak@redhat.com>
|
||||
Date: Mon, 15 Feb 2016 07:18:19 +0100
|
||||
Subject: [PATCH] Drop pedantic from CFLAGS
|
||||
|
||||
GLib2 headers produces some warnings with this option and the option
|
||||
cannot be disable through pargma.
|
||||
|
||||
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e766995..6af7886 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -78,7 +78,7 @@ pkg_check_modules(PC_ABRT REQUIRED abrt)
|
||||
add_definitions(-D_GNU_SOURCE)
|
||||
set(AJC_ENABLE_NLS true)
|
||||
|
||||
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99 -pedantic")
|
||||
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99")
|
||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -DVERBOSE")
|
||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror -DSILENT")
|
||||
|
||||
--
|
||||
2.7.1
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
Name: abrt-java-connector
|
||||
Version: 1.1.0
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
Summary: JNI Agent library converting Java exceptions to ABRT problems
|
||||
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -37,6 +37,8 @@ Patch0009: 0009-Makefile-Adds-srpm-target.patch
|
|||
Patch0010: 0010-Update-the-test-results.patch
|
||||
Patch0011: 0011-Clearly-state-that-tests-cannot-be-run-under-root.patch
|
||||
Patch0012: 0012-Disable-ClassNotFoundException-test-again.patch
|
||||
Patch0013: 0013-Correct-includes-for-ABRT.patch
|
||||
Patch0014: 0014-Drop-pedantic-from-CFLAGS.patch
|
||||
|
||||
%description
|
||||
JNI library providing an agent capable to process both caught and uncaught
|
||||
|
|
@ -89,6 +91,11 @@ make test || {
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 15 2016 Jakub Filak <jfilak@redhat.com> - 1.1.0-8
|
||||
- Drop '-pedantic' from CFLAGS
|
||||
- Correct includes for ABRT
|
||||
- Resolves: #1307305
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Reference in a new issue