|
 |
37d56c0 |
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
|
37d56c0 |
## 319-work-around-imake-segfaults.dpatch by <kmccarty@debian.org>
|
|
|
37d56c0 |
##
|
|
|
37d56c0 |
## All lines beginning with `## DP:' are a description of the patch.
|
|
|
37d56c0 |
## DP: If at first Imake doesn't succeed, try, try again.
|
|
|
37d56c0 |
## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.)
|
|
|
37d56c0 |
|
|
|
37d56c0 |
@DPATCH@
|
|
|
37d56c0 |
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
|
|
|
37d56c0 |
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500
|
|
|
37d56c0 |
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500
|
|
|
37d56c0 |
@@ -1296,7 +1296,11 @@
|
|
|
37d56c0 |
$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\
|
|
|
37d56c0 |
-DPackageTop=$(PACKAGETOP) \ @@\
|
|
|
37d56c0 |
-DPackageName=$(PACKAGE_NAME) \ @@\
|
|
|
37d56c0 |
- imakeflags -f $<
|
|
|
37d56c0 |
+ imakeflags -f $< || \ @@\
|
|
|
37d56c0 |
+ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\
|
|
|
37d56c0 |
+ -DPackageTop=$(PACKAGETOP) \ @@\
|
|
|
37d56c0 |
+ -DPackageName=$(PACKAGE_NAME) \ @@\
|
|
|
37d56c0 |
+ imakeflags -f $< || exit 1
|
|
|
37d56c0 |
|
|
|
37d56c0 |
#endif /* BuildMakefileTarget */
|
|
|
37d56c0 |
|
|
|
37d56c0 |
@@ -2127,7 +2131,11 @@
|
|
|
37d56c0 |
ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\
|
|
|
37d56c0 |
-DCURDIR=$$curdir$$i \ @@\
|
|
|
37d56c0 |
-DPackageTop=$(PACKAGETOP) \ @@\
|
|
|
37d56c0 |
- -DPackageName=$(PACKAGE_NAME); \ @@\
|
|
|
37d56c0 |
+ -DPackageName=$(PACKAGE_NAME) || \ @@\
|
|
|
37d56c0 |
+ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\
|
|
|
37d56c0 |
+ -DCURDIR=$$curdir$$i \ @@\
|
|
|
37d56c0 |
+ -DPackageTop=$(PACKAGETOP) \ @@\
|
|
|
37d56c0 |
+ -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\
|
|
|
37d56c0 |
fi; \ @@\
|
|
|
37d56c0 |
$(MAKE) $(MFLAGS) Makefiles; \ @@\
|
|
|
37d56c0 |
cd $$newtop; \ @@\
|
|
|
37d56c0 |
@@ -2322,7 +2330,12 @@
|
|
|
37d56c0 |
-DCURDIR=$$curdir$$i \ @@\
|
|
|
37d56c0 |
-DPackageTop=$(PACKAGETOP) \ @@\
|
|
|
37d56c0 |
-DPackageName=$(PACKAGE_NAME) \ @@\
|
|
|
37d56c0 |
- -f $$imakefile; \ @@\
|
|
|
37d56c0 |
+ -f $$imakefile || \ @@\
|
|
|
37d56c0 |
+ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\
|
|
|
37d56c0 |
+ -DCURDIR=$$curdir$$i \ @@\
|
|
|
37d56c0 |
+ -DPackageTop=$(PACKAGETOP) \ @@\
|
|
|
37d56c0 |
+ -DPackageName=$(PACKAGE_NAME) \ @@\
|
|
|
37d56c0 |
+ -f $$imakefile || exit 1; \ @@\
|
|
|
37d56c0 |
fi; \ @@\
|
|
|
37d56c0 |
fi;
|
|
|
37d56c0 |
#endif
|