Several of the directories in xfsdump are not parallel compile safe, due to
their behavior of deleting and symlinking heads from other directories.
This patch modifies those Makefiles to have the symlinks be a dependancy of the
source in those directories, ensuring that all of the symlinks will exist
before the actual compiling is started.
Signed-off-by: Robin H. Johnson <robbat2@xxxxxxxxxx>
diff -Nuar --exclude '*.orig' --exclude builddefs.in
xfsdump-2.2.33/dump/Makefile xfsdump-2.2.33/dump/Makefile
--- xfsdump-2.2.33/dump/Makefile 2006-01-11 21:06:47.000000000 -0800
+++ xfsdump-2.2.33/dump/Makefile 2006-06-11 12:36:21.436682241 -0700
@@ -102,7 +102,9 @@
install-dev:
$(COMMINCL) $(COMMON):
- @$(RM) $@; $(LN_S) ../common/$@ $@
+ $(RM) $@; $(LN_S) ../common/$@ $@
$(INVINCL) $(INVCOMMON):
- @$(RM) $@; $(LN_S) ../inventory/$@ $@
+ $(RM) $@; $(LN_S) ../inventory/$@ $@
+
+$(LOCALS): $(LINKS)
diff -Nuar --exclude '*.orig' --exclude builddefs.in
xfsdump-2.2.33/invutil/Makefile xfsdump-2.2.33/invutil/Makefile
--- xfsdump-2.2.33/invutil/Makefile 2006-01-11 21:06:48.000000000 -0800
+++ xfsdump-2.2.33/invutil/Makefile 2006-06-11 12:36:21.438682223 -0700
@@ -66,7 +66,9 @@
install-dev:
$(COMMINCL) $(COMMON):
- @$(RM) $@; $(LN_S) ../common/$@ $@
+ $(RM) $@; $(LN_S) ../common/$@ $@
$(INVINCL) $(INVCOMMON):
- @$(RM) $@; $(LN_S) ../inventory/$@ $@
+ $(RM) $@; $(LN_S) ../inventory/$@ $@
+
+$(LOCALS): $(LINKS)
diff -Nuar --exclude '*.orig' --exclude builddefs.in
xfsdump-2.2.33/restore/Makefile xfsdump-2.2.33/restore/Makefile
--- xfsdump-2.2.33/restore/Makefile 2006-01-11 21:06:49.000000000 -0800
+++ xfsdump-2.2.33/restore/Makefile 2006-06-11 12:36:21.433682268 -0700
@@ -112,7 +112,9 @@
install-dev:
$(COMMINCL) $(COMMON):
- @$(RM) $@; $(LN_S) ../common/$@ $@
+ $(RM) $@; $(LN_S) ../common/$@ $@
$(INVINCL) $(INVCOMMON):
- @$(RM) $@; $(LN_S) ../inventory/$@ $@
+ $(RM) $@; $(LN_S) ../inventory/$@ $@
+
+$(LOCALS): $(LINKS)
--
Robin Hugh Johnson
E-Mail : robbat2@xxxxxxxxxx
GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
pgp3OWDFgCD18.pgp
Description: PGP signature
|