Skip to content

Commit

Permalink
Update macos with brew'd llvm.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmienk
pmienk committed Jan 28, 2025
1 parent 7a10cfe commit a186c24
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 31 deletions.
93 changes: 67 additions & 26 deletions generate4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,10 @@
</presets>

<ci>
<axis name="boost" build="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
<axis name="secp256k1" build="true" />
<axis name="llvm" valued="true" />
<axis name="boost" build="true" param="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
<axis name="secp256k1" build="true" param="true" />

<coverage>
<exclude path="src/wallet/addresses/qrencode/*" />
Expand All @@ -264,17 +265,19 @@
<!-- image="xcode12.2" equivalent? -->
<!-- prefix variance? -->
<job build="all"
system="osx"
system="osx"
assert="ndebug" link="dynamic" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<axis name="secp256k1" value="build" />
<!-- <axis name="icu" value="with" /> -->
<option autotools="--enable-isystem" />
</job>

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<axis name="secp256k1" value="build" />
<!-- <axis name="icu" value="build" /> -->
Expand All @@ -286,6 +289,7 @@
compiler="clang" version="16"
assert="debug" link="dynamic" optimization="debug"
preset="nix-gnu-debug-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -299,6 +303,7 @@
compiler="clang" version="16"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -311,6 +316,7 @@
compiler="gcc" version="12"
assert="ndebug" link="dynamic" optimization="size"
preset="nix-gnu-release-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- <axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -323,6 +329,7 @@
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size"
coverage="true" detectcpuflags="true">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -334,6 +341,7 @@
system="linux" image="ubuntu-24.04"
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand Down Expand Up @@ -477,26 +485,29 @@
</presets>

<ci>
<axis name="boost" build="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
<axis name="secp256k1" build="true" />
<axis name="llvm" valued="true" />
<axis name="boost" build="true" param="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
<axis name="secp256k1" build="true" param="true" />

<!-- image="xcode12.2" equivalent? -->
<!-- prefix variance? -->
<!-- boost version from 'brew' incompatible (1.72/1.76 break in asio?) -->
<!-- boost error from asio if from brew -->
<job build="all"
system="osx"
system="osx"
assert="ndebug" link="dynamic" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="with" /> -->
<axis name="secp256k1" value="build" />
<option autotools="--enable-isystem" />
</job>

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="build" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -508,6 +519,7 @@
compiler="clang" version="16"
assert="debug" link="dynamic" optimization="debug"
preset="nix-gnu-debug-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- <axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -519,6 +531,7 @@
compiler="clang" version="16"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -530,6 +543,7 @@
compiler="gcc" version="12"
assert="ndebug" link="dynamic" optimization="size"
preset="nix-gnu-release-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- <axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -541,6 +555,7 @@
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size"
coverage="true" detectcpuflags="true">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -551,6 +566,7 @@
system="linux" image="ubuntu-24.04"
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand Down Expand Up @@ -681,16 +697,18 @@
</presets>

<ci>
<axis name="boost" build="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
<axis name="secp256k1" build="true" />
<axis name="zmq" build="true" />
<axis name="llvm" valued="true" />
<axis name="boost" build="true" param="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
<axis name="secp256k1" build="true" param="true" />
<axis name="zmq" build="true" param="true" />

<!-- image="xcode12.2" equivalent? -->
<!-- prefix variance? -->
<job build="all"
system="osx"
system="osx"
assert="ndebug" link="dynamic" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="with" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -699,8 +717,9 @@
</job>

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="build" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -713,6 +732,7 @@
compiler="clang" version="16"
assert="debug" link="dynamic" optimization="debug"
preset="nix-gnu-debug-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -725,6 +745,7 @@
compiler="clang" version="16"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -737,6 +758,7 @@
compiler="gcc" version="12"
assert="ndebug" link="dynamic" optimization="size"
preset="nix-gnu-release-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- <axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -750,6 +772,7 @@
assert="ndebug" link="static" optimization="size"
detectcpuflags="true">
<!-- coverage="true" -->
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -761,6 +784,7 @@
system="linux" image="ubuntu-24.04"
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand Down Expand Up @@ -1270,22 +1294,25 @@
</presets>

<ci>
<axis name="boost" build="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
<axis name="secp256k1" build="true" />
<axis name="llvm" valued="true" />
<axis name="boost" build="true" param="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
<axis name="secp256k1" build="true" param="true" />

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="dynamic" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="build" /> -->
<axis name="secp256k1" value="build" />
<option autotools="--enable-isystem" />
</job>

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="build" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1297,6 +1324,7 @@
compiler="clang" version="16"
assert="debug" link="dynamic" optimization="debug"
preset="nix-gnu-debug-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1309,6 +1337,7 @@
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static">
<!-- version="5.0" -->
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -1321,6 +1350,7 @@
assert="ndebug" link="dynamic" optimization="size"
preset="nix-gnu-release-shared">
<!-- version="4.8" -->
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- <axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1332,6 +1362,7 @@
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size" assert="ndebug"
coverage="true" detectcpuflags="true">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -1342,6 +1373,7 @@
system="linux" image="ubuntu-24.04"
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand Down Expand Up @@ -1483,14 +1515,16 @@
</presets>

<ci>
<axis name="boost" build="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" />
<axis name="secp256k1" build="true" />
<axis name="llvm" valued="true" />
<axis name="boost" build="true" param="true" />
<axis name="icu" build="true" with="true" buildwith="true" recognized="true" param="true" />
<axis name="secp256k1" build="true" param="true" />
<!--<axis name="consensus" with="true" without="true" recognized="true" />-->

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="dynamic" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="build" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1499,8 +1533,9 @@
</job>

<job build="all"
system="osx"
system="osx"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="llvm@16" />
<axis name="boost" value="build" />
<!-- <axis name="icu" value="build" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1513,6 +1548,7 @@
compiler="clang" version="16"
assert="debug" link="dynamic" optimization="debug"
preset="nix-gnu-debug-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1525,6 +1561,7 @@
compiler="clang" version="16"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -1537,6 +1574,7 @@
compiler="gcc" version="12"
assert="ndebug" link="dynamic" optimization="size"
preset="nix-gnu-release-shared">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<!-- <axis name="icu" /> -->
<axis name="secp256k1" value="build" />
Expand All @@ -1549,6 +1587,7 @@
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size"
coverage="true" detectcpuflags="true">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand All @@ -1560,6 +1599,7 @@
system="linux" image="ubuntu-24.04"
compiler="gcc" version="12"
assert="ndebug" link="static" optimization="size">
<axis name="llvm" value="" />
<axis name="boost" value="build" />
<axis name="icu" value="build" />
<axis name="secp256k1" value="build" />
Expand Down Expand Up @@ -2218,6 +2258,7 @@
<integration>
<dependency name="boost" os="osx" package="boost" defines="-DBOOST_NO_CXX98_FUNCTION_BASE" />
<dependency name="icu" os="osx" package="icu4c" />
<dependency name="llvm" os="osx" package="llvm@16" />
</integration>

<templates source="generate4.xml">
Expand Down
Loading

0 comments on commit a186c24

Please sign in to comment.