[SVN-Commit] r9 - in trunk/www/firefox3-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: miwi
Date: Tue Apr 21 14:16:26 2009
New Revision: 9

Log:
- Fix build on Thinderbox

thx to gahr@

Added:
   trunk/www/firefox3-devel/files/patch-js-src-config_config.mk
Modified:
   trunk/www/firefox3-devel/Makefile
   trunk/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in

Modified: trunk/www/firefox3-devel/Makefile
==============================================================================
--- trunk/www/firefox3-devel/Makefile	Tue Apr 21 12:56:16 2009	(r8)
+++ trunk/www/firefox3-devel/Makefile	Tue Apr 21 14:16:26 2009	(r9)
@@ -86,7 +86,9 @@
 		${WRKSRC}/storage/build/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
+		${WRKSRC}/security/manager/ssl/src/Makefile.in \
+		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
+		${WRKSRC}/js/src/config/config.mk
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; \

Modified: trunk/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in	Tue Apr 21 12:56:16 2009	(r8)
+++ trunk/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in	Tue Apr 21 14:16:26 2009	(r9)
@@ -1,11 +1,11 @@
---- js/src/config/mkdepend/Makefile.in.orgi	2009-04-21 03:23:38.000000000 +0200
-+++ js/src/config/mkdepend/Makefile.in	2009-04-21 03:23:58.000000000 +0200
+--- js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
++++ js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
 @@ -72,7 +72,7 @@
  
  include $(topsrcdir)/config/rules.mk
  
 -HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= $(XCFLAGS)
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
  
  ifdef GNU_CC
  _GCCDIR		= $(shell $(CC) -print-file-name=include)

Added: trunk/www/firefox3-devel/files/patch-js-src-config_config.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-js-src-config_config.mk	Tue Apr 21 14:16:26 2009	(r9)
@@ -0,0 +1,11 @@
+--- js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
++++ js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
+@@ -490,7 +490,7 @@
+ INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
+ 
+ ifndef MOZILLA_INTERNAL_API
+-INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include
++INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
+ endif
+ 
+ include $(topsrcdir)/config/static-checking-config.mk