diff options
| author | rea <rea@FreeBSD.org> | 2016-12-26 06:24:03 +0800 |
|---|---|---|
| committer | rea <rea@FreeBSD.org> | 2016-12-26 06:24:03 +0800 |
| commit | c0ebdd7686c4069b75d6935b97ed2170a10779b5 (patch) | |
| tree | c84a95d1570bca9aae068b47a1d145e5001bf1a9 /www | |
| parent | 303d787af3e9f8a36937241d94dcf2ff51f4fc8e (diff) | |
| download | freebsd-ports-gnome-c0ebdd7686c4069b75d6935b97ed2170a10779b5.tar.gz freebsd-ports-gnome-c0ebdd7686c4069b75d6935b97ed2170a10779b5.tar.zst freebsd-ports-gnome-c0ebdd7686c4069b75d6935b97ed2170a10779b5.zip | |
www/xombrero: unbreak parallel make
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.
Diffstat (limited to 'www')
| -rw-r--r-- | www/xombrero/Makefile | 2 | ||||
| -rw-r--r-- | www/xombrero/files/patch-freebsd__Makefile.2 | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile index 7f180c5f1c98..e79eb609731b 100644 --- a/www/xombrero/Makefile +++ b/www/xombrero/Makefile @@ -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 diff --git a/www/xombrero/files/patch-freebsd__Makefile.2 b/www/xombrero/files/patch-freebsd__Makefile.2 new file mode 100644 index 000000000000..0d8237f5f81c --- /dev/null +++ b/www/xombrero/files/patch-freebsd__Makefile.2 @@ -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 |