From 18fea143d894083b6f5833caec19c822850fa0d2 Mon Sep 17 00:00:00 2001 From: Ralf Hubert Date: Mon, 17 Nov 2025 21:09:52 +0100 Subject: [PATCH] treewide: adapt to basement autotools class update --- recipes/net/bridge-utils.yaml | 6 +----- recipes/python/python.yaml | 4 +--- recipes/utils/evtest.yaml | 6 +----- recipes/utils/genext2fs.yaml | 6 +----- recipes/utils/inotify-tools.yaml | 6 +----- recipes/utils/sysbench.yaml | 4 +--- 6 files changed, 6 insertions(+), 26 deletions(-) diff --git a/recipes/net/bridge-utils.yaml b/recipes/net/bridge-utils.yaml index 8dd123cc..7104fc30 100644 --- a/recipes/net/bridge-utils.yaml +++ b/recipes/net/bridge-utils.yaml @@ -10,15 +10,11 @@ checkoutSCM: digestSHA1: 07266dff2bf31a24fc912314b6764251ce645a39 stripComponents: 1 -checkoutDeterministic: True -checkoutScript: | - autoconfReconfigure - buildVars: [AR] buildScript: | # this doesn't support out of tree builds; symlink the sources mkdir -p build cp -as $1/* build/ - autotoolsBuild -o AR=$AR $1 + autotoolsBuild -s -o AR=$AR $1 packageScript: autotoolsPackageTgt diff --git a/recipes/python/python.yaml b/recipes/python/python.yaml index 5b930743..9e31c4b5 100644 --- a/recipes/python/python.yaml +++ b/recipes/python/python.yaml @@ -15,11 +15,9 @@ checkoutSCM: checkoutDeterministic: True checkoutScript: | patchApplySeries $<> - autoconfReconfigure buildScript: | - mkdir -p src - rsync -aH --delete $1/ src/ + autoconfSyncReconfigure $1 src multiPackage: "": diff --git a/recipes/utils/evtest.yaml b/recipes/utils/evtest.yaml index 0757cf75..158d6ad3 100644 --- a/recipes/utils/evtest.yaml +++ b/recipes/utils/evtest.yaml @@ -10,11 +10,7 @@ checkoutSCM: digestSHA1: 8dd9df265524469f7740713b5f433e7ef85c444f stripComponents: 1 -checkoutDeterministic: True -checkoutScript: | - autoconfReconfigure - buildScript: | - autotoolsBuild $1 + autotoolsBuild -s $1 packageScript: autotoolsPackageTgt diff --git a/recipes/utils/genext2fs.yaml b/recipes/utils/genext2fs.yaml index 67b2d689..06a365c1 100644 --- a/recipes/utils/genext2fs.yaml +++ b/recipes/utils/genext2fs.yaml @@ -9,12 +9,8 @@ checkoutSCM: digestSHA1: 4b06176c1c71b2818dc2f9d772346c5902238c33 stripComponents: 1 -checkoutDeterministic: True -checkoutScript: | - autoconfReconfigure - buildScript: | - autotoolsBuild $1 + autotoolsBuild -s $1 packageScript: | autotoolsPackageTgt diff --git a/recipes/utils/inotify-tools.yaml b/recipes/utils/inotify-tools.yaml index d0cf2b83..3e8ad3e0 100644 --- a/recipes/utils/inotify-tools.yaml +++ b/recipes/utils/inotify-tools.yaml @@ -10,11 +10,7 @@ checkoutSCM: digestSHA256: "d33a4fd24c72c2d08893f129d724adf725b93dae96c359e4f4e9f32573cc853b" stripComponents: 1 -checkoutDeterministic: True -checkoutScript: | - autoconfReconfigure - buildScript: | - autotoolsBuild $1 + autotoolsBuild -s $1 packageScript: autotoolsPackageTgt diff --git a/recipes/utils/sysbench.yaml b/recipes/utils/sysbench.yaml index 2dec37df..3542f19d 100644 --- a/recipes/utils/sysbench.yaml +++ b/recipes/utils/sysbench.yaml @@ -20,12 +20,10 @@ depends: checkoutDeterministic: True checkoutScript: | patchApplySeries -p0 $<@sysbench/*.patch@> - autoconfReconfigure buildVars: [CC] buildScript: | - # rsync -a --delete $1/ build - autotoolsBuild -o V=1 -o VERBOSE=1 $1 --without-mysql \ + autotoolsBuild -s -o V=1 -o VERBOSE=1 $1 --without-mysql \ --with-system-ck \ --with-system-luajit