svn commit: r429466 - in head/www/xombrero: . files
Eygene Ryabinkin
rea at FreeBSD.org
Sun Dec 25 22:24:05 UTC 2016
Author: rea
Date: Sun Dec 25 22:24:03 2016
New Revision: 429466
URL: https://svnweb.freebsd.org/changeset/ports/429466
Log:
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 at FreeBSD.org.
Added:
head/www/xombrero/files/patch-freebsd__Makefile.2 (contents, props changed)
Modified:
head/www/xombrero/Makefile
Modified: head/www/xombrero/Makefile
==============================================================================
--- head/www/xombrero/Makefile Sun Dec 25 21:17:07 2016 (r429465)
+++ head/www/xombrero/Makefile Sun Dec 25 22:24:03 2016 (r429466)
@@ -6,7 +6,7 @@ PORTVERSION= 1.6.4
CATEGORIES= www
MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= rea at FreeBSD.org
COMMENT= Minimalists vi-like web browser based on webkit and GTK+
LICENSE= ISCL
Added: head/www/xombrero/files/patch-freebsd__Makefile.2
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/xombrero/files/patch-freebsd__Makefile.2 Sun Dec 25 22:24:03 2016 (r429466)
@@ -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
More information about the svn-ports-head
mailing list