diff options
| author | flo <flo@FreeBSD.org> | 2011-12-22 17:50:00 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2011-12-22 17:50:00 +0800 |
| commit | 3e10dfffa777b48822bcbb34685d14e45b27985a (patch) | |
| tree | 79010e23bc49745b8f9c58aaea0a9135a07ccb34 /www/firefox-esr | |
| parent | 1540e7941d6f97335101158bd117315e4eeb19c5 (diff) | |
| download | freebsd-ports-gnome-3e10dfffa777b48822bcbb34685d14e45b27985a.tar.gz freebsd-ports-gnome-3e10dfffa777b48822bcbb34685d14e45b27985a.tar.zst freebsd-ports-gnome-3e10dfffa777b48822bcbb34685d14e45b27985a.zip | |
fix the WITH_PGO case.
patches applied to mozilla-release/config need to also be applied to
mozilla-release/js/src/config and vice versa, otherwise the build will fail with
a message like
TEST-UNEXPECTED-FAIL | check-sync-dirs.py | build file copies are not in sync
Reported by: Andrei <az@azsupport.com>, Piotr Kubaj <pkubaj@gmail.com>
Tested by: Andrei <az@azsupport.com>, Piotr Kubaj <pkubaj@gmail.com>
Diffstat (limited to 'www/firefox-esr')
| -rw-r--r-- | www/firefox-esr/Makefile | 2 | ||||
| -rw-r--r-- | www/firefox-esr/files/patch-config_config.mk | 10 | ||||
| -rw-r--r-- | www/firefox-esr/files/patch-config_mkdepend_Makefile.in | 10 | ||||
| -rw-r--r-- | www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in | 9 |
4 files changed, 23 insertions, 8 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 0bb4b32c62b8..638522577e36 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -118,6 +118,8 @@ post-patch: ${WRKSRC}/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ ${WRKSRC}/js/src/config/config.mk \ + ${WRKSRC}/config/mkdepend/Makefile.in \ + ${WRKSRC}/config/config.mk \ ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/www/firefox-esr/files/patch-config_config.mk b/www/firefox-esr/files/patch-config_config.mk new file mode 100644 index 000000000000..bea88f7f78e4 --- /dev/null +++ b/www/firefox-esr/files/patch-config_config.mk @@ -0,0 +1,10 @@ +--- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 ++++ config/config.mk 2009-08-09 20:50:05.000000000 +0200 +@@ -506,6 +506,7 @@ + -I$(srcdir) \ + -I. \ + -I$(DIST)/include -I$(DIST)/include/nsprpub \ ++ -I%%LOCALBASE%%/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ + $(OS_INCLUDES) \ + $(NULL) diff --git a/www/firefox-esr/files/patch-config_mkdepend_Makefile.in b/www/firefox-esr/files/patch-config_mkdepend_Makefile.in index 5f341b26d09c..65687c7c5feb 100644 --- a/www/firefox-esr/files/patch-config_mkdepend_Makefile.in +++ b/www/firefox-esr/files/patch-config_mkdepend_Makefile.in @@ -1,9 +1,11 @@ ---- config/mkdepend/Makefile.in.orig 2009-04-28 08:07:48.532396203 +0000 -+++ config/mkdepend/Makefile.in 2009-04-28 08:08:07.342398592 +0000 -@@ -73,6 +73,7 @@ +--- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 ++++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 +@@ -71,7 +71,8 @@ + include $(topsrcdir)/config/rules.mk - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" +-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include +HOST_CFLAGS += $(XCFLAGS) ifdef GNU_CC diff --git a/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in index 6c25c71ce6c6..fa2cc6012a3a 100644 --- a/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in +++ b/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in @@ -1,11 +1,12 @@ ---- js/src/config/mkdepend/Makefile.in.orig 2009-04-28 08:17:55.069074748 +0000 -+++ js/src/config/mkdepend/Makefile.in 2009-04-28 08:18:44.897081100 +0000 -@@ -72,7 +72,7 @@ +--- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 ++++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 +@@ -71,7 +71,8 @@ include $(topsrcdir)/config/rules.mk -HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include ++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include ++HOST_CFLAGS += $(XCFLAGS) ifdef GNU_CC _GCCDIR = $(shell $(CC) -print-file-name=include) |