Skip to content

Commit

Permalink
Merge pull request #58 from rhubert/m4
Browse files Browse the repository at this point in the history
treewide: use m4 tool
  • Loading branch information
jkloetzke authored Feb 23, 2025
2 parents 1eb19ab + 471dd10 commit 522672a
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion recipes/devel/dtc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ checkoutSCM:
digestSHA256: 65cec529893659a49a89740bb362f507a3b94fc8cd791e76a8d6a2b6f3203473
stripComponents: 1

buildTools: [bison, flex, target-toolchain]
buildTools: [bison, flex, target-toolchain, m4]
buildVars: [AR, CC, LD, CFLAGS, LDFLAGS]
buildScript: |
mkdir -p build install
Expand Down
2 changes: 1 addition & 1 deletion recipes/kernel/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ checkoutSCM:
digestSHA256: "ee7650996ba75aa29fe66f309b413097f249a03e7001f2a41128c7c95205226a"
stripComponents: 1

buildTools: [bison, flex, host-toolchain]
buildTools: [bison, flex, host-toolchain, m4]
buildVars: [ARCH, LINUX_CONFIG, LINUX_CUSTOM_CONFIG, LINUX_CUSTOM_CONFIG_PKG]
buildScript: |
# prevent timestamps in configuration
Expand Down
1 change: 1 addition & 0 deletions recipes/libs/elfutils.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ checkoutSCM:
digestSHA256: 8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692
stripComponents: 1

buildTools: [m4]
buildScript: |
mkdir -p all
pushd all
Expand Down
2 changes: 1 addition & 1 deletion recipes/libs/libnl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ checkoutSCM:
digestSHA256: 49b3e2235fdb58f5910bbb3ed0de8143b71ffc220571540502eb6c2471f204f5
stripComponents: 1

buildTools: [bison, flex]
buildTools: [bison, flex, m4]
buildScript: |
autotoolsBuild $1
Expand Down
2 changes: 1 addition & 1 deletion recipes/libs/libpcap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ checkoutSCM:
digestSHA1: 04d6e619defad5bb17af15f6d2304e79b649786c
stripComponents: 1

buildTools: [flex, bison]
buildTools: [flex, bison, m4]
buildScript: |
autotoolsBuild "$1"
Expand Down
2 changes: 1 addition & 1 deletion recipes/libs/libxkbcommon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ checkoutSCM:
digestSHA1: 6c9b00437feb6389470bb6dbce66f6f7d16f09bc
stripComponents: 1

buildTools: [bison]
buildTools: [bison, m4]
buildScript: |
mesonBuild $1 \
-Denable-x11=false \
Expand Down
2 changes: 1 addition & 1 deletion recipes/libs/mesa3d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ checkoutSCM:
digestSHA1: c7994d1bf40879518b6ae331dd92e04b6e9d436e
stripComponents: 1

buildTools: [bison, flex]
buildTools: [bison, flex, m4]
buildVars: [CONFIG_MESA3D_GALLIUM_DRIVERS]
buildScript: |
# crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl
Expand Down
2 changes: 1 addition & 1 deletion recipes/libs/nettle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ checkoutSCM:
digestSHA1: 8bd7614c5f5a156e2a5caa703402f3b4e87dabd5
stripComponents: 1

buildTools: [host-toolchain]
buildTools: [host-toolchain, m4]
buildScript: |
autotoolsBuild $1
Expand Down
1 change: 1 addition & 0 deletions recipes/libs/pcre2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ checkoutSCM:
digestSHA1: ddc37244d49d74ecae510d9d860b812e6e59611a
stripComponents: 1

buildTools: [m4]
buildScript: |
autotoolsBuild $1 \
--enable-pcre2-8 \
Expand Down
2 changes: 1 addition & 1 deletion recipes/multimedia/gstreamer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ checkoutDeterministic: True
checkoutScript: |
patchApplySeries $<<gstreamer/*.patch>>
buildTools: [flex, bison, glib]
buildTools: [flex, bison, glib, m4]
buildScript: |
mesonBuild $1
Expand Down
2 changes: 1 addition & 1 deletion recipes/utils/acpica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ checkoutSCM:
digestSHA256: cc167c0825c3807f9812f892e77ec918b7f62c3faeaf9a2e3664de7639b00b6b
stripComponents: 1

buildTools: [bison, flex, target-toolchain]
buildTools: [bison, flex, target-toolchain, m4]
buildVars: [CC, STRIP]
buildScript: |
rsync -a --delete $1/ .
Expand Down
2 changes: 1 addition & 1 deletion recipes/utils/uboot-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ checkoutSCM:
digestSHA1: f5998171fd6902d2f29bffc90790b6214cbdf88f
stripComponents: 1

buildTools: [target-toolchain, host-toolchain, bison, flex]
buildTools: [target-toolchain, host-toolchain, bison, flex, m4]
buildVars: [CROSS_COMPILE, CC]
buildScript: |
# call the default config which should be suitable for the tools we want to
Expand Down

0 comments on commit 522672a

Please sign in to comment.