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

devel/boost: remove patches that are no long necessary now that some

Browse Source 
archs have moved to Clang and we no longer mix and match old and new GCC
on non-Clang archs. From Brad, has gone through bulks on sparc64 i386.
This commit is contained in:
sthen 2020-10-03 13:17:04 +00:00
parent e5d9c3fa00
commit d112318649
3 changed files with 3 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/boost/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.99 2020/08/17 14:01:09 rsadowski Exp $
# $OpenBSD: Makefile,v 1.100 2020/10/03 13:17:04 sthen Exp $
ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 powerpc
@ -15,7 +15,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes
REVISION-main= 0
REVISION-main= 1
SO_VERSION= 11.0
BOOST_LIBS= boost_atomic-mt \

33
devel/boost/patches/patch-boost_config_compiler_clang_hpp
View File

@ -1,39 +1,8 @@
$OpenBSD: patch-boost_config_compiler_clang_hpp,v 1.5 2020/08/15 20:30:40 rsadowski Exp $
boost does not like mixing different compilers at build and compile
time.
We build boost itself with gcc-4.2.1 from base, which doesn't support
the integer scalar type __int128, and this results in a
/usr/local/include/boost/config/user.hpp lacking the "BOOST_HAS_INT128"
define.
When compiling something that depends on boost using a newer compiler
like gcc-4.9 or clang, a code snippet in
/usr/local/include/boost/config/compiler/{clang,gcc}.hpp reactivates
__int128 support, but the code containing typedef declarations
inside /usr/local/include/boost/config/suffix.hpp is never reached,
because /usr/local/include/boost/config/user.hpp lacks "BOOST_HAS_INT128".
Hence, the following errors occur:
/usr/local/include/boost/type_traits/is_integral.hpp:72:1: error: 'int128_type' is not a member of 'boost'
/usr/local/include/boost/type_traits/is_integral.hpp:73:1: error: 'uint128_type' is not a member of 'boost'
As a temporary band-aid, completely disable __int128 support on
OpenBSD.
$OpenBSD: patch-boost_config_compiler_clang_hpp,v 1.6 2020/10/03 13:17:04 sthen Exp $
Index: boost/config/compiler/clang.hpp
--- boost/config/compiler/clang.hpp.orig
+++ boost/config/compiler/clang.hpp
@@ -90,7 +90,7 @@
# endif
#endif
-#if defined(__SIZEOF_INT128__) && !defined(BOOST_NVCC_CXX03) && !defined(_MSC_VER)
+#if defined(__SIZEOF_INT128__) && !defined(BOOST_NVCC_CXX03) && !defined(_MSC_VER) && !defined(__OpenBSD__)
# define BOOST_HAS_INT128
#endif
@@ -320,7 +320,9 @@
#endif

36
devel/boost/patches/patch-boost_config_compiler_gcc_hpp
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-boost_config_compiler_gcc_hpp,v 1.2 2017/12/26 19:18:49 rsadowski Exp $
boost does not like mixing different compilers at build and compile
time.
We build boost itself with gcc-4.2.1 from base, which doesn't support
the integer scalar type __int128, and this results in a
/usr/local/include/boost/config/user.hpp lacking the "BOOST_HAS_INT128"
define.
When compiling something that depends on boost using a newer compiler
like gcc-4.9 or clang, a code snippet in
/usr/local/include/boost/config/compiler/{clang,gcc}.hpp reactivates
__int128 support, but the code containing typedef declarations
inside /usr/local/include/boost/config/suffix.hpp is never reached,
because /usr/local/include/boost/config/user.hpp lacks "BOOST_HAS_INT128".
Hence, the following errors occur:
/usr/local/include/boost/type_traits/is_integral.hpp:72:1: error: 'int128_type' is not a member of 'boost'
/usr/local/include/boost/type_traits/is_integral.hpp:73:1: error: 'uint128_type' is not a member of 'boost'
As a temporary band-aid, completely disable __int128 support on
OpenBSD.
Index: boost/config/compiler/gcc.hpp
--- boost/config/compiler/gcc.hpp.orig
+++ boost/config/compiler/gcc.hpp
@@ -149,7 +149,7 @@
# endif
#endif
-#if defined(__SIZEOF_INT128__) && !defined(BOOST_NVCC_CXX03)
+#if defined(__SIZEOF_INT128__) && !defined(BOOST_NVCC_CXX03) && !defined(__OpenBSD__)
# define BOOST_HAS_INT128
#endif
//