Attachment 913566 Details for Bug 1106015 – Fix race condition in parallel make

[patch] Fix race condition in parallel make

Fix-race-condition-in-parallel-make-1106015.patch (text/plain), 1.88 KB, created by Yaakov Selkowitz on 2014-06-30 21:39:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-30 21:39:28 UTC

Size: 1.88 KB

patch

obsolete

>From 919e08f3a305af1fd06e7c6d94588a81de5af922 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Mon, 30 Jun 2014 16:39:03 -0500
>Subject: [PATCH] Fix race condition in parallel make (#1106015)
>
>---
> boxes-fix_make.patch | 13 +++++++++++++
> boxes.spec           |  5 ++++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/boxes-fix_make.patch b/boxes-fix_make.patch
>index bd8dc45..f4cd9c9 100644
>--- a/boxes-fix_make.patch
>+++ b/boxes-fix_make.patch
>@@ -12,6 +12,19 @@ diff -up ./src/Makefile.fix_smp_flags ./src/Makefile
>  debug:
>  	$(MAKE) CFLAGS_ADDTL=-g boxes
>  
>+@@ -123,10 +123,8 @@ parser.c parser.h: parser.y boxes.h regexp/regexp.h
>+ 	$(YACC) -o parser.c -d parser.y
>+ 
>+ lex.yy.c: lexer.l boxes.h
>+-	$(LEX) -t lexer.l > lexer.tmp.c
>+-	echo '#include "config.h"' > lex.yy.c
>+-	cat lexer.tmp.c >> lex.yy.c
>+-	rm lexer.tmp.c
>++	echo '#include "config.h"' > lexer.tmp.c
>++	$(LEX) -t lexer.l >> lexer.tmp.c && mv lexer.tmp.c lex.yy.c
>+ 
>+ 
>+ boxes.o: boxes.c boxes.h regexp/regexp.h shape.h tools.h generate.h remove.h config.h
> diff -up ./Makefile.fix_smp_flags ./Makefile
> --- ./Makefile.fix_smp_flags	2006-07-23 20:03:43.000000000 +0200
> +++ ./Makefile	2007-09-30 19:48:19.000000000 +0200
>diff --git a/boxes.spec b/boxes.spec
>index 8719080..f756964 100644
>--- a/boxes.spec
>+++ b/boxes.spec
>@@ -1,6 +1,6 @@
> Name:           boxes
> Version:        1.1.1
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        Draw any kind of box around some given text
> 
> Group:          Applications/Text
>@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
> %doc COPYING README
> 
> %changelog
>+* Mon Jun 30 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1.1-4
>+- Fix race condition in parallel make (#1106015)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1106015: 903636 | 903637 | 903638 | 913566