sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/xombrero: unbreak parallel make

Browse source 
FreeBSD-specific Makefile had no dependencies for generated include
file tooltips.h and for fast machines, build for settings.c happened
before completion of its generation.

And xombrero.o depends only on javascript.h (via xombrero.h), there
is no dependency on tooltips.h.

Separate patch, since the first one (patch-freebsd__Makefile) went
upstream, so we can have it removed in the next version.

This should unbreak builds on 9.x and 10.x, but I'll test this
specifically on the build machines and will remove BROKENs after this.
Hopefully, others will be able to test this new version as well.
If so, drop me e-mail at rea@FreeBSD.org.
This commit is contained in:
Eygene Ryabinkin 2016-12-25 22:24:03 +00:00
parent cf1e192dd2
commit 2859b60450
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=429466
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/xombrero/Makefile
View file

@ -6,7 +6,7 @@ PORTVERSION= 1.6.4
CATEGORIES= www
MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= rea@FreeBSD.org
COMMENT= Minimalists vi-like web browser based on webkit and GTK+
LICENSE= ISCL

32
www/xombrero/files/patch-freebsd__Makefile.2 Normal file
View file

@ -0,0 +1,32 @@
--- freebsd/Makefile.old 2016-12-25 23:58:00.917123000 +0300
+++ freebsd/Makefile 2016-12-25 23:58:00.917136000 +0300
@@ -20,6 +20,11 @@
CC?= cc
+PARENT_OBJS= \
+ ../xombrero.o freebsd.o ../marco.o ../about.o ../inspector.o ../whitelist.o \
+ ../settings.o ../cookie.o ../history.o ../completion.o ../inputfocus.o ../tldlist.o \
+ ../externaleditor.o ../unix.o
+
all: ../javascript.h ../tooltip.h xombrero
../javascript.h: ../js-merge-helper.pl ../hinting.js ../autoscroll.js
@@ -57,11 +62,13 @@
tldlist.o: ../tldlist.o
-../xombrero.o: ../javascript.h ../tooltip.h
+../settings.o: ../tooltip.h
-xombrero: ../xombrero.o freebsd.o ../marco.o ../about.o ../inspector.o ../whitelist.o \
- ../settings.o ../cookie.o ../history.o ../completion.o ../inputfocus.o ../tldlist.o \
- ../externaleditor.o ../unix.o
+$(PARENT_OBJS): ../xombrero.h
+
+../xombrero.h: ../javascript.h
+
+xombrero: freebsd.o $(PARENT_OBJS)
$(CC) $(LDFLAGS) -o $@ ${.ALLSRC} $(LDADD)
install: all