cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop -Werror to fix build of leatherman (and consumers) on at least sparc64

Browse Source 
ok sthen@ sebastia@ (maintainer)
This commit is contained in:
jca 2019-06-04 15:22:32 +00:00
parent 7ed54e7606
commit 33e2fb4155
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/leatherman/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.26 2019/05/20 22:15:06 naddy Exp $
# $OpenBSD: Makefile,v 1.27 2019/06/04 15:22:32 jca Exp $
COMMENT = collection of C++ and CMake utility libraries
GH_ACCOUNT = puppetlabs
GH_PROJECT = leatherman
GH_TAGNAME = 1.6.0
REVISION = 0
REVISION = 1
# N.B.: Upstream doesn't care about ABI, better just bump major on update
SHARED_LIBS = leatherman_curl 1.1 # 0.12

16
devel/leatherman/patches/patch-cmake_options_cmake Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-cmake_options_cmake,v 1.1 2019/06/04 15:22:32 jca Exp $
Force-disable the use of -Werror. Since options.cmake is installed and
used by consumers (eg sysutils/facter) it's not enough to
pass -DENABLE_CXX_WERROR=Off when building leatherman.
Index: cmake/options.cmake
--- cmake/options.cmake.orig
+++ cmake/options.cmake
@@ -1,5 +1,5 @@
include(leatherman)
-defoption(ENABLE_CXX_WERROR "Enables the -Werror compiler option" ON)
+defoption(ENABLE_CXX_WERROR "Enables the -Werror compiler option" OFF)
defoption(COVERALLS "Generate code coverage using Coveralls.io" OFF)
defoption(BOOST_STATIC "Use Boost's static libraries" OFF)
defoption(CURL_STATIC "Use curl's static libraries" OFF)