diff options
author | Gard Spreemann <gspr@nonempty.org> | 2021-01-22 11:26:58 +0100 |
---|---|---|
committer | Gard Spreemann <gspr@nonempty.org> | 2021-01-22 11:26:58 +0100 |
commit | 403823c003fe4b95125d6c5ba0fc362347a43232 (patch) | |
tree | dbb458d3e58abcc1f49849d63c7734a173665832 | |
parent | 11380e13be48e009cbeb58616dde92d7e7ab2237 (diff) |
Drop patch to force linking against libatomic
It seems no longer to be needed.
-rw-r--r-- | debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch | 21 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch b/debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch deleted file mode 100644 index 0a20ce1e..00000000 --- a/debian/patches/0003-Force-linking-against-libatomic-for-parts-that-use-T.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann <gspr@nonempty.org> -Date: Wed, 25 Sep 2019 15:18:08 +0200 -Subject: Force linking against libatomic for parts that use TBB. - ---- - src/cmake/modules/FindTBB.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/cmake/modules/FindTBB.cmake b/src/cmake/modules/FindTBB.cmake -index 13f4d92..6baa8d7 100644 ---- a/src/cmake/modules/FindTBB.cmake -+++ b/src/cmake/modules/FindTBB.cmake -@@ -375,6 +375,8 @@ if (TBB_INCLUDE_DIR) - endif(NOT TBB_without_pthread) - endif(UNIX AND NOT APPLE) - -+ list(APPEND ALL_TBB_LIBRARIES atomic) -+ - set (TBB_LIBRARIES ${ALL_TBB_LIBRARIES} - CACHE PATH "TBB libraries" FORCE) - diff --git a/debian/patches/series b/debian/patches/series index adeb35f7..8479e6fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 0001-Disable-tests-that-use-DFSG-deleted-data-files.patch 0002-Use-system-MathJax.patch -0003-Force-linking-against-libatomic-for-parts-that-use-T.patch 0004-Offline-header-for-docs.patch 0005-Disable-Sphinx.patch 0006-Install-Python-module-in-correct-location.patch |