Compare commits

..

No commits in common. "f7e27f7959aac82b5bd17f3f8ab33e4a85ba82b6" and "c5249f9171109c239a47571a7266fbae40dee4d0" have entirely different histories.

5 changed files with 59 additions and 28 deletions

25
make-4.3-j8k.patch Normal file
View File

@ -0,0 +1,25 @@
diff -Nrup a/src/main.c b/src/main.c
--- a/src/main.c 2016-05-31 03:17:26.000000000 -0400
+++ b/src/main.c 2016-09-22 16:18:52.283889265 -0400
@@ -2051,6 +2051,21 @@ main (int argc, char **argv, char **envp
}
#endif
+#ifdef PIPE_BUF
+ if (job_slots > PIPE_BUF)
+#elif defined _POSIX_PIPE_BUF
+ if (job_slots > _POSIX_PIPE_BUF)
+#else
+ if (job_slots > 512)
+#endif
+ {
+ O (error, NILF,
+ _("More parallel jobs (-jN) than this platform can handle requested."));
+ O (error, NILF, _("Resetting to single job (-j1) mode."));
+ job_slots = 1;
+ }
+
+
/* If we have >1 slot at this point, then we're a top-level make.
Set up the jobserver.

View File

@ -0,0 +1,16 @@
diff -up make-4.3/src/job.c\~ make-4.3/src/job.c
--- make-3.82/src/job.c~ 2010-08-11 16:13:33.000000000 +0200
+++ make-3.82/src/job.c 2010-08-12 14:20:08.000000000 +0200
@@ -2442,7 +2442,11 @@ construct_command_argv_internal (char *l
/* See if it is safe to parse commands internally. */
if (shell == 0)
- shell = default_shell;
+ {
+ shell = default_shell;
+ if (shellflags == 0)
+ shellflags = "-c";
+ }
#ifdef WINDOWS32
else if (strcmp (shell, default_shell))
{

BIN
make-4.3.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,18 +1,19 @@
Name: make Name: make
Epoch: 1 Epoch: 1
Version: 4.4.1 Version: 4.3
Release: 2 Release: 2
Summary: A tool which controls the generation of executables and non-source files of a program Summary: A tool which controls the generation of executables and non-source files of a program
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/make/ URL: http://www.gnu.org/software/make/
Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
Patch0: make-4.3-weird-shell.patch
Patch1: make-4.3-j8k.patch
BuildRequires: gcc git autoconf automake procps BuildRequires: gcc git autoconf automake procps
BuildRequires: guile-devel perl-interpreter make BuildRequires: guile-devel perl-interpreter make
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
Provides: %{name}-devel = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
%description %description
GNU Make is a tool which controls the generation of executables and other GNU Make is a tool which controls the generation of executables and other
@ -23,6 +24,14 @@ the makefile, which lists each of the non-source files and how to compute
it from other files. When you write a program, you should write a makefile it from other files. When you write a program, you should write a makefile
for it, so that it is possible to use Make to build and install the program. for it, so that it is possible to use Make to build and install the program.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package_help %package_help
%prep %prep
@ -40,7 +49,7 @@ ln -sf make %{buildroot}/%{_bindir}/gmake
ln -sf make.1 %{buildroot}/%{_mandir}/man1/gmake.1 ln -sf make.1 %{buildroot}/%{_mandir}/man1/gmake.1
rm -f %{buildroot}/%{_infodir}/dir rm -f %{buildroot}/%{_infodir}/dir
%find_lang %{name} %find_lang %name
%check %check
# check will fail if running the test with -j2 # check will fail if running the test with -j2
@ -48,13 +57,7 @@ rm -f %{buildroot}/%{_infodir}/dir
if [ "%{_smp_mflags}" = "-j2" ]; then if [ "%{_smp_mflags}" = "-j2" ]; then
echo "test will fail with make -j2 check" echo "test will fail with make -j2 check"
else else
/usr/bin/env LANG=C make check || { /usr/bin/env LANG=C make check
for f in tests/work/*/*.diff; do
test -f "$f" || continue
printf "++++++++++++++ %s ++++++++++++++\n" "${f##*/}"
cat "$f"
done
}
fi fi
%post %post
@ -75,28 +78,15 @@ fi
%{_bindir}/* %{_bindir}/*
%{_includedir}/* %{_includedir}/*
%files devel
%{_includedir}/*
%files help %files help
%doc NEWS %doc NEWS
%{_mandir}/*/* %{_mandir}/*/*
%{_infodir}/* %{_infodir}/*
%changelog %changelog
* Sun Jan 26 2025 fuanan <fuanan3@h-partners.com> - 1:4.4.1-2
- Obsolete useless devel package
* Mon Jul 17 2023 fuanan <fuanan3@h-partners.com> - 1:4.4.1-1
- update version to 4.4.1
* Wed Jan 11 2023 fuanan <fuanan3@h-partners.com> - 1:4.4-2
- Continue build when test-case(features/output-sync) failed
- Handle SIGPIPE as a fatal signal
* Wed Nov 09 2022 fuanan <fuanan3@h-partners.com> - 1:4.4-1
- update version to 4.4
* Wed Oct 19 2022 fuanan <fuanan3@h-partners.com> - 1:4.3-3
- Fix spelling in spec
* Tue Sep 8 2020 wangchen <wangchen137@huawei.com> - 1:4.3-2 * Tue Sep 8 2020 wangchen <wangchen137@huawei.com> - 1:4.3-2
- Modify the URL of Source0 - Modify the URL of Source0