[SVN-Commit] r588 - branches/experimental/www/firefox-aurora/files

[Pan Tsu]

Florian Smeets <flo at FreeBSD.org> writes:

> On 13.07.11 10:42, Pan Tsu wrote:
>> svn-freebsd-gecko at chruetertee.ch writes:
>>
>>> Author: flo
>>> Date: Mon Jul 11 10:15:50 2011
>>> New Revision: 588
>>>
>>> Log:
>>> readd patch to the correct file
>>>
>>> Submitted by:	Pan Tsu<inyaoo at gmail.com>
>>>
>>> Note, firefox-aurora is still completeley broken
>>
>> Broken? Does it crash? Even when built WITH_DEBUG= ?
>> I for one get crashes on Minefield with non-debug builds after
>>
>>    https://bugzilla.mozilla.org/show_bug.cgi?id=552864
>>
>
> Yep, that seems to be the culprit. It cannot find xpcom without
> LD_LIBRARY_PATH being set, when i set it firefox crashes with sigsegv.

Erm, it's a bsd.gecko.mk fault that you need to set LD_LIBRARY_PATH.
Look at the contents of FAKEDIR just after it's populated. So, to not
break the link(s) smth like ports/148475 needs to applied, see below.

%%
Index: Mk/bsd.gecko.mk
===================================================================
RCS file: /a/.cvsup/ports/Mk/bsd.gecko.mk,v
retrieving revision 1.30
diff -u -p -r1.30 bsd.gecko.mk
--- Mk/bsd.gecko.mk	30 Jun 2011 18:19:47 -0000	1.30
+++ Mk/bsd.gecko.mk	14 Jul 2011 14:40:06 -0000
@@ -845,11 +852,10 @@ gecko-pre-install:
 .endfor
 	@${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \
 		s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \
-		${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
+		-i '' $$(${REALPATH} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*)
 .endif
 	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
-	${RM} -f ${FAKEDIR}/bin/*.bak
+		-i '' $$(${REALPATH} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*)
 .endif
 
 gecko-create-plist:
@@ -890,10 +896,9 @@ gecko-do-install:
 .for dir in ${MOZILLA_PLIST_DIRS}
 .if !exists(${PREFIX}/${dir})
 	${MKDIR} ${PREFIX}/${dir}
-	${CHMOD} 755 ${PREFIX}/${dir}
 .endif
-	cd ${FAKEDIR}/${dir} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir}
+	${TAR} cf - -C${FAKEDIR}/${dir} -s'|${FAKEDIR}|${PREFIX}|s' . | \
+		${TAR} xof - -C${PREFIX}/${dir}
 .endfor
 .for pcfile in ${MOZ_PKGCONFIG_FILES}
 	${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \
%%