wbuilder-6.0.0_rc1_p20230723-r1
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
From e4c76883d8de814050893bec4d196d5d5f48c9c2 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Wed, 4 Aug 2021 20:46:56 +0100
|
||||
Subject: [PATCH] Drop -Werror
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ddabd38..97477b0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -45,7 +45,7 @@ endif()
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
set(CXX_DEFAULT_FLAGS # clang/GCC warnings
|
||||
- $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Werror;-Wno-overloaded-virtual>
|
||||
+ $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Wno-overloaded-virtual>
|
||||
# MSVC warnings
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/WX;/W4>)
|
||||
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 6021c352a009121870107ed37f07ee520110d4c2 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Fri, 27 Aug 2021 03:24:26 +0100
|
||||
Subject: [PATCH] Drop automagic ccache usage
|
||||
|
||||
---
|
||||
CMakeLists.txt | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 97477b0..cd17c6a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,11 +5,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
|
||||
CACHE STRING "Minimum macOS deployment version"
|
||||
)
|
||||
|
||||
-find_program(CCACHE_PROGRAM ccache)
|
||||
-if(CCACHE_PROGRAM)
|
||||
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
|
||||
-endif()
|
||||
-
|
||||
project(firewallbuilder LANGUAGES CXX C)
|
||||
|
||||
### Version variables and include file
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/cmake/VERSION.cmake
|
||||
+++ b/cmake/VERSION.cmake
|
||||
@@ -3,7 +3,7 @@
|
||||
set(PROJECT_VERSION_MAJOR "6")
|
||||
set(PROJECT_VERSION_MINOR "0")
|
||||
set(PROJECT_VERSION_PATCH "0")
|
||||
-set(PROJECT_VERSION_EXTRA "-rc1")
|
||||
+set(PROJECT_VERSION_EXTRA "_rc1")
|
||||
set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
|
||||
set(PROJECT_GENERATION_SHORT "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}")
|
||||
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}")
|
||||
@@ -0,0 +1,66 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -86,7 +86,7 @@
|
||||
else()
|
||||
include(GNUInstallDirs)
|
||||
set(FWB_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/fwbuilder-${PROJECT_VERSION})
|
||||
- set(FWB_INSTALL_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/fwbuilder-${PROJECT_VERSION})
|
||||
+ set(FWB_INSTALL_DOCDIR ${CMAKE_INSTALL_DOCDIR})
|
||||
set(FWB_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
--- a/doc/CMakeLists.txt
|
||||
+++ b/doc/CMakeLists.txt
|
||||
@@ -3,42 +3,22 @@
|
||||
install(FILES
|
||||
AUTHORS
|
||||
ChangeLog
|
||||
- COPYING
|
||||
+ # COPYING
|
||||
Credits
|
||||
- FWBuilder-Routing-LICENSE.txt
|
||||
+ # FWBuilder-Routing-LICENSE.txt
|
||||
PatchAcceptancePolicy.txt
|
||||
${readme_files}
|
||||
DESTINATION ${FWB_INSTALL_DOCDIR})
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
- FIND_PROGRAM(GZIP_TOOL
|
||||
- NAMES gzip
|
||||
- PATHS /bin
|
||||
- /usr/bin
|
||||
- /usr/local/bin)
|
||||
-
|
||||
- IF(NOT GZIP_TOOL)
|
||||
- MESSAGE(FATAL_ERROR "Could not find gzip for man page compression.")
|
||||
- endif(NOT GZIP_TOOL)
|
||||
-
|
||||
- add_custom_target(generate_man ALL
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwbedit.1 > ${CMAKE_BINARY_DIR}/fwbedit.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwbuilder.1 > ${CMAKE_BINARY_DIR}/fwbuilder.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_iosacl.1 > ${CMAKE_BINARY_DIR}/fwb_iosacl.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipf.1 > ${CMAKE_BINARY_DIR}/fwb_ipf.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipfw.1 > ${CMAKE_BINARY_DIR}/fwb_ipfw.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipt.1 > ${CMAKE_BINARY_DIR}/fwb_ipt.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pf.1 > ${CMAKE_BINARY_DIR}/fwb_pf.1.gz
|
||||
- COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pix.1 > ${CMAKE_BINARY_DIR}/fwb_pix.1.gz)
|
||||
-
|
||||
- install(FILES ${CMAKE_BINARY_DIR}/fwbedit.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwbuilder.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwb_iosacl.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwb_ipf.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwb_ipfw.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwb_ipt.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwb_pf.1.gz
|
||||
- ${CMAKE_BINARY_DIR}/fwb_pix.1.gz
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fwbedit.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwbuilder.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwb_iosacl.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipf.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipfw.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipt.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pf.1
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pix.1
|
||||
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
|
||||
endif(UNIX AND NOT APPLE)
|
||||
|
||||
Reference in New Issue
Block a user