From e8692aa7f1294938a20b312b4173cd6795d2051d Mon Sep 17 00:00:00 2001 From: midipix Date: Tue, 2 Apr 2024 06:42:48 +0000 Subject: bmake,bmake_host: switch to srcbase.foss21.org/, remove obsolete patches. --- patches/bmake.local.patch | 36 ------------------------------------ patches/bmake_host.local.patch | 17 ----------------- patches/bmake_host/gcc10.patch | 24 ------------------------ 3 files changed, 77 deletions(-) delete mode 100644 patches/bmake.local.patch delete mode 100644 patches/bmake_host.local.patch delete mode 100644 patches/bmake_host/gcc10.patch (limited to 'patches') diff --git a/patches/bmake.local.patch b/patches/bmake.local.patch deleted file mode 100644 index 20d45524..00000000 --- a/patches/bmake.local.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- bmake/boot-strap.orig 2020-02-08 19:30:56.653565539 +0000 -+++ bmake/boot-strap 2020-02-11 11:45:44.426114614 +0000 -@@ -202,7 +202,6 @@ - fi - - op=all --BMAKE= - - while : - do -@@ -391,7 +390,7 @@ - cd $Mydir && - MAKESYSPATH=$mksrc SRCTOP=$Mydir OBJTOP=$objdir \ - MAKEOBJDIR='${.CURDIR:S,${SRCTOP:tA},${OBJTOP:tA},}' \ -- ${BMAKE:-$objdir/bmake} -f $Mydir/Makefile "$@" -+ ${BMAKE} -f $Mydir/Makefile TEST_MAKE="${BMAKE}" "$@" - ) - } - ---- bmake/install-sh.orig 2020-02-15 15:51:24.856000000 +0000 -+++ bmake/install-sh 2020-02-20 15:52:47.596000000 +0000 -@@ -1,3 +1,4 @@ -+#!/bin/sh - : - # NAME: - # install.sh - portable version of install(1) ---- bmake/makefile.in.orig 2022-12-26 19:16:39.881930779 +0100 -+++ bmake/makefile.in 2023-03-23 18:09:58.883692945 +0100 -@@ -9,6 +9,6 @@ - all: build - - build clean install test: -- ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@ -+ MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@ - - diff --git a/patches/bmake_host.local.patch b/patches/bmake_host.local.patch deleted file mode 100644 index 0999df4d..00000000 --- a/patches/bmake_host.local.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- bmake/install-sh.orig 2020-02-15 15:51:24.856000000 +0000 -+++ bmake/install-sh 2020-02-20 15:52:47.596000000 +0000 -@@ -1,3 +1,4 @@ -+#!/bin/sh - : - # NAME: - # install.sh - portable version of install(1) ---- bmake/makefile.in.orig 2022-12-26 19:16:39.881930779 +0100 -+++ bmake/makefile.in 2023-03-23 18:09:58.883692945 +0100 -@@ -9,6 +9,6 @@ - all: build - - build clean install test: -- ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@ -+ MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@ - - diff --git a/patches/bmake_host/gcc10.patch b/patches/bmake_host/gcc10.patch deleted file mode 100644 index 18e3e13c..00000000 --- a/patches/bmake_host/gcc10.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru bmake.orig/job.c bmake/job.c ---- bmake.orig/job.c 2020-04-09 14:03:57.232919836 +0200 -+++ bmake/job.c 2020-06-14 22:19:09.776490793 +0200 -@@ -180,6 +180,8 @@ - #define ABORT_WAIT 3 /* Waiting for jobs to finish */ - #define JOB_TOKENS "+EI+" /* Token to requeue for each abort state */ - -+FILE *debug_file; -+ - /* - * this tracks the number of tokens currently "out" to build jobs. - */ -diff -ru bmake.orig/make.h bmake/make.h ---- bmake.orig/make.h 2020-02-10 18:07:01.708744511 +0100 -+++ bmake/make.h 2020-06-14 22:18:24.965773603 +0200 -@@ -464,7 +464,7 @@ - * There is one bit per module. It is up to the module what debug - * information to print. - */ --FILE *debug_file; /* Output written here - default stdout */ -+extern FILE *debug_file; /* Output written here - default stdout */ - extern int debug; - #define DEBUG_ARCH 0x00001 - #define DEBUG_COND 0x00002 -- cgit v1.2.3