about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/tools/build-managers/bmake
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/tools/build-managers/bmake')
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch10
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix108
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff21
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch13
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/setup-hook.sh122
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch12
6 files changed, 0 insertions, 286 deletions
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
deleted file mode 100644
index 9b1267257ad1..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bmake/make-bootstrap.sh.in.orig     2019-02-19 10:55:21.733606117 -0800
-+++ bmake/make-bootstrap.sh.in  2019-02-19 10:56:02.150771541 -0800
-@@ -4,6 +4,7 @@
- 
- srcdir=@srcdir@
- 
-+prefix="@prefix@"
- DEFAULT_SYS_PATH="@default_sys_path@"
- 
- case "@use_meta@" in
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
deleted file mode 100644
index 4373e534bc58..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, getopt
-, ksh
-, tzdata
-, pkgsMusl # for passthru.tests
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "bmake";
-  version = "20230723";
-
-  src = fetchurl {
-    url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-xCoNlRuiP3ZlMxMJ+74h7cARNqI8uUFoULQxW+X7WQQ=";
-  };
-
-  patches = [
-    # make bootstrap script aware of the prefix in /nix/store
-    ./bootstrap-fix.patch
-    # preserve PATH from build env in unit tests
-    ./fix-unexport-env-test.patch
-    # Always enable ksh test since it checks in a impure location /bin/ksh
-    ./unconditional-ksh-test.patch
-    # decouple tests from build phase
-    ./dont-test-while-installing.diff
-  ];
-
-  # Make tests work with musl
-  # * Disable deptgt-delete_on_error test (alpine does this too)
-  # * Disable shell-ksh test (ksh doesn't compile with musl)
-  # * Fix test failing due to different strerror(3) output for musl and glibc
-  postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
-    sed -i unit-tests/Makefile \
-      -e '/deptgt-delete_on_error/d' \
-      -e '/shell-ksh/d'
-    substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename"
-  '';
-
-  nativeBuildInputs = [ getopt ];
-
-  # The generated makefile is a small wrapper for calling ./boot-strap with a
-  # given op. On a case-insensitive filesystem this generated makefile clobbers
-  # a distinct, shipped, Makefile and causes infinite recursion during tests
-  # which eventually fail with "fork: Resource temporarily unavailable"
-  configureFlags = [
-    "--without-makefile"
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    ./boot-strap --prefix=$out -o . op=build
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    ./boot-strap --prefix=$out -o . op=install
-
-    runHook postInstall
-  '';
-
-  doCheck = true;
-
-  nativeCheckInputs = [
-    tzdata
-  ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
-    ksh
-  ];
-
-  # Disabled tests:
-  # opt-chdir: ofborg complains about it somehow
-  # opt-keep-going-indirect: not yet known
-  # varmod-localtime: musl doesn't support TZDIR and this test relies on impure,
-  # implicit paths
-  env.BROKEN_TESTS = builtins.concatStringsSep " " [
-    "opt-chdir"
-    "opt-keep-going-indirect"
-    "varmod-localtime"
-  ];
-
-  checkPhase = ''
-    runHook preCheck
-
-    ./boot-strap -o . op=test
-
-    runHook postCheck
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  passthru.tests.bmakeMusl = pkgsMusl.bmake;
-
-  meta = {
-    homepage = "http://www.crufty.net/help/sjg/bmake.html";
-    description = "Portable version of NetBSD 'make'";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ];
-    platforms = lib.platforms.unix;
-    broken = stdenv.isAarch64; # failure on gnulib-tests
-  };
-})
-# TODO: report the quirks and patches to bmake devteam (especially the Musl one)
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff b/nixpkgs/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff
deleted file mode 100644
index ab9399920c24..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur bmake-old/boot-strap bmake-new/boot-strap
---- bmake-old/boot-strap	2023-06-27 18:02:19.000000000 -0300
-+++ bmake-new/boot-strap	2023-07-23 22:31:02.334720661 -0300
-@@ -413,9 +413,6 @@
- 	[ -s make-bootstrap.sh ] || op_configure
- 	chmod 755 make-bootstrap.sh || exit 1
- 	./make-bootstrap.sh || exit 1
--	case "$op" in
--	build) op_test;;
--	esac
- }
- 
- op_test() {
-@@ -434,7 +431,6 @@
- }
- 
- op_install() {
--	op_test
- 	case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
- 	,$HOST_TARGET/bin,*/$HOST_TARGET)
- 		INSTALL_PREFIX=`dirname $prefix`
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
deleted file mode 100644
index fbf7225a6d6f..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- bmake/unit-tests/unexport-env.mk.orig	2021-05-27 14:44:45.263392298 +0200
-+++ bmake/unit-tests/unexport-env.mk	2021-05-27 14:46:46.188881996 +0200
-@@ -4,8 +4,8 @@
- FILTER_CMD=	grep ^UT_
- .include "export.mk"
- 
--# an example of setting up a minimal environment.
--PATH=	/bin:/usr/bin:/sbin:/usr/sbin
-+# preserve PATH so commands used in the "all" target are still available
-+PATH :=	${PATH}
- 
- # now clobber the environment to just PATH and UT_TEST
- UT_TEST=	unexport-env
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/bmake/setup-hook.sh
deleted file mode 100644
index a36d024b111e..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/setup-hook.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-# shellcheck shell=bash disable=SC2086,SC2154,SC2206
-
-addMakeFlags() {
-    export prefix="$out"
-    export MANDIR="${!outputMan}/share/man"
-    export MANTARGET=man
-    export BINOWN=
-    export STRIP_FLAG=
-}
-
-bmakeBuildPhase() {
-    runHook preBuild
-
-    local flagsArray=(
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
-        SHELL="$SHELL"
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
-    )
-
-    echoCmd 'build flags' "${flagsArray[@]}"
-    bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
-
-    runHook postBuild
-}
-
-bmakeCheckPhase() {
-    runHook preCheck
-
-    if [ -z "${checkTarget:-}" ]; then
-        #TODO(@oxij): should flagsArray influence make -n?
-        if bmake -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
-            checkTarget="check"
-        elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
-            checkTarget="test"
-        fi
-    fi
-
-    if [ -z "${checkTarget:-}" ]; then
-        echo "no test target found in bmake, doing nothing"
-    else
-        local flagsArray=(
-            ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            SHELL="$SHELL"
-            # Old bash empty array hack
-            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-            ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
-            ${checkTarget}
-        )
-
-        echoCmd 'check flags' "${flagsArray[@]}"
-        bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
-    fi
-
-    runHook postCheck
-}
-
-bmakeInstallPhase() {
-    runHook preInstall
-
-    if [ -n "$prefix" ]; then
-        mkdir -p "$prefix"
-    fi
-
-    local flagsArray=(
-        ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
-        SHELL="$SHELL"
-        # Old bash empty array hack
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
-        ${installTargets:-install}
-    )
-
-    echoCmd 'install flags' "${flagsArray[@]}"
-    bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
-
-    runHook postInstall
-}
-
-bmakeDistPhase() {
-    runHook preDist
-
-    if [ -n "$prefix" ]; then
-        mkdir -p "$prefix"
-    fi
-
-    # Old bash empty array hack
-    local flagsArray=(
-        $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
-    )
-
-    echo 'dist flags: %q' "${flagsArray[@]}"
-    bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
-
-    if [ "${dontCopyDist:-0}" != 1 ]; then
-        mkdir -p "$out/tarballs"
-
-        # Note: don't quote $tarballs, since we explicitly permit
-        # wildcards in there.
-        cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs"
-    fi
-
-    runHook postDist
-}
-
-preConfigureHooks+=(addMakeFlags)
-
-if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then
-    buildPhase=bmakeBuildPhase
-fi
-
-if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then
-    checkPhase=bmakeCheckPhase
-fi
-
-if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then
-    installPhase=bmakeInstallPhase
-fi
-
-if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then
-    distPhase=bmakeDistPhase
-fi
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch
deleted file mode 100644
index 117b85da16d1..000000000000
--- a/nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bmake/unit-tests/Makefile.orig	2021-07-04 19:13:09.068094922 +0200
-+++ bmake/unit-tests/Makefile	2021-07-04 19:13:14.630080696 +0200
-@@ -295,9 +295,7 @@
- TESTS+=		sh-single-line
- TESTS+=		shell-csh
- TESTS+=		shell-custom
--.if exists(/bin/ksh)
- TESTS+=		shell-ksh
--.endif
- TESTS+=		shell-sh
- TESTS+=		suff-add-later
- TESTS+=		suff-clear-regular