Merge pull request #247 from rhubert/remove-build-prequisites

Remove build prequisites
BobBuildTool · Feb 23, 2025 · 1069b36 · 1069b36
2 parents e81aaf0 + 4035b46
commit 1069b36
Show file tree

Hide file tree

Showing 20 changed files with 82 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,6 @@ Docs](https://bob-build-tool.readthedocs.io/projects/basement/en/latest/index.ht
   * gcc >= 5.x
   * bash
   * POSIX awk (GNU awk version >= 3.1.5)
-  * GNU m4
   * GNU make >= 3.80
   * perl >= 5.6.1
   * GNU tar

diff --git a/classes/autoconf.yaml b/classes/autoconf.yaml
@@ -8,7 +8,7 @@ privateEnvironment:
     APPLY_LIBTOOL_PATCH: "no"
 
 checkoutDeterministic: True
-checkoutTools: [autotools]
+checkoutTools: [autotools, m4]
 checkoutSetup: |
     # Other classes can add paths to this array to pick up additional aclocal
     # m4 files.

diff --git a/classes/basement/rootrecipe.yaml b/classes/basement/rootrecipe.yaml
@@ -32,6 +32,15 @@ depends:
           - name: devel::make
             use: [tools]
             forward: True
+          - name: devel::m4
+            use: [tools]
+            forward: True
+          - name: devel::help2man
+            use: [tools]
+            forward: True
+          - name: devel::texinfo
+            use: [tools]
+            forward: True
           - name: devel::autotools
             use: [tools]
             forward: True

diff --git a/doc/introduction.rst b/doc/introduction.rst
@@ -20,7 +20,6 @@ To use the basement layer, the following prerequisites should be fulfilled:
   * gcc >= 5.x
   * bash
   * POSIX awk (GNU awk version >= 3.1.5)
-  * GNU m4
   * perl >= 5.6.1
   * GNU tar
   * gzip

diff --git a/recipes/devel/autoconf.yaml b/recipes/devel/autoconf.yaml
@@ -16,6 +16,7 @@ checkoutScript: |
     # Prevent that...
     touch man/*.1
 
+buildTools: [m4]
 buildScript: |
     export EMACS="no"
     export HELP2MAN=false
@@ -30,3 +31,6 @@ packageScript: |
     find -name '*.m4f' -delete
     sed -i -e 's/Generated from __file__/Generated/' \
         usr/share/autoconf/m4sugar/m4sh.m4
+
+provideTools:
+    autoconf: "usr/bin"
diff --git a/recipes/devel/automake.yaml b/recipes/devel/automake.yaml
@@ -16,9 +16,13 @@ checkoutDeterministic: True
 checkoutScript: |
     patchApplySeries $<@automake/*.patch@>
 
+buildTools: [m4, help2man]
 buildScript: |
     export PATH="${BOB_DEP_PATHS[devel::autoconf]}/usr/bin:$PATH"
     autotoolsNoarchBuild $1
 
 packageScript: |
     autotoolsNoarchPackageTgt
+
+provideTools:
+    automake: "usr/bin"
diff --git a/recipes/devel/binutils.yaml b/recipes/devel/binutils.yaml
@@ -11,7 +11,7 @@ checkoutSCM:
 
 # Some parts are compiled for the host during compilation. Hence we need the
 # host toolchain too.
-buildTools: [host-toolchain, bison]
+buildTools: [host-toolchain, bison, m4]
 multiPackage:
     "":
         buildVars: [AUTOCONF_HOST, AUTOCONF_TARGET, BINUTILS_PREFIX]

diff --git a/recipes/devel/bootstrap-sandbox.yaml b/recipes/devel/bootstrap-sandbox.yaml
@@ -16,6 +16,18 @@ depends:
         name: devel::make
         use: [tools]
         forward: True
+    -
+        name: devel::m4
+        use: [tools]
+        forward: True
+    -
+        name: devel::help2man
+        use: [tools]
+        forward: True
+    -
+        name: devel::texinfo
+        use: [tools]
+        forward: True
     -
         name: devel::autotools
         use: [tools]
@@ -57,7 +69,6 @@ depends:
     - core::coreutils
     - core::util-linux
     - devel::diffutils
-    - devel::m4
     - devel::patch
     - editors::ed
     - net::make-ca

diff --git a/recipes/devel/compat/binutils.yaml b/recipes/devel/compat/binutils.yaml
@@ -11,7 +11,7 @@ checkoutSCM:
 
 # Some parts are compiled for the host during compilation. Hence we need the
 # host toolchain too.
-buildTools: [host-toolchain]
+buildTools: [host-toolchain, m4]
 
 buildVars: [AUTOCONF_HOST, AUTOCONF_TARGET, BINUTILS_PREFIX]
 buildScript: |

diff --git a/recipes/devel/compat/gcc.yaml b/recipes/devel/compat/gcc.yaml
@@ -25,7 +25,7 @@ checkoutScript: |
         $<<gcc/buildroot-libtool-v2.2.patch>> \
         $<<gcc/0003-fix-canadian-cross-includes.patch>>
 
-buildTools: [host-toolchain]
+buildTools: [host-toolchain, m4]
 buildVars: [AUTOCONF_BUILD, AUTOCONF_HOST, AUTOCONF_TARGET,
             GCC_TARGET_ARCH, GCC_TARGET_FLOAT_ABI, GCC_TARGET_FPU]
 buildScript: |

diff --git a/recipes/devel/flex.yaml b/recipes/devel/flex.yaml
@@ -10,7 +10,7 @@ checkoutSCM:
     stripComponents: 1
 
 checkoutDeterministic: True
-checkoutTools: [gettext]
+checkoutTools: [gettext, m4]
 checkoutScript: |
     patchApplySeries $<@flex/*.patch@>
     autoconfReconfigure

diff --git a/recipes/devel/gcc.yaml b/recipes/devel/gcc.yaml
@@ -55,6 +55,7 @@ checkoutScript: |
 buildVars: [AUTOCONF_BUILD, AUTOCONF_HOST, AUTOCONF_TARGET,
             GCC_TARGET_ARCH, GCC_TARGET_FLOAT_ABI, GCC_TARGET_FPU,
             GCC_MULTILIB]
+buildTools: [m4]
 buildScript: |
     GCC_SRC=$1
     mkdir -p build install

diff --git a/recipes/devel/help2man.yaml b/recipes/devel/help2man.yaml
@@ -0,0 +1,19 @@
+inherit: [autotools]
+metaEnvironment:
+    PKG_VERSION: "1.49.3"
+
+checkoutSCM:
+    scm: url
+    url: "https://ftp.gnu.org/gnu/help2man/help2man-${PKG_VERSION}.tar.xz"
+    digestSHA1: "3ed88430c97af3c5b57949f6f030b913044af507"
+    stripComponents: 1
+
+buildTools: [host-toolchain]
+buildScript: |
+    autotoolsBuild $1
+
+packageScript: |
+    autotoolsPackageTgt
+
+provideTools:
+    help2man: "usr/bin"
diff --git a/recipes/devel/host-compat-toolchain.yaml b/recipes/devel/host-compat-toolchain.yaml
@@ -15,6 +15,15 @@ depends:
     - name: devel::make
       use: [tools]
       forward: True
+    - name: devel::m4
+      use: [tools]
+      forward: True
+    - name: devel::help2man
+      use: [tools]
+      forward: True
+    - name: devel::texinfo
+      use: [tools]
+      forward: True
     - name: devel::autotools
       use: [tools]
       forward: True

diff --git a/recipes/devel/m4.yaml b/recipes/devel/m4.yaml
@@ -14,3 +14,6 @@ buildScript: |
 
 packageScript: |
     autotoolsPackageTgt
+
+provideTools:
+    m4: "usr/bin"
diff --git a/recipes/devel/sandbox.yaml b/recipes/devel/sandbox.yaml
@@ -25,6 +25,18 @@ depends:
         name: devel::make
         use: [tools]
         forward: True
+    -
+        name: devel::m4
+        use: [tools]
+        forward: True
+    -
+        name: devel::help2man
+        use: [tools]
+        forward: True
+    -
+        name: devel::texinfo
+        use: [tools]
+        forward: True
     -
         name: devel::autotools
         use: [tools]
@@ -68,9 +80,7 @@ depends:
     - devel::fakeroot
     - devel::git
     - devel::gperf
-    - devel::m4
     - devel::patch
-    - devel::texinfo
     - editors::ed
     - net::make-ca
     - perl::perl

diff --git a/recipes/kernel/linux-libc-headers.yaml b/recipes/kernel/linux-libc-headers.yaml
@@ -19,7 +19,7 @@ checkoutSCM:
     digestSHA256: "d6ecff966f8c95ec4cb3bb303904f757b7de6a6bcfef0d0771cb852158e61c20"
     stripComponents: 1
 
-buildTools: [bison, flex, host-toolchain]
+buildTools: [bison, flex, host-toolchain, m4]
 buildVars: [ARCH]
 buildScript: |
     # prevent timestamps in configuration

diff --git a/recipes/libs/compat/glibc.yaml b/recipes/libs/compat/glibc.yaml
@@ -20,7 +20,7 @@ checkoutScript: |
     patchApplySeries $<@glibc/*.diff@>
 
 buildVars: [AUTOCONF_TARGET]
-buildTools: [host-toolchain, target-toolchain, bison]
+buildTools: [host-toolchain, target-toolchain, bison, m4]
 buildToolsWeak: [python3]
 buildScript: |
     EXTRA=

diff --git a/recipes/libs/glibc.yaml b/recipes/libs/glibc.yaml
@@ -17,7 +17,7 @@ checkoutSCM:
     stripComponents: 1
 
 buildVars: [AS, CC, CXX, LD, AUTOCONF_HOST, GCC_MULTILIB, GLIBC_ENABLE_KERNEL]
-buildTools: [host-toolchain, target-toolchain, bison]
+buildTools: [host-toolchain, target-toolchain, bison, m4]
 buildToolsWeak: [python3]
 buildScript: |
     EXTRA=

diff --git a/recipes/libs/gmp.yaml b/recipes/libs/gmp.yaml
@@ -18,7 +18,7 @@ checkoutScript: |
     updateConfigFile config.sub configfsf.sub
     autoconfReconfigure
 
-buildTools: [host-toolchain]
+buildTools: [host-toolchain, m4]
 buildScript: |
     autotoolsBuild $1