diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-10-17 17:47:53 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-10-22 08:08:57 -0700 |
| commit | 6634c058d201e00b9ea42265b2f8a5f459e45711 (patch) | |
| tree | c5dd0f7545de6a6c9452f5f2c17129afecd0d58e /tools | |
| parent | 6384782d19e14fbeb85e9d3f2e22e0242200dbeb (diff) | |
tools/depends: add automake patch to fix race in parallel builds
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/native/automake/01-fix-help2man-error.patch | 12 | ||||
| -rw-r--r-- | tools/depends/native/automake/Makefile | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/tools/depends/native/automake/01-fix-help2man-error.patch b/tools/depends/native/automake/01-fix-help2man-error.patch new file mode 100644 index 0000000000..dd056826ab --- /dev/null +++ b/tools/depends/native/automake/01-fix-help2man-error.patch @@ -0,0 +1,12 @@ +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 2020-03-16 19:11:10.000000000 -0700 ++++ b/Makefile.in 2020-10-22 08:06:24.606751367 -0700 +@@ -699,7 +699,7 @@ + update_mans = \ + $(AM_V_GEN): \ + && $(MKDIR_P) doc \ +- && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@ ++ && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr + + amhello_sources = \ + doc/amhello/configure.ac \ diff --git a/tools/depends/native/automake/Makefile b/tools/depends/native/automake/Makefile index 3dfa1c1130..66c14a7632 100644 --- a/tools/depends/native/automake/Makefile +++ b/tools/depends/native/automake/Makefile @@ -1,6 +1,6 @@ include ../../Makefile.include PLATFORM=$(NATIVEPLATFORM) -DEPS= ../../Makefile.include Makefile +DEPS= ../../Makefile.include Makefile 01-fix-help2man-error.patch # lib name, version LIBNAME=automake @@ -21,6 +21,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../01-fix-help2man-error.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) |