diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-11-18 13:21:08 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-11-18 13:21:08 -0600 |
| commit | ac0e6f7ecde492099b4d1ccd7e2cc81d4f8f3d6b (patch) | |
| tree | f19e297c67fcc76e35c6519ba1d5a9ce084b836e /contrib/depends/patches/boost | |
| parent | Merge pull request #6135 (diff) | |
| parent | "Fix" non-determinism in native_cctools build (diff) | |
| download | monero-ac0e6f7ecde492099b4d1ccd7e2cc81d4f8f3d6b.tar.xz | |
Merge pull request #6118
gitian: add FreeBSD support (75c5a04, 607c01a, cca6e5c, 35b5e91, 024a1c7, b14d9ab, 5eea312, 9cbba5a, 2e435df, abeed9a) (hyc)
Diffstat (limited to 'contrib/depends/patches/boost')
| -rw-r--r-- | contrib/depends/patches/boost/fix_aroptions.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/contrib/depends/patches/boost/fix_aroptions.patch b/contrib/depends/patches/boost/fix_aroptions.patch new file mode 100644 index 000000000..5b2ec1006 --- /dev/null +++ b/contrib/depends/patches/boost/fix_aroptions.patch @@ -0,0 +1,28 @@ +--- boost_1_64_0/tools/build/src/tools/gcc.jam.O 2017-04-17 03:22:26.000000000 +0100 ++++ boost_1_64_0/tools/build/src/tools/gcc.jam 2019-11-15 15:46:16.957937137 +0000 +@@ -243,6 +243,8 @@ + { + ECHO notice: using gcc archiver :: $(condition) :: $(archiver[1]) ; + } ++ local arflags = [ feature.get-values <arflags> : $(options) ] ; ++ toolset.flags gcc.archive .ARFLAGS $(condition) : $(arflags) ; + + # - Ranlib. + local ranlib = [ common.get-invocation-command gcc +@@ -970,6 +972,7 @@ + # logic in intel-linux, but that is hardly worth the trouble as on Linux, 'ar' + # is always available. + .AR = ar ; ++.ARFLAGS = rc ; + .RANLIB = ranlib ; + + toolset.flags gcc.archive AROPTIONS <archiveflags> ; +@@ -1011,7 +1014,7 @@ + # + actions piecemeal archive + { +- "$(.AR)" $(AROPTIONS) rc "$(<)" "$(>)" ++ "$(.AR)" $(AROPTIONS) $(.ARFLAGS) "$(<)" "$(>)" + "$(.RANLIB)" "$(<)" + } + |