From 1cc2e3a66d300d89bb805d048be732a25ad224f9 Mon Sep 17 00:00:00 2001 From: taya Date: Thu, 3 Oct 2002 15:53:59 +0000 Subject: - Split Makefile to Makefile & Makefile.common - Use __ELF__ to detect ELF - Modify xpcom stuff for arm like m68k --- www/mozilla/Makefile | 109 ++----------------------------------------- www/mozilla/Makefile.common | 109 +++++++++++++++++++++++++++++++++++++++++++ www/mozilla/distinfo | 9 ++-- www/mozilla/patches/patch-ac | 29 ++++++------ www/mozilla/patches/patch-ad | 13 ++++-- www/mozilla/patches/patch-ae | 11 +++-- www/mozilla/patches/patch-bm | 32 +++++++++++++ 7 files changed, 182 insertions(+), 130 deletions(-) create mode 100644 www/mozilla/Makefile.common create mode 100644 www/mozilla/patches/patch-bm diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 0108daec440..ff69160154f 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,113 +1,10 @@ -# $NetBSD: Makefile,v 1.104 2002/10/02 19:36:28 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2002/10/03 15:53:59 taya Exp $ +MOZILLA= mozilla MOZ_VER= 1.1 -DISTNAME= mozilla-source-${MOZ_VER} -PKGNAME= mozilla-${MOZ_VER} PKGREVISION= 1 -WRKSRC= ${WRKDIR}/mozilla -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_VER}/src/} EXTRACT_SUFX= .tar.gz -MAINTAINER= taya@netbsd.org -HOMEPAGE= http://www.mozilla.org/ COMMENT= Open-source version of the Netscape browser -BUILD_DEPENDS+= zip>=2.3:../../archivers/zip - -USE_BUILDLINK2= yes -USE_PERL5= build -USE_GMAKE= yes -USE_X11BASE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-tests \ - --disable-debug \ - --with-system-jpeg=${BUILDLINK_PREFIX.jpeg} \ - --with-system-png=${BUILDLINK_PREFIX.png} \ - --enable-mathml \ - --enable-crypto \ - --enable-svg - -SHAREMODE?= 644 -ALL_TARGET= # empty - -AUTOCONF_REQD= 2.13 - -UNLIMIT_RESOURCES= datasize memorysize stacksize - -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../graphics/gdk-pixbuf/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../net/ORBit/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" - -# NetBSD-*-m68k builds, but "regchrome" dumps core. -NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k - -MOZILLA= mozilla -MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} -MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} -CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} -MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 -CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 -LDFLAGS+= -Wl,-R${MOZ_LIBDIR} - -# avoid creating a .mozilla directory in the users home -# directory -SCRIPTS_ENV+= HOME="${WRKDIR}" - -PLIST_SUBST+= MOZILLA="${MOZILLA}" -.if ${OBJECT_FMT} == "ELF" -SO_SUFFIX= "so" -.else -SO_SUFFIX= "so.1.0" -.endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} - -SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT} -SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC} -SCRIPTS_ENV+= SED=${SED} -SCRIPTS_ENV+= RM=${RM} -SCRIPTS_ENV+= EGREP=${EGREP} -SCRIPTS_ENV+= CHOWN=${CHOWN} -SCRIPTS_ENV+= CHGRP=${CHGRP} -SCRIPTS_ENV+= CHMOD=${CHMOD} -SCRIPTS_ENV+= BINOWN=${BINOWN} -SCRIPTS_ENV+= BINGRP=${BINGRP} -SCRIPTS_ENV+= BINMODE=${BINMODE} -SCRIPTS_ENV+= SETENV=${SETENV} -SCRIPTS_ENV+= MOZILLA=${MOZILLA} -SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX} - -PTHREAD_OPTS+= native optional - -COPTS?= -O2 -CONFIGURE_ARGS+= --enable-optimize="${COPTS}" - -XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s -XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp - -post-extract: -.for F in ${XPTCFILES} - ${CP} ${FILESDIR}/${F} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${F} -.endfor - -pre-configure: - cd ${WRKSRC} && ${AUTOCONF} - -post-build: - ${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt - ${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt - -do-install: - ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install - -.include "../../mk/pthread.buildlink2.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CONFIGURE_ARGS+= --without-pthreads -.endif - -.include "../../mk/autoconf.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../www/mozilla/Makefile.common" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common new file mode 100644 index 00000000000..06ae29e1508 --- /dev/null +++ b/www/mozilla/Makefile.common @@ -0,0 +1,109 @@ +# $NetBSD: Makefile.common,v 1.1 2002/10/03 15:53:59 taya Exp $ + +DISTNAME= mozilla-source-${MOZ_VER} +PKGNAME= ${MOZILLA}-${MOZ_VER} +CATEGORIES= www + +MAINTAINER= taya@netbsd.org +HOMEPAGE= http://www.mozilla.org/ + +WRKSRC= ${WRKDIR}/mozilla +FILESDIR= "../../www/mozilla/files" + +BUILD_DEPENDS+= zip>=2.3:../../archivers/zip + +USE_BUILDLINK2= yes +USE_PERL5= build +USE_GMAKE= yes +USE_X11BASE= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-tests \ + --disable-debug \ + --with-system-jpeg=${BUILDLINK_PREFIX.jpeg} \ + --with-system-png=${BUILDLINK_PREFIX.png} \ + --enable-mathml \ + --enable-crypto \ + --enable-svg + +SHAREMODE?= 644 +ALL_TARGET= # empty + +AUTOCONF_REQD= 2.13 + +UNLIMIT_RESOURCES= datasize memorysize stacksize + +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +# NetBSD-*-m68k builds, but "regchrome" dumps core. +NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k + +MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} +MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} +CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} +MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 +CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 +LDFLAGS+= -Wl,-R${MOZ_LIBDIR} + +# avoid creating a .mozilla directory in the users home +# directory +SCRIPTS_ENV+= HOME="${WRKDIR}" + +PLIST_SUBST+= MOZILLA="${MOZILLA}" +.if ${OBJECT_FMT} == "ELF" +SO_SUFFIX= "so" +.else +SO_SUFFIX= "so.1.0" +.endif +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} + +SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT} +SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC} +SCRIPTS_ENV+= SED=${SED} +SCRIPTS_ENV+= RM=${RM} +SCRIPTS_ENV+= EGREP=${EGREP} +SCRIPTS_ENV+= CHOWN=${CHOWN} +SCRIPTS_ENV+= CHGRP=${CHGRP} +SCRIPTS_ENV+= CHMOD=${CHMOD} +SCRIPTS_ENV+= BINOWN=${BINOWN} +SCRIPTS_ENV+= BINGRP=${BINGRP} +SCRIPTS_ENV+= BINMODE=${BINMODE} +SCRIPTS_ENV+= SETENV=${SETENV} +SCRIPTS_ENV+= MOZILLA=${MOZILLA} +SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX} + +PTHREAD_OPTS+= native optional + +COPTS?= -O2 +CONFIGURE_ARGS+= --enable-optimize="${COPTS}" + +XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s +XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp + +post-extract: +.for F in ${XPTCFILES} + ${CP} ${FILESDIR}/${F} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${F} +.endfor + +pre-configure: + cd ${WRKSRC} && ${AUTOCONF} + +post-build: + ${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt + ${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt + +do-install: + ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install + +.include "../../mk/pthread.buildlink2.mk" + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") +CONFIGURE_ARGS+= --without-pthreads +.endif + +.include "../../mk/autoconf.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 4a93292f416..88f186e6bd3 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.28 2002/09/03 14:58:17 mycroft Exp $ +$NetBSD: distinfo,v 1.29 2002/10/03 15:53:59 taya Exp $ SHA1 (mozilla-source-1.1.tar.gz) = 9499b9c96ca5128be9a4e92c9cfead9950fd2efd Size (mozilla-source-1.1.tar.gz) = 40817026 bytes SHA1 (patch-aa) = d2fa0cd66825ddfe0b983ecd1c80f53599d7786d SHA1 (patch-ab) = 13f4e2af0433df5eebbdb839e23389a703594f6c -SHA1 (patch-ac) = 6b5a2b0f3789d9b25730b82df3e708ce864527c4 -SHA1 (patch-ad) = b3c8f477988ae3895ec30cd0de20ef381aa16af3 -SHA1 (patch-ae) = ca66d7253bac6e10cd59924bb598646b91ee35b9 +SHA1 (patch-ac) = a4e08f78b3780b16a0f69aa22e0e4350fce6db8f +SHA1 (patch-ad) = 6031284fea1ffbafdb3e69fae9d81ecc22932731 +SHA1 (patch-ae) = 9d160425a4341dd38b4da88c7913de6a95cb6660 SHA1 (patch-am) = c0246d178c8d1b53a3e945a748116665b3107f8e SHA1 (patch-aw) = a6f78b33ddba34c404af0521a23b8eeec3382f3e SHA1 (patch-ba) = 71758ae86bd7f57095b5af2f96d5d2c4416bec57 @@ -15,3 +15,4 @@ SHA1 (patch-be) = 768bf48f5a667e51cea9fd83c5cb26cf86e72e18 SHA1 (patch-bj) = 3690cdca84ad2a721d98156404e8f309ba47b3d6 SHA1 (patch-bk) = e1ef475003bc46fd340e2f3e1bf19ad1811094d4 SHA1 (patch-bl) = bf9c9a86bd30912788c222c5f1536d83f707c77d +SHA1 (patch-bm) = db4d44d9ca3a6ed9eb2ba4604555f80a02f987e8 diff --git a/www/mozilla/patches/patch-ac b/www/mozilla/patches/patch-ac index ec07eb28802..70651115fd5 100644 --- a/www/mozilla/patches/patch-ac +++ b/www/mozilla/patches/patch-ac @@ -1,24 +1,27 @@ -$NetBSD: patch-ac,v 1.16 2002/08/29 15:11:14 taya Exp $ +$NetBSD: patch-ac,v 1.17 2002/10/03 15:54:00 taya Exp $ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Jul 17 08:05:10 2002 -+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Aug 28 11:21:45 2002 -@@ -159,6 +159,14 @@ ++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Sep 8 22:17:41 2002 +@@ -129,7 +129,7 @@ + # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) - ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) -+ifneq (,$(findstring elf,$(TARGET_OS))) -+# ELF format -+SYMBOLPREFIX=\"\" -+else -+# aout format -+SYMBOLPREFIX=\"_\" -+endif -+CXXFLAGS += -DSYMBOLPREFIX=$(SYMBOLPREFIX) +-ifneq (,$(filter arm% sa110,$(OS_TEST))) ++ifneq (,$(filter arm%,$(TARGET_CPU))) + CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp + endif + endif +@@ -158,7 +158,7 @@ + # NetBSD/m68k + # + ifeq ($(OS_ARCH),NetBSD) +-ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) ++ifneq (,$(filter m68k,$(TARGET_CPU))) CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -267,6 +275,13 @@ +@@ -267,6 +267,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad index c2366c97942..2146ee0bb90 100644 --- a/www/mozilla/patches/patch-ad +++ b/www/mozilla/patches/patch-ad @@ -1,20 +1,25 @@ -$NetBSD: patch-ad,v 1.21 2002/08/29 15:11:14 taya Exp $ +$NetBSD: patch-ad,v 1.22 2002/10/03 15:54:00 taya Exp $ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp Sat Sep 29 05:12:51 2001 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp Wed Aug 28 11:21:47 2002 -@@ -132,6 +132,10 @@ ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp Sun Sep 8 00:46:20 2002 +@@ -132,6 +132,15 @@ } } +/* + * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF + */ ++#ifndef __ELF__ ++#define SYMBOLPREFIX "_" ++#else ++#define SYMBOLPREFIX ++#endif + XPTC_PUBLIC_API(nsresult) XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, PRUint32 paramCount, nsXPTCVariant* params) -@@ -139,30 +143,30 @@ +@@ -139,30 +148,30 @@ PRUint32 result; __asm__ __volatile__( diff --git a/www/mozilla/patches/patch-ae b/www/mozilla/patches/patch-ae index b29f1ce82f3..975b89fba90 100644 --- a/www/mozilla/patches/patch-ae +++ b/www/mozilla/patches/patch-ae @@ -1,9 +1,9 @@ -$NetBSD: patch-ae,v 1.12 2002/08/29 15:11:14 taya Exp $ +$NetBSD: patch-ae,v 1.13 2002/10/03 15:54:00 taya Exp $ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp Sat Sep 29 05:12:52 2001 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp Wed Aug 28 11:21:52 2002 -@@ -123,17 +123,22 @@ ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp Sun Sep 8 00:46:37 2002 +@@ -123,17 +123,27 @@ } } @@ -11,6 +11,11 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k + * Beware: use % instead of %% for register identifiers in a preprocessor macro + * SYMBOL PREFIX must be "_" for aout and "" for ELF + */ ++#ifndef __ELF__ ++#define SYMBOLPREFIX "_" ++#else ++#define SYMBOLPREFIX ++#endif + #define STUB_ENTRY(n) \ __asm__( \ diff --git a/www/mozilla/patches/patch-bm b/www/mozilla/patches/patch-bm new file mode 100644 index 00000000000..8a32fb360d5 --- /dev/null +++ b/www/mozilla/patches/patch-bm @@ -0,0 +1,32 @@ +$NetBSD: patch-bm,v 1.1 2002/10/03 15:54:01 taya Exp $ + +diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp Sat Sep 29 05:12:52 2001 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp Sun Sep 8 00:45:55 2002 +@@ -118,18 +118,23 @@ + * so they are contiguous with values passed on the stack, and then calls + * PrepareAndDispatch() to do the dirty work. + */ ++#ifndef __ELF__ ++#define SYMBOLPREFIX "_" ++#else ++#define SYMBOLPREFIX ++#endif + + #define STUB_ENTRY(n) \ + __asm__( \ +- ".global _Stub"#n"__14nsXPTCStubBase\n\t" \ +-"_Stub"#n"__14nsXPTCStubBase:\n\t" \ ++ ".global "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t" \ ++SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t" \ + "stmfd sp!, {r1, r2, r3} \n\t" \ + "mov ip, sp \n\t" \ + "stmfd sp!, {fp, ip, lr, pc} \n\t" \ + "sub fp, ip, #4 \n\t" \ + "mov r1, #"#n" \n\t" /* = methodIndex */ \ + "add r2, sp, #16 \n\t" \ +- "bl _PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \ ++ "bl "SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi \n\t" \ + "ldmea fp, {fp, sp, lr} \n\t" \ + "add sp, sp, #12 \n\t" \ + "mov pc, lr \n\t" \ -- cgit v1.2.3