Remove dropped patches
These were dropped from the spec file but not removed from git.
This commit is contained in:
parent
a9ff19d2d3
commit
bab1cef729
@ -1,27 +0,0 @@
|
|||||||
From d1343f28dcbe25b100b082b34775bd92ead4602c Mon Sep 17 00:00:00 2001
|
|
||||||
From: jzmaddock <john@johnmaddock.co.uk>
|
|
||||||
Date: Tue, 25 Jan 2022 09:27:40 +0000
|
|
||||||
Subject: [PATCH] Update gcc Intel intrinsic usage config. Fixes
|
|
||||||
https://github.com/boostorg/multiprecision/issues/419.
|
|
||||||
|
|
||||||
---
|
|
||||||
include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 6 +++++-
|
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
|
|
||||||
index eb4624bb4..37717cd51 100644
|
|
||||||
--- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
|
|
||||||
+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
|
|
||||||
@@ -19,7 +19,11 @@
|
|
||||||
// If this is GCC/clang, then check that the actual intrinsic exists:
|
|
||||||
//
|
|
||||||
#if defined(__has_builtin) && defined(__GNUC__)
|
|
||||||
-#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
|
|
||||||
+#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) \
|
|
||||||
+ && !(defined(BOOST_GCC) && (__GNUC__ >= 9) \
|
|
||||||
+ && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)\
|
|
||||||
+ || defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_AMD64) \
|
|
||||||
+ || defined(_M_X64) || defined(__amd64__) || defined(_M_X64)))
|
|
||||||
#undef BOOST_MP_HAS_IMMINTRIN_H
|
|
||||||
#endif
|
|
||||||
#elif defined(BOOST_MP_HAS_IMMINTRIN_H) && defined(__GNUC__) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
|
|
@ -1,72 +0,0 @@
|
|||||||
From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dmitry <grisumbras@gmail.com>
|
|
||||||
Date: Sat, 11 Dec 2021 16:58:23 +0300
|
|
||||||
Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
|
|
||||||
(#113)
|
|
||||||
|
|
||||||
---
|
|
||||||
src/tools/stage.jam | 4 ++++
|
|
||||||
test/install_build_no.py | 26 ++++++++++++++++++++++++++
|
|
||||||
test/test_all.py | 1 +
|
|
||||||
3 files changed, 31 insertions(+)
|
|
||||||
create mode 100755 test/install_build_no.py
|
|
||||||
|
|
||||||
diff --git a/tools/build/src/tools/stage.jam b/tools/build/src/tools/stage.jam
|
|
||||||
index c5f02e3ba4..325129dc81 100644
|
|
||||||
--- a/tools/build/src/tools/stage.jam
|
|
||||||
+++ b/tools/build/src/tools/stage.jam
|
|
||||||
@@ -478,6 +478,10 @@ class install-target-class : basic-target
|
|
||||||
return [ sequence.unique $(result2) ] ;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ rule skip-from-usage-requirements ( )
|
|
||||||
+ {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
# Returns true iff 'type' is subtype of some element of 'types-to-include'.
|
|
||||||
#
|
|
||||||
local rule include-type ( type : types-to-include * )
|
|
||||||
diff --git a/tools/build/test/install_build_no.py b/tools/build/test/install_build_no.py
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000000..0ccf3c5cc6
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tools/build/test/install_build_no.py
|
|
||||||
@@ -0,0 +1,26 @@
|
|
||||||
+#!/usr/bin/python
|
|
||||||
+
|
|
||||||
+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com)
|
|
||||||
+# Distributed under the Boost Software License, Version 1.0.
|
|
||||||
+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
|
|
||||||
+
|
|
||||||
+# Check that <build>no in usage-requirements of dependencies does not affect
|
|
||||||
+# install rule, i.e. a skipped installed target does not affect insallation of
|
|
||||||
+# other targets.
|
|
||||||
+
|
|
||||||
+import BoostBuild
|
|
||||||
+
|
|
||||||
+t = BoostBuild.Tester()
|
|
||||||
+
|
|
||||||
+t.write("a.cpp", "int main() {}\n")
|
|
||||||
+
|
|
||||||
+t.write("jamroot.jam", """
|
|
||||||
+make x : : maker : <build>no ;
|
|
||||||
+exe a : a.cpp ;
|
|
||||||
+install install : x a ;
|
|
||||||
+""")
|
|
||||||
+
|
|
||||||
+t.run_build_system()
|
|
||||||
+t.expect_addition("install/a.exe")
|
|
||||||
+
|
|
||||||
+t.cleanup()
|
|
||||||
diff --git a/tools/build/test/test_all.py b/tools/build/test/test_all.py
|
|
||||||
index b7ef5ad701..9ed729d017 100644
|
|
||||||
--- a/tools/build/test/test_all.py
|
|
||||||
+++ b/tools/build/test/test_all.py
|
|
||||||
@@ -250,6 +250,7 @@ def reorder_tests(tests, first_test):
|
|
||||||
"inherit_toolset",
|
|
||||||
"inherited_dependency",
|
|
||||||
"inline",
|
|
||||||
+ "install_build_no",
|
|
||||||
"libjpeg",
|
|
||||||
"liblzma",
|
|
||||||
"libpng",
|
|
Loading…
Reference in New Issue
Block a user