rpms/make
5
0
Fork 0
Code Issues Pull Requests Releases Activity

1:3.80-6

Browse Source
This commit is contained in:
Jakub Jelinek 2004-12-13 17:53:40 +00:00
parent aaabb91545
commit a38a0f7e93
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
make-3.80-j8k.patch Normal file
View File

@ -0,0 +1,23 @@
--- make-3.80/main.c.jj 2002-08-09 21:27:17.000000000 -0400
+++ make-3.80/main.c 2004-12-13 12:48:25.000000000 -0500
@@ -1549,6 +1549,20 @@ int main (int argc, char ** argv)
}
}
+#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
+ {
+ error (NILF,
+ _("More parallel jobs (-jN) than this platform can handle requested."));
+ error (NILF, _("Resetting to single job (-j1) mode."));
+ job_slots = 1;
+ }
+
/* If we have >1 slot but no jobserver-fds, then we're a top-level make.
Set up the pipe and install the fds option for our children. */

7
make.spec
View File

@ -2,7 +2,7 @@ Summary: A GNU tool which simplifies the build process for users.
Name: make Name: make
Epoch: 1 Epoch: 1
Version: 3.80 Version: 3.80
Release: 5 Release: 6
License: GPL License: GPL
Group: Development/Tools Group: Development/Tools
URL: http://www.gnu.org/software/make/ URL: http://www.gnu.org/software/make/
@ -10,6 +10,7 @@ Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2
Patch: make-3.79.1-noclock_gettime.patch Patch: make-3.79.1-noclock_gettime.patch
Patch2: make-3.79.1-siglist.patch Patch2: make-3.79.1-siglist.patch
Patch3: make-3.80-cvs.patch Patch3: make-3.80-cvs.patch
Patch4: make-3.80-j8k.patch
Prereq: /sbin/install-info Prereq: /sbin/install-info
Prefix: %{_prefix} Prefix: %{_prefix}
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
@ -30,6 +31,7 @@ commonly used to simplify the process of installing programs.
%patch -p1 %patch -p1
#%patch2 -p1 #%patch2 -p1
%patch3 -p0 %patch3 -p0
%patch4 -p1
%build %build
#autoreconf -f --install #autoreconf -f --install
@ -71,6 +73,9 @@ fi
%{_infodir}/*.info* %{_infodir}/*.info*
%changelog %changelog
* Mon Dec 13 2004 Jakub Jelinek <jakub@redhat.com> 3.80-6
- refuse -jN where N is bigger than PIPE_BUF (#142691, #17374)
* Thu Oct 7 2004 Jakub Jelinek <jakub@redhat.com> 3.80-5 * Thu Oct 7 2004 Jakub Jelinek <jakub@redhat.com> 3.80-5
- add URL rpm tag (#134799) - add URL rpm tag (#134799)