Do the PFRAG dance so that it provides a working debug-flavoured

package. Add a run-mozilla.sh patch to make it found our gdb by default.
Teach users how to properly debug mozilla ports.
This commit is contained in:
landry 2010-10-27 13:02:38 +00:00
parent bc4e77d239
commit ab142a5ddc
6 changed files with 75 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2010/10/24 21:40:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.62 2010/10/27 13:02:38 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
@ -11,17 +11,17 @@ MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-seamonkey-1.0beta1
REVISION-lightning = 6
REVISION-lightning = 7
REVISION-main = 0
EPOCH-lightning = 0
# must be in sync with SO_VERSION in mail/mozilla-thunderbird
# for mail/enigmail and productivity/sunbird,-seamonkey to work fine
# must be in sync with SO_VERSION in main/enigmail/seamonkey
SO_VERSION= 16.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = accessibility appcomps auth autoconfig caps chardet chrome commandlines \
calbasecomps composer cookie docshell embedcomponents fileview gkgfxthebes gklayout \
gkplugin htmlpars i18n imgicon imglib2 import intlapp jar50 jsd mail \
gkplugin htmlpars i18n imgicon imglib2 import intlapp jar50 jsd \
mork mozfind mozldap msgsmime necko nsappshell oji permissions pipboot \
pipnss pippki places pref rdf remoteservice satchel spellchecker \
storagecomps suite system-pref tkautocomplete toolkitcomps txmgr uconv \
@ -30,6 +30,15 @@ MOZILLA_LIBS = accessibility appcomps auth autoconfig caps chardet chrome comman
jsj ldap60 ldif60 mozjs prldap60 sqlite3 ssldap60 thebes xpcom \
xpcom_core xul nullplugin unixprintplugin
FLAVOR ?=
.if ${FLAVOR:L:Mdebug}
MOZILLA_LIBS += addrbook bayesflt fts3tok localmail mailnews mailview mime \
mimeemitter msgcompose msgdb msgimap msgmdn msgnews vcard msgbaseutil
.else
MOZILLA_LIBS+= mail
.endif
CATEGORIES= www mail net news
# mozilla public license

View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.5 2010/04/03 09:30:14 landry Exp $
$OpenBSD: README.OpenBSD,v 1.6 2010/10/27 13:02:39 landry Exp $
To disable anti-aliasing (xft) set GDK_USE_XFT=0 in the environment.
@ -28,3 +28,10 @@ This package contains internationalizations for all supported
languages. To configure Seamonkey for your language, go to
Edit->Preferences->Appearance->Languages/Content and select your
favorite Language/Content pack.
Debugging
If you encounter crashes, you might want to build the debug FLAVOR of
this package, and run 'seamonkey -g' to run seamonkey inside gdb, so
that you can gather debugging logs and traces.
Bug reports without that information will be ignored.

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-mozilla_build_unix_run-mozilla_sh,v 1.1 2010/10/27 13:02:39 landry Exp $
help finding our debugger
--- mozilla/build/unix/run-mozilla.sh.orig Wed Oct 27 12:47:04 2010
+++ mozilla/build/unix/run-mozilla.sh Wed Oct 27 12:48:50 2010
@@ -105,25 +105,7 @@ moz_test_binary()
##########################################################################
moz_get_debugger()
{
- debuggers="ddd gdb dbx bdb"
- debugger="notfound"
- done="no"
- for d in $debuggers
- do
- moz_test_binary /bin/type
- if [ $? -eq 1 ]
- then
- dpath=`LC_MESSAGES=C type ${d} | awk '{print $3;}' | sed -e 's/\.$//'`
- else
- dpath=`which ${d}`
- fi
- if [ -x "$dpath" ]
- then
- debugger=$dpath
- break
- fi
- done
- echo $debugger
+ echo "/usr/bin/gdb"
return 0
}
##########################################################################

View File

@ -0,0 +1,16 @@
@comment $OpenBSD: PFRAG.debug-main,v 1.1 2010/10/27 13:02:39 landry Exp $
@lib ${MOZILLA_PROJECT}/components/libaddrbook.so.${LIBaddrbook_VERSION}
@lib ${MOZILLA_PROJECT}/components/libbayesflt.so.${LIBbayesflt_VERSION}
@lib ${MOZILLA_PROJECT}/components/libfts3tok.so.${LIBfts3tok_VERSION}
@lib ${MOZILLA_PROJECT}/components/liblocalmail.so.${LIBlocalmail_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmailnews.so.${LIBmailnews_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmailview.so.${LIBmailview_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmime.so.${LIBmime_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmimeemitter.so.${LIBmimeemitter_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmsgcompose.so.${LIBmsgcompose_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmsgdb.so.${LIBmsgdb_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmsgimap.so.${LIBmsgimap_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmsgmdn.so.${LIBmsgmdn_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmsgnews.so.${LIBmsgnews_VERSION}
@lib ${MOZILLA_PROJECT}/components/libvcard.so.${LIBvcard_VERSION}
@lib ${MOZILLA_PROJECT}/libmsgbaseutil.so.${LIBmsgbaseutil_VERSION}

View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.no-debug-main,v 1.1 2010/10/27 13:02:39 landry Exp $
@lib ${MOZILLA_PROJECT}/components/libmail.so.${LIBmail_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2010/07/27 16:55:21 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2010/10/27 13:02:39 landry Exp $
@conflict seamonkey-<=2.0.6
@pkgpath www/seamonkey
bin/${MOZILLA_PROJECT}
@ -179,7 +179,6 @@ ${MOZILLA_PROJECT}/components/layout_xul_tree.xpt
@lib ${MOZILLA_PROJECT}/components/libintlapp.so.${LIBintlapp_VERSION}
@lib ${MOZILLA_PROJECT}/components/libjar50.so.${LIBjar50_VERSION}
@lib ${MOZILLA_PROJECT}/components/libjsd.so.${LIBjsd_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmail.so.${LIBmail_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmork.so.${LIBmork_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmozfind.so.${LIBmozfind_VERSION}
@lib ${MOZILLA_PROJECT}/components/libmozldap.so.${LIBmozldap_VERSION}
@ -678,11 +677,14 @@ ${MOZILLA_PROJECT}/searchplugins/google.src
${MOZILLA_PROJECT}/searchplugins/jeeves.png
${MOZILLA_PROJECT}/searchplugins/jeeves.src
share/applications/${MOZILLA_PROJECT}.desktop
%%debug%%
!%%debug%%
@exec TEMP=`mktemp -d` && cd %D/seamonkey && env HOME=$TEMP LD_LIBRARY_PATH=%D/seamonkey ./regxpcom && rm -fr $TEMP
@unexec rm -f %D/seamonkey/chrome/chrome.rdf
@unexec rm -f %D/seamonkey/chrome/overlays.rdf
@unexec rm -f %D/seamonkey/chrome/stylesheets.rdf
@unexec rm -f %D/seamonkey/components/compreg.dat
@unexec rm -f %D/seamonkey/components/xpti.dat
@unexec rm -Rf %D/seamonkey/updates
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database