[boxes] Fix race condition in parallel make (#1106015)

Jakub Hrozek jhrozek at fedoraproject.org
Tue Jul 1 08:27:36 UTC 2014


commit 8f7a7d9bc9278ed8dce167902035cd32b7f25a21
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Mon Jun 30 16:39:03 2014 -0500

    Fix race condition in parallel make (#1106015)

 boxes-fix_make.patch |   13 +++++++++++++
 boxes.spec           |    5 ++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/boxes-fix_make.patch b/boxes-fix_make.patch
index bd8dc45..9c9c8e9 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 at redhat.com> - 1.1.1-4
+- Fix race condition in parallel make (#1106015)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list