cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid bogus -k flags; proposed by pascal@.

Browse Source 
Build fonts before using them; fixes parallel builds as tested by naddy@.
In case we ever support PDF, don't break parallel builds; ok pascal@.
These are all purely build system fixes; no package change, no bump.
This commit is contained in:
schwarze 2012-01-01 21:05:33 +00:00
parent d9eef11aed
commit e5e54bed0e
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
textproc/groff/patches/patch-Makefile_in
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-Makefile_in,v 1.2 2011/10/12 22:00:07 schwarze Exp $
$OpenBSD: patch-Makefile_in,v 1.3 2012/01/01 21:05:33 schwarze Exp $
# Chunk 1: Install preformatted manuals, not source pages.
# Chunk 2: Do not depend on MAKEOVERRIDES, a GNU make extension that
# Chunk 2: Do not use make -k unless that's really requested.
# Chunk 3 & 4: OTHERDIRS must be done after DEVDIRS
# Chunk 4: Do not depend on MAKEOVERRIDES, a GNU make extension that
# prevents the recursive passing of command line assignments to sub-makes.
# Specifically, we must not pass overrides like top_srcdir=...
# to the sub-makes called in src/libs/gnulib where those variables
# have different values created by the sub-configure there.
--- Makefile.in.orig Fri Dec 31 08:33:08 2010
+++ Makefile.in Tue Oct 11 01:25:20 2011
+++ Makefile.in Mon Dec 26 17:20:22 2011
@@ -247,15 +247,15 @@ manroot=$(mandir)
# `man1ext' is the man section for user commands.
@ -26,12 +28,40 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/10/12 22:00:07 schwarze Exp $
# The configure script checks whether all necessary utility programs for
# grohtml are available -- only then we can build the HTML documentation.
@@ -686,7 +686,7 @@ subdir=src/roff/troff
@@ -543,7 +543,7 @@ MDEFINES= \
"top_srcdir=$(top_srcdir)" \
"version=$(version)"
-MAKE_K_FLAG=`case "$(MAKEFLAGS)" in *k*) echo ' -k ';; esac`
+MAKE_K_FLAG=
INCDIRS=\
src/include
@@ -618,8 +618,8 @@ ALLDIRS=\
$(DEVDIRS) \
$(XDEVDIRS) \
$(OTHERDEVDIRS) \
- $(TTYDEVDIRS) \
- $(OTHERDIRS)
+ $(TTYDEVDIRS)
+# $(OTHERDIRS)
EXTRADIRS=\
font/devps/generate \
font/devdvi/generate \
@@ -680,13 +680,14 @@ ENVSETUP=\
fi
do=all
-dodirs=$(ALLDIRS) dot
+dodirs=$(ALLDIRS) $(OTHERDIRS) dot
# Default target for subdir_Makefile
subdir=src/roff/troff
$(TARGETS):
- @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) do=$@ $(dodirs)
+ @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(dodirs)
+ @$(ENVSETUP); $(MAKE) do=$@ $(ALLDIRS)
+ @$(ENVSETUP); $(MAKE) do=$@ $(OTHERDIRS) dot
dot: FORCE
@$(ENVSETUP); \

24
textproc/groff/patches/patch-contrib_pdfmark_Makefile_sub Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-contrib_pdfmark_Makefile_sub,v 1.1 2012/01/01 21:05:33 schwarze Exp $
Fix parallel build race failure.
This is because the generated pdf files use the local generated
pdfroff helper script, but they don't depend directly upon it, so
make tries to create the two in parallel and randomly falls over.
Fix from upstream CVS by Mike Frysinger <vapier at gentoo dot org>.
--- contrib/pdfmark/Makefile.sub.orig Fri Dec 31 08:33:09 2010
+++ contrib/pdfmark/Makefile.sub Mon Dec 26 09:29:10 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2009, 2011 Free Software Foundation, Inc.
# Written by Keith Marshall (keith.d.marshall@ntlworld.com)
#
# This file is part of groff.
@@ -65,6 +65,9 @@ PDFROFF=\
$(PDFROFF) -mspdf --stylesheet=$(srcdir)/cover.ms $< >$@
all: pdfroff $(make_pdfdoc)
+
+# The pdf files use the local script to generate.
+$(PDFDOCFILES): pdfroff
pdfdoc: gnu.eps $(PDFDOCFILES)