From ab29403fcd0b38c36935ac83219a11edd0c2e91c Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Thu, 22 Dec 2011 09:50:00 +0000 Subject: 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 , Piotr Kubaj Tested by: Andrei , Piotr Kubaj --- www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in') 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) -- cgit v1.2.3