[PATCH]: fix parallel build of hw/xfree86/xf1bpp

Arkadiusz Miskiewicz arekm at maven.pl
Mon Jun 25 08:43:29 PDT 2007


Hello,

Current git xserver/hw/xfree86/xf1bpp is not parallel build safe:

xserver/hw/xfree86/xf1bpp/Makefile.am
 $(libxf1bppmfb_a_SOURCES):
       for i in $(libxf1bppmfb_a_SOURCES) ; do \
               echo "#include \"mfbmap.h\"" > $$i ; \
               echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i ; \
       done

Now since there are multiple files in $libxf1bppmfb_a_SOURCES when doing
parallel build entire for loop can be run several times at the same moment
(where number of parallel runs depends on -jX make argument).

Spotted when doing make -j5.

Fix attached:

diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 6d510d1..dbc7632 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -173,10 +173,8 @@ mfbtileG.c:
 	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
 
 $(libxf1bppmfb_a_SOURCES):
-	for i in $(libxf1bppmfb_a_SOURCES) ; do \
-		echo "#include \"mfbmap.h\"" > $$i ; \
-		echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i ; \
-	done
+	echo "#include \"mfbmap.h\"" > $@
+	echo "#include \"$(top_srcdir)/mfb/$@\"" >> $@
 
 
 EXTRA_DIST = mfbmap.sh mfbunmap.sh 


-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/



More information about the xorg mailing list