uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
12
pkgs/development/libraries/boost/1.55.nix
Normal file
12
pkgs/development/libraries/boost/1.55.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.55.0";
|
||||
|
||||
patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
|
||||
};
|
||||
})
|
||||
23
pkgs/development/libraries/boost/1.59.nix
Normal file
23
pkgs/development/libraries/boost/1.59.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.59.0";
|
||||
|
||||
boostBuildPatches = [
|
||||
# Fixes a segfault on aarch64-darwin from an implicitly defined varargs function.
|
||||
# https://github.com/boostorg/build/pull/238
|
||||
(fetchpatch {
|
||||
url = "https://github.com/boostorg/build/commit/48e9017139dd94446633480661e5447c7e0d8b1b.diff";
|
||||
excludes = [
|
||||
# Doesn't apply, isn't critical.
|
||||
"src/engine/filesys.h"
|
||||
];
|
||||
sha256 = "sha256-/HLOJKBcGqcK9yBYKSRCSMmTNhCH3sSpK1s3OzkIqx8";
|
||||
})
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
|
||||
};
|
||||
})
|
||||
11
pkgs/development/libraries/boost/1.60.nix
Normal file
11
pkgs/development/libraries/boost/1.60.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.60.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8";
|
||||
};
|
||||
|
||||
})
|
||||
12
pkgs/development/libraries/boost/1.65.nix
Normal file
12
pkgs/development/libraries/boost/1.65.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.65.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_65_1.html
|
||||
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
|
||||
};
|
||||
|
||||
})
|
||||
11
pkgs/development/libraries/boost/1.66.nix
Normal file
11
pkgs/development/libraries/boost/1.66.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{ callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.66.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
|
||||
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
|
||||
};
|
||||
})
|
||||
11
pkgs/development/libraries/boost/1.68.nix
Normal file
11
pkgs/development/libraries/boost/1.68.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.68.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_68_0.html
|
||||
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
|
||||
};
|
||||
})
|
||||
13
pkgs/development/libraries/boost/1.69.nix
Normal file
13
pkgs/development/libraries/boost/1.69.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.69.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_69_0.html
|
||||
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
|
||||
};
|
||||
|
||||
patches = [ ./pthread-stack-min-fix.patch ];
|
||||
})
|
||||
13
pkgs/development/libraries/boost/1.70.nix
Normal file
13
pkgs/development/libraries/boost/1.70.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.70.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_70_0.html
|
||||
sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
|
||||
};
|
||||
|
||||
patches = [ ./pthread-stack-min-fix.patch ];
|
||||
})
|
||||
17
pkgs/development/libraries/boost/1.72.nix
Normal file
17
pkgs/development/libraries/boost/1.72.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.72.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_72_0.html
|
||||
sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722";
|
||||
};
|
||||
|
||||
patches = [ ./pthread-stack-min-fix.patch ];
|
||||
})
|
||||
|
||||
15
pkgs/development/libraries/boost/1.73.nix
Normal file
15
pkgs/development/libraries/boost/1.73.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.73.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_73_0.html
|
||||
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";
|
||||
};
|
||||
})
|
||||
|
||||
15
pkgs/development/libraries/boost/1.74.nix
Normal file
15
pkgs/development/libraries/boost/1.74.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.74.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_74_0.html
|
||||
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";
|
||||
};
|
||||
})
|
||||
|
||||
15
pkgs/development/libraries/boost/1.75.nix
Normal file
15
pkgs/development/libraries/boost/1.75.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.75.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_75_0.html
|
||||
sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb";
|
||||
};
|
||||
})
|
||||
|
||||
15
pkgs/development/libraries/boost/1.77.nix
Normal file
15
pkgs/development/libraries/boost/1.77.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.77.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_77_0.html
|
||||
sha256 = "sha256-/J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ=";
|
||||
};
|
||||
})
|
||||
|
||||
15
pkgs/development/libraries/boost/1.78.nix
Normal file
15
pkgs/development/libraries/boost/1.78.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.78.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_78_0.html
|
||||
sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc";
|
||||
};
|
||||
})
|
||||
|
||||
14
pkgs/development/libraries/boost/1.79.nix
Normal file
14
pkgs/development/libraries/boost/1.79.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.79.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_79_0.html
|
||||
sha256 = "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39";
|
||||
};
|
||||
})
|
||||
45
pkgs/development/libraries/boost/clang-math-2.patch
Normal file
45
pkgs/development/libraries/boost/clang-math-2.patch
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
From 6bb71fdd8f7cc346d90fb14beb38b7297fc1ffd9 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Semashev <andrey.semashev@gmail.com>
|
||||
Date: Sun, 26 Jan 2014 13:58:48 +0400
|
||||
Subject: [PATCH] Fixed incorrect initialization of 128-bit values, when no
|
||||
native support for 128-bit integers is available.
|
||||
|
||||
---
|
||||
boost/atomic/detail/cas128strong.hpp | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp
|
||||
index 906c13e..dcb4d7d 100644
|
||||
--- a/boost/atomic/detail/cas128strong.hpp
|
||||
+++ b/boost/atomic/detail/cas128strong.hpp
|
||||
@@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign>
|
||||
|
||||
public:
|
||||
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
|
||||
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
|
||||
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
|
||||
{
|
||||
+ memset(&v_, 0, sizeof(v_));
|
||||
memcpy(&v_, &v, sizeof(value_type));
|
||||
}
|
||||
|
||||
void
|
||||
store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type value_s = 0;
|
||||
+ storage_type value_s;
|
||||
+ memset(&value_s, 0, sizeof(value_s));
|
||||
memcpy(&value_s, &value, sizeof(value_type));
|
||||
platform_fence_before_store(order);
|
||||
platform_store128(value_s, &v_);
|
||||
@@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign>
|
||||
memory_order success_order,
|
||||
memory_order failure_order) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type expected_s = 0, desired_s = 0;
|
||||
+ storage_type expected_s, desired_s;
|
||||
+ memset(&expected_s, 0, sizeof(expected_s));
|
||||
+ memset(&desired_s, 0, sizeof(desired_s));
|
||||
memcpy(&expected_s, &expected, sizeof(value_type));
|
||||
memcpy(&desired_s, &desired, sizeof(value_type));
|
||||
|
||||
65
pkgs/development/libraries/boost/clang-math.patch
Normal file
65
pkgs/development/libraries/boost/clang-math.patch
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
From e4bde20f2eec0a51be14533871d2123bd2ab9cf3 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Semashev <andrey.semashev@gmail.com>
|
||||
Date: Fri, 28 Feb 2014 12:43:11 +0400
|
||||
Subject: [PATCH] More compilation fixes for the case when 128-bit integers are
|
||||
not supported.
|
||||
|
||||
---
|
||||
boost/atomic/detail/gcc-atomic.hpp | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp
|
||||
index a130590..4af99a1 100644
|
||||
--- a/boost/atomic/detail/gcc-atomic.hpp
|
||||
+++ b/boost/atomic/detail/gcc-atomic.hpp
|
||||
@@ -958,14 +958,16 @@ class base_atomic<T, void, 16, Sign>
|
||||
|
||||
public:
|
||||
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
|
||||
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
|
||||
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
|
||||
{
|
||||
+ memset(&v_, 0, sizeof(v_));
|
||||
memcpy(&v_, &v, sizeof(value_type));
|
||||
}
|
||||
|
||||
void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type tmp = 0;
|
||||
+ storage_type tmp;
|
||||
+ memset(&tmp, 0, sizeof(tmp));
|
||||
memcpy(&tmp, &v, sizeof(value_type));
|
||||
__atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
|
||||
}
|
||||
@@ -980,7 +982,8 @@ class base_atomic<T, void, 16, Sign>
|
||||
|
||||
value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type tmp = 0;
|
||||
+ storage_type tmp;
|
||||
+ memset(&tmp, 0, sizeof(tmp));
|
||||
memcpy(&tmp, &v, sizeof(value_type));
|
||||
tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
|
||||
value_type res;
|
||||
@@ -994,7 +997,9 @@ class base_atomic<T, void, 16, Sign>
|
||||
memory_order success_order,
|
||||
memory_order failure_order) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type expected_s = 0, desired_s = 0;
|
||||
+ storage_type expected_s, desired_s;
|
||||
+ memset(&expected_s, 0, sizeof(expected_s));
|
||||
+ memset(&desired_s, 0, sizeof(desired_s));
|
||||
memcpy(&expected_s, &expected, sizeof(value_type));
|
||||
memcpy(&desired_s, &desired, sizeof(value_type));
|
||||
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false,
|
||||
@@ -1010,7 +1015,9 @@ class base_atomic<T, void, 16, Sign>
|
||||
memory_order success_order,
|
||||
memory_order failure_order) volatile BOOST_NOEXCEPT
|
||||
{
|
||||
- storage_type expected_s = 0, desired_s = 0;
|
||||
+ storage_type expected_s, desired_s;
|
||||
+ memset(&expected_s, 0, sizeof(expected_s));
|
||||
+ memset(&desired_s, 0, sizeof(desired_s));
|
||||
memcpy(&expected_s, &expected, sizeof(value_type));
|
||||
memcpy(&desired_s, &desired, sizeof(value_type));
|
||||
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true,
|
||||
22
pkgs/development/libraries/boost/cmake-paths-173.patch
Normal file
22
pkgs/development/libraries/boost/cmake-paths-173.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
|
||||
index 4238f921e..8fc1ea269 100644
|
||||
--- a/tools/boost_install/boost-install.jam
|
||||
+++ b/tools/boost_install/boost-install.jam
|
||||
@@ -649,7 +649,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
||||
""
|
||||
"# Compute the include and library directories relative to this file."
|
||||
""
|
||||
- "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||
: true ;
|
||||
|
||||
if [ path.is-rooted $(cmakedir) ]
|
||||
@@ -668,6 +668,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
||||
" unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
||||
"endif()"
|
||||
""
|
||||
+ "# Assume that the installer actually did know where the libs were to be installed"
|
||||
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
|
||||
: true ;
|
||||
}
|
||||
|
||||
21
pkgs/development/libraries/boost/cmake-paths.patch
Normal file
21
pkgs/development/libraries/boost/cmake-paths.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
|
||||
index ad19f7b55..ec6bf57ff 100644
|
||||
--- a/tools/boost_install/boost-install.jam
|
||||
+++ b/tools/boost_install/boost-install.jam
|
||||
@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
||||
"# Compute the include and library directories relative to this file."
|
||||
""
|
||||
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
|
||||
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
|
||||
: true ;
|
||||
|
||||
if [ path.is-rooted $(cmakedir) ]
|
||||
@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
||||
" unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
||||
"endif()"
|
||||
""
|
||||
+ "# Assume that the installer actually did know where the libs were to be installed"
|
||||
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
|
||||
: true ;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
|
||||
index 273b28a..2d2031e 100644
|
||||
--- a/tools/build/v2/tools/python.jam
|
||||
+++ b/tools/build/v2/tools/python.jam
|
||||
@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? )
|
||||
|
||||
local rule darwin-installed-pythons ( version ? )
|
||||
{
|
||||
- version ?= $(.version-countdown) ;
|
||||
-
|
||||
- local prefix
|
||||
- = [ GLOB /System/Library/Frameworks /Library/Frameworks
|
||||
- : Python.framework ] ;
|
||||
-
|
||||
- return $(prefix)/Versions/$(version)/bin/python ;
|
||||
+ return ;
|
||||
}
|
||||
|
||||
|
||||
@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||||
|
||||
# See if we can find a framework directory on darwin.
|
||||
local framework-directory ;
|
||||
- if $(target-os) = darwin
|
||||
- {
|
||||
- # Search upward for the framework directory.
|
||||
- local framework-directory = $(libraries[-1]) ;
|
||||
- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework
|
||||
- {
|
||||
- framework-directory = $(framework-directory:D) ;
|
||||
- }
|
||||
-
|
||||
- if $(framework-directory:D=) = Python.framework
|
||||
- {
|
||||
- debug-message framework directory is \"$(framework-directory)\" ;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- debug-message "no framework directory found; using library path" ;
|
||||
- framework-directory = ;
|
||||
- }
|
||||
- }
|
||||
|
||||
local dll-path = $(libraries) ;
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
|
||||
index 273b28a..2d2031e 100644
|
||||
--- a/tools/build/src/tools/python.jam
|
||||
+++ b/tools/build/src/tools/python.jam
|
||||
@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? )
|
||||
|
||||
local rule darwin-installed-pythons ( version ? )
|
||||
{
|
||||
- version ?= $(.version-countdown) ;
|
||||
-
|
||||
- local prefix
|
||||
- = [ GLOB /System/Library/Frameworks /Library/Frameworks
|
||||
- : Python.framework ] ;
|
||||
-
|
||||
- return $(prefix)/Versions/$(version)/bin/python ;
|
||||
+ return ;
|
||||
}
|
||||
|
||||
|
||||
@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||||
|
||||
# See if we can find a framework directory on darwin.
|
||||
local framework-directory ;
|
||||
- if $(target-os) = darwin
|
||||
- {
|
||||
- # Search upward for the framework directory.
|
||||
- local framework-directory = $(libraries[-1]) ;
|
||||
- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework
|
||||
- {
|
||||
- framework-directory = $(framework-directory:D) ;
|
||||
- }
|
||||
-
|
||||
- if $(framework-directory:D=) = Python.framework
|
||||
- {
|
||||
- debug-message framework directory is \"$(framework-directory)\" ;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- debug-message "no framework directory found; using library path" ;
|
||||
- framework-directory = ;
|
||||
- }
|
||||
- }
|
||||
|
||||
local dll-path = $(libraries) ;
|
||||
|
||||
50
pkgs/development/libraries/boost/default.nix
Normal file
50
pkgs/development/libraries/boost/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, callPackage
|
||||
, boost-build
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
let
|
||||
# for boost 1.55 we need to use 1.56's b2
|
||||
# since 1.55's build system is not working
|
||||
# with our derivation
|
||||
useBoost156 = rec {
|
||||
version = "1.56.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_${lib.replaceStrings ["."] ["_"] version}.tar.bz2";
|
||||
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
|
||||
};
|
||||
};
|
||||
|
||||
makeBoost = file:
|
||||
lib.fix (self:
|
||||
callPackage file {
|
||||
boost-build = boost-build.override {
|
||||
# useBoost allows us passing in src and version from
|
||||
# the derivation we are building to get a matching b2 version.
|
||||
useBoost =
|
||||
if lib.versionAtLeast self.version "1.56"
|
||||
then self
|
||||
else useBoost156; # see above
|
||||
};
|
||||
}
|
||||
);
|
||||
in {
|
||||
boost155 = makeBoost ./1.55.nix;
|
||||
boost159 = makeBoost ./1.59.nix;
|
||||
boost160 = makeBoost ./1.60.nix;
|
||||
boost165 = makeBoost ./1.65.nix;
|
||||
boost166 = makeBoost ./1.66.nix;
|
||||
boost167 = makeBoost ./1.67.nix;
|
||||
boost168 = makeBoost ./1.68.nix;
|
||||
boost169 = makeBoost ./1.69.nix;
|
||||
boost170 = makeBoost ./1.70.nix;
|
||||
boost171 = makeBoost ./1.71.nix;
|
||||
boost172 = makeBoost ./1.72.nix;
|
||||
boost173 = makeBoost ./1.73.nix;
|
||||
boost174 = makeBoost ./1.74.nix;
|
||||
boost175 = makeBoost ./1.75.nix;
|
||||
boost177 = makeBoost ./1.77.nix;
|
||||
boost178 = makeBoost ./1.78.nix;
|
||||
boost179 = makeBoost ./1.79.nix;
|
||||
}
|
||||
64
pkgs/development/libraries/boost/gcc-5.patch
Normal file
64
pkgs/development/libraries/boost/gcc-5.patch
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
https://svn.boost.org/trac/boost/ticket/10125
|
||||
|
||||
boost/thread/pthread/once.hpp | 6 +++---
|
||||
boost/thread/pthread/once_atomic.hpp | 2 +-
|
||||
boost/thread/win32/once.hpp | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/boost/thread/pthread/once.hpp b/boost/thread/pthread/once.hpp
|
||||
index ccfb051..0bef038 100644
|
||||
--- a/boost/thread/pthread/once.hpp
|
||||
+++ b/boost/thread/pthread/once.hpp
|
||||
@@ -42,7 +42,7 @@ namespace boost
|
||||
}
|
||||
|
||||
#ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
template<typename Function, class ...ArgTypes>
|
||||
inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
|
||||
#else
|
||||
@@ -65,7 +65,7 @@ namespace boost
|
||||
private:
|
||||
volatile thread_detail::uintmax_atomic_t epoch;
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
template<typename Function, class ...ArgTypes>
|
||||
friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
|
||||
#else
|
||||
@@ -118,7 +118,7 @@ namespace boost
|
||||
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
|
||||
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
|
||||
|
||||
template<typename Function, class ...ArgTypes>
|
||||
diff --git a/boost/thread/pthread/once_atomic.hpp b/boost/thread/pthread/once_atomic.hpp
|
||||
index 9e2f876..923f07b 100644
|
||||
--- a/boost/thread/pthread/once_atomic.hpp
|
||||
+++ b/boost/thread/pthread/once_atomic.hpp
|
||||
@@ -115,7 +115,7 @@ namespace boost
|
||||
#endif
|
||||
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
|
||||
template<typename Function, class ...ArgTypes>
|
||||
inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)
|
||||
diff --git a/boost/thread/win32/once.hpp b/boost/thread/win32/once.hpp
|
||||
index cafcfd4..9b37b31 100644
|
||||
--- a/boost/thread/win32/once.hpp
|
||||
+++ b/boost/thread/win32/once.hpp
|
||||
@@ -227,7 +227,7 @@ namespace boost
|
||||
}
|
||||
}
|
||||
|
||||
-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
+#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
|
||||
//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
|
||||
inline void call_once(once_flag& flag, void (*f)())
|
||||
{
|
||||
266
pkgs/development/libraries/boost/generic.nix
Normal file
266
pkgs/development/libraries/boost/generic.nix
Normal file
|
|
@ -0,0 +1,266 @@
|
|||
{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv
|
||||
, boost-build
|
||||
, fetchpatch
|
||||
, which
|
||||
, toolset ? /**/ if stdenv.cc.isClang then "clang"
|
||||
else if stdenv.cc.isGNU then "gcc"
|
||||
else null
|
||||
, enableRelease ? true
|
||||
, enableDebug ? false
|
||||
, enableSingleThreaded ? false
|
||||
, enableMultiThreaded ? true
|
||||
, enableShared ? !(with stdenv.hostPlatform; isStatic || libc == "msvcrt") # problems for now
|
||||
, enableStatic ? !enableShared
|
||||
, enablePython ? false
|
||||
, enableNumpy ? false
|
||||
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
|
||||
, patches ? []
|
||||
, boostBuildPatches ? []
|
||||
, useMpi ? false
|
||||
, mpi
|
||||
, extraB2Args ? []
|
||||
|
||||
# Attributes inherit from specific versions
|
||||
, version, src
|
||||
, ...
|
||||
}:
|
||||
|
||||
# We must build at least one type of libraries
|
||||
assert enableShared || enableStatic;
|
||||
|
||||
# Python isn't supported when cross-compiling
|
||||
assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
assert enableNumpy -> enablePython;
|
||||
|
||||
# Boost <1.69 can't be built on linux with clang >8, because pth was removed
|
||||
assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69";
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
||||
variant = concatStringsSep ","
|
||||
(optional enableRelease "release" ++
|
||||
optional enableDebug "debug");
|
||||
|
||||
threading = concatStringsSep ","
|
||||
(optional enableSingleThreaded "single" ++
|
||||
optional enableMultiThreaded "multi");
|
||||
|
||||
link = concatStringsSep ","
|
||||
(optional enableShared "shared" ++
|
||||
optional enableStatic "static");
|
||||
|
||||
runtime-link = if enableShared then "shared" else "static";
|
||||
|
||||
# To avoid library name collisions
|
||||
layout = if taggedLayout then "tagged" else "system";
|
||||
|
||||
# Versions of b2 before 1.65 have job limits; specifically:
|
||||
# - Versions before 1.58 support up to 64 jobs[0]
|
||||
# - Versions before 1.65 support up to 256 jobs[1]
|
||||
#
|
||||
# [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
|
||||
# [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
|
||||
jobs =
|
||||
if versionOlder version "1.58" then
|
||||
"$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
|
||||
else if versionOlder version "1.65" then
|
||||
"$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
|
||||
else
|
||||
"$NIX_BUILD_CORES";
|
||||
|
||||
needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared);
|
||||
|
||||
b2Args = concatStringsSep " " ([
|
||||
"--includedir=$dev/include"
|
||||
"--libdir=$out/lib"
|
||||
"-j${jobs}"
|
||||
"--layout=${layout}"
|
||||
"variant=${variant}"
|
||||
"threading=${threading}"
|
||||
"link=${link}"
|
||||
"-sEXPAT_INCLUDE=${expat.dev}/include"
|
||||
"-sEXPAT_LIBPATH=${expat.out}/lib"
|
||||
|
||||
# TODO: make this unconditional
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"
|
||||
"architecture=${if stdenv.hostPlatform.isMips64
|
||||
then if versionOlder version "1.78" then "mips1" else "mips"
|
||||
else toString stdenv.hostPlatform.parsed.cpu.family}"
|
||||
"binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
|
||||
"target-os=${toString stdenv.hostPlatform.parsed.kernel.name}"
|
||||
|
||||
# adapted from table in boost manual
|
||||
# https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html
|
||||
"abi=${if stdenv.hostPlatform.parsed.cpu.family == "arm" then "aapcs"
|
||||
else if stdenv.hostPlatform.isWindows then "ms"
|
||||
else if stdenv.hostPlatform.isMips32 then "o32"
|
||||
else if stdenv.hostPlatform.isMips64n64 then "n64"
|
||||
else "sysv"}"
|
||||
] ++ optional (link != "static") "runtime-link=${runtime-link}"
|
||||
++ optional (variant == "release") "debug-symbols=off"
|
||||
++ optional (toolset != null) "toolset=${toolset}"
|
||||
++ optional (!enablePython) "--without-python"
|
||||
++ optional needUserConfig "--user-config=user-config.jam"
|
||||
++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
|
||||
"threadapi=win32"
|
||||
] ++ extraB2Args
|
||||
);
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "boost";
|
||||
|
||||
inherit src version;
|
||||
|
||||
patchFlags = [];
|
||||
|
||||
patches = patches
|
||||
++ optional stdenv.isDarwin (
|
||||
if version == "1.55.0"
|
||||
then ./darwin-1.55-no-system-python.patch
|
||||
else ./darwin-no-system-python.patch)
|
||||
# Fix boost-context segmentation faults on ppc64 due to ABI violation
|
||||
++ optional (versionAtLeast version "1.61" &&
|
||||
versionOlder version "1.71") (fetchpatch {
|
||||
url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
|
||||
sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libs/context/";
|
||||
})
|
||||
# Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions
|
||||
++ optional (versionAtLeast version "1.65" && versionOlder version "1.67")
|
||||
(fetchpatch {
|
||||
url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch";
|
||||
sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0";
|
||||
stripLen = 1;
|
||||
})
|
||||
++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch {
|
||||
# support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly
|
||||
url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch";
|
||||
sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libs/context/";
|
||||
})
|
||||
++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch
|
||||
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch
|
||||
++ optional (version == "1.77.0") (fetchpatch {
|
||||
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
|
||||
relative = "include";
|
||||
sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4=";
|
||||
});
|
||||
|
||||
meta = {
|
||||
homepage = "http://boost.org/";
|
||||
description = "Collection of C++ libraries";
|
||||
license = licenses.boost;
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
|
||||
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
|
||||
++ optionals (versionOlder version "1.73") lib.platforms.riscv;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
|
||||
broken =
|
||||
# boost-context lacks support for the N32 ABI on mips64. The build
|
||||
# will succeed, but packages depending on boost-context will fail with
|
||||
# a very cryptic error message.
|
||||
stdenv.hostPlatform.isMips64n32 ||
|
||||
# the patch above does not apply cleanly to pre-1.65 boost
|
||||
(stdenv.hostPlatform.isMips64n64 && (versionOlder version "1.65"));
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit boostBuildPatches;
|
||||
};
|
||||
|
||||
preConfigure = optionalString useMpi ''
|
||||
cat << EOF >> user-config.jam
|
||||
using mpi : ${mpi}/bin/mpiCC ;
|
||||
EOF
|
||||
''
|
||||
# On darwin we need to add the `$out/lib` to the libraries' rpath explicitly,
|
||||
# otherwise the dynamic linker is unable to resolve the reference to @rpath
|
||||
# when the boost libraries want to load each other at runtime.
|
||||
+ optionalString (stdenv.isDarwin && enableShared) ''
|
||||
cat << EOF >> user-config.jam
|
||||
using clang-darwin : : ${stdenv.cc.targetPrefix}c++
|
||||
: <linkflags>"-rpath $out/lib/"
|
||||
;
|
||||
EOF
|
||||
''
|
||||
# b2 has trouble finding the correct compiler and tools for cross compilation
|
||||
# since it apparently ignores $CC, $AR etc. Thus we need to set everything
|
||||
# in user-config.jam. To keep things simple we just set everything in an
|
||||
# uniform way for clang and gcc (which works thanks to our cc-wrapper).
|
||||
# We pass toolset later which will make b2 invoke everything in the right
|
||||
# way -- the other toolset in user-config.jam will be ignored.
|
||||
+ optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
cat << EOF >> user-config.jam
|
||||
using gcc : cross : ${stdenv.cc.targetPrefix}c++
|
||||
: <archiver>$AR
|
||||
<ranlib>$RANLIB
|
||||
;
|
||||
|
||||
using clang : cross : ${stdenv.cc.targetPrefix}c++
|
||||
: <archiver>$AR
|
||||
<ranlib>$RANLIB
|
||||
;
|
||||
EOF
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin
|
||||
"-headerpad_max_install_names";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ which boost-build ]
|
||||
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
buildInputs = [ expat zlib bzip2 libiconv ]
|
||||
++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu
|
||||
++ optional enablePython python
|
||||
++ optional enableNumpy python.pkgs.numpy;
|
||||
|
||||
configureScript = "./bootstrap.sh";
|
||||
configurePlatforms = [];
|
||||
dontDisableStatic = true;
|
||||
dontAddStaticConfigureFlags = true;
|
||||
configureFlags = [
|
||||
"--includedir=$(dev)/include"
|
||||
"--libdir=$(out)/lib"
|
||||
"--with-bjam=b2" # prevent bootstrapping b2 in configurePhase
|
||||
] ++ optional enablePython "--with-python=${python.interpreter}"
|
||||
++ optional (toolset != null) "--with-toolset=${toolset}"
|
||||
++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
b2 ${b2Args}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# boostbook is needed by some applications
|
||||
mkdir -p $dev/share/boostbook
|
||||
cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/
|
||||
|
||||
# Let boost install everything else
|
||||
b2 ${b2Args} install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Make boost header paths relative so that they are not runtime dependencies
|
||||
cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
|
||||
-exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
|
||||
'' + optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
|
||||
$RANLIB "$out/lib/"*.a
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false;
|
||||
}
|
||||
15
pkgs/development/libraries/boost/pthread-stack-min-fix.patch
Normal file
15
pkgs/development/libraries/boost/pthread-stack-min-fix.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Taken from https://github.com/conan-io/conan-center-index/pull/361/files
|
||||
|
||||
diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
|
||||
index aefbeb4..bc9b136 100644
|
||||
--- a/boost/thread/pthread/thread_data.hpp
|
||||
+++ b/boost/thread/pthread/thread_data.hpp
|
||||
@@ -57,7 +57,7 @@ namespace boost
|
||||
#else
|
||||
std::size_t page_size = ::sysconf( _SC_PAGESIZE);
|
||||
#endif
|
||||
-#if PTHREAD_STACK_MIN > 0
|
||||
+#ifdef PTHREAD_STACK_MIN
|
||||
if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
|
||||
#endif
|
||||
size = ((size+page_size-1)/page_size)*page_size;
|
||||
Loading…
Add table
Add a link
Reference in a new issue