use devel/nspr instead of internal nspr. now using libc strtod and __dtoa

via devel/nspr. okay pvalchev@
This commit is contained in:
kurt 2006-11-17 19:03:14 +00:00
parent c478747b18
commit 665ae4f051
22 changed files with 162 additions and 2961 deletions

View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.22 2006/10/01 22:23:47 brad Exp $
# $OpenBSD: Makefile,v 1.23 2006/11/17 19:03:14 kurt Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc64 arm
SHARED_ONLY= Yes
COMMENT= "mini mozilla"
DISTNAME= minimo-20050802
PKGNAME= ${DISTNAME}p9
PKGNAME= ${DISTNAME}p10
SO_VERSION= 2.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
.for _lib in DebugRobot MyService caps chrmlite docshell editor \
embedcomponents gfx_gtk gkgfx gklayout gtkembedmoz gtkxtbin htmlpars \
i18n imglib2 jar50 jsj mork mozjs necko nsappshell nspr4 nss3 nssckbi \
oji pipboot pipnss plc4 plds4 popuplite pref remoteservice \
i18n imglib2 jar50 jsj mork mozjs necko nsappshell nss3 nssckbi \
oji pipboot pipnss popuplite pref remoteservice \
searchservice smime3 softkey softokn3 ssl3 testdynamic txmgr uconv \
webbrwsr widget_gtk2 xpcom xpcom_compat xpcom_compat_c xpcom_core \
xpcomsample xpconnect xpctest
@ -38,7 +38,8 @@ BUILD_DEPENDS= :zip->=2.3:archivers/zip \
:pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
png.>=3::graphics/png \
gdk-x11-2.0.>=600.0,gdk_pixbuf-2.0.>=600.0,gtk-x11-2.0.>=600.0::x11/gtk+2
gdk-x11-2.0.>=600.0,gdk_pixbuf-2.0.>=600.0,gtk-x11-2.0.>=600.0::x11/gtk+2 \
nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.3p2:devel/nspr
WANTLIB= ICE SM X11 Xext Xft Xrender Xt \
c fontconfig freetype m pthread z \
atk-1.0.>=1011.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \
@ -55,7 +56,6 @@ SUBST_VARS= LOCALBASE SO_VERSION
WRKDIST= ${WRKDIR}/mozilla
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \
${WRKSRC}/nsprpub/build/autoconf \
${WRKSRC}/directory/c-sdk/config/autoconf
AUTOCONF_VERSION= 2.13
@ -64,8 +64,8 @@ CONFIGURE_ARGS+= \
--with-system-jpeg=${LOCALBASE} \
--with-system-png=${LOCALBASE} \
--with-system-zlib=/usr/lib \
--with-system-nspr \
--with-pthreads \
--without-system-nspr \
--enable-optimize=-Os \
--disable-pedantic \
--disable-debug \
@ -125,12 +125,10 @@ post-extract:
@cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/
pre-configure:
@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/xpfe/bootstrap/mozilla.in
@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
${WRKSRC}/nsprpub/pr/include/md/_openbsd.h \
${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
touch ${WRKSRC}/embedding/minimo/chrome/skin/m.jpg

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-nsprpub_config_rules_mk,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- nsprpub/config/rules.mk.orig Wed Apr 13 17:57:55 2005
+++ nsprpub/config/rules.mk Tue Jul 12 22:06:58 2005
@@ -231,7 +231,7 @@ ifdef RELEASE_HEADERS
$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
endif
ifdef RELEASE_LIBS
- $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+ $(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
endif
+$(LOOP_OVER_DIRS)

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-nsprpub_configure_in,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- nsprpub/configure.in.orig Fri Jul 1 20:57:07 2005
+++ nsprpub/configure.in Tue Jul 12 22:06:58 2005
@@ -1615,7 +1615,7 @@ mips-sony-newsos*)
AC_DEFINE(HAVE_SOCKLEN_T)
CFLAGS="$CFLAGS -ansi -Wall"
CXXFLAGS="$CXXFLAGS -ansi -Wall"
- DLL_SUFFIX=so.1.0
+ DLL_SUFFIX=so.${SO_VERSION}
DSO_CFLAGS=-fPIC
MDCPUCFG_H=_openbsd.cfg
PR_MD_CSRCS=openbsd.c
@@ -2343,6 +2343,7 @@ if test -n "$USE_PTHREADS"; then
*-openbsd*)
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS=-pthread
+ LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
fi
;;
*-linux*)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-nsprpub_pr_include_md__openbsd_cfg,v 1.1 2006/01/11 00:58:56 pvalchev Exp $
--- nsprpub/pr/include/md/_openbsd.cfg.orig Sat Oct 22 23:41:38 2005
+++ nsprpub/pr/include/md/_openbsd.cfg Sat Oct 22 23:41:46 2005
@@ -48,7 +48,7 @@
#define PR_AF_INET6 24 /* same as AF_INET6 */
-#if defined(__i386__)
+#if defined(__i386__) || defined(__arm__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.3 2006/01/11 00:58:56 pvalchev Exp $
--- nsprpub/pr/include/md/_openbsd.h.orig Tue Apr 27 18:33:44 2004
+++ nsprpub/pr/include/md/_openbsd.h Wed Dec 28 19:06:43 2005
@@ -54,6 +54,8 @@
#define _PR_SI_ARCHITECTURE "powerpc"
#elif defined(__sparc__)
#define _PR_SI_ARCHITECTURE "sparc"
+#elif defined(__arm__)
+#define _PR_SI_ARCHITECTURE "arm"
#endif
#define PR_DLL_SUFFIX ".so.1.0"
@@ -97,6 +99,8 @@
#define JB_SP_INDEX 34
#elif defined(__amd64__)
#define JB_SP_INDEX 6
+#elif defined(__arm__)
+#define JB_SP_INDEX 23
#else
#error "Need to define SP index in jmp_buf here"
#endif

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- nsprpub/pr/include/private/primpl.h.orig Mon Jan 17 16:13:36 2005
+++ nsprpub/pr/include/private/primpl.h Tue Jul 12 22:06:58 2005
@@ -1867,6 +1867,7 @@ extern void _PR_DestroyZones(void);
&& !defined(DARWIN) \
&& !defined(NEXTSTEP) \
&& !defined(QNX) \
+ && !defined(__OpenBSD__) \
&& !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
#define _PR_OVERRIDE_MALLOC
#endif

File diff suppressed because it is too large Load Diff

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- nsprpub/pr/src/misc/prinit.c.orig Tue Apr 27 19:34:07 2004
+++ nsprpub/pr/src/misc/prinit.c Tue Jul 12 22:06:58 2005
@@ -433,6 +433,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
_PR_LogCleanup();
/*
+ * accesses the current thread
+ */
+ _PR_CleanupNet();
+ _PR_CleanupIO();
+
+ /*
* This part should look like the end of _PR_NativeRunThread
* and _PR_UserRunThread.
*/
@@ -444,6 +450,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
PR_DELETE(me->stack);
PR_DELETE(me);
}
+ _PR_MD_SET_CURRENT_THREAD(NULL);
/*
* XXX: We are freeing the heap memory here so that Purify won't
@@ -452,8 +459,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
* Ideally, for each _PR_InitXXX(), there should be a corresponding
* _PR_XXXCleanup() that we can call here.
*/
- _PR_CleanupNet();
- _PR_CleanupIO();
#ifdef WINNT
_PR_CleanupCPUs();
#endif

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- nsprpub/pr/src/misc/prnetdb.c.orig Wed Mar 9 19:53:04 2005
+++ nsprpub/pr/src/misc/prnetdb.c Tue Jul 12 22:06:58 2005
@@ -101,6 +101,7 @@ PRLock *_pr_dnsLock = NULL;
#endif
#if defined(OSF1) \
+ || defined(OPENBSD) \
|| defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
|| (defined(HPUX10_10) && defined(_REENTRANT)) \
|| (defined(HPUX10_20) && defined(_REENTRANT))
@@ -2110,7 +2111,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
*/
hints.ai_socktype = SOCK_STREAM;
+ LOCK_DNS();
+
rv = GETADDRINFO(hostname, NULL, &hints, &res);
+
+ UNLOCK_DNS();
+
if (rv == 0)
return (PRAddrInfo *) res;

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- nsprpub/pr/src/pthreads/ptthread.c.orig Wed Jun 1 15:45:27 2005
+++ nsprpub/pr/src/pthreads/ptthread.c Tue Jul 12 22:06:58 2005
@@ -51,6 +51,7 @@
#include <unistd.h>
#include <string.h>
#include <signal.h>
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
/*
* Record whether or not we have the privilege to set the scheduling

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2005/07/13 04:49:56 jolan Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 10:02:17 2004
+++ security/coreconf/OpenBSD.mk Tue Jul 12 22:06:58 2005
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.3 2006/11/17 19:03:14 kurt Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 11:02:17 2004
+++ security/coreconf/OpenBSD.mk Tue Nov 7 14:10:34 2006
@@ -37,12 +37,12 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@ -27,7 +27,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2005/07/13 04:49:56 jolan Exp
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
@@ -64,7 +64,7 @@ OS_LIBS =
@@ -64,8 +64,9 @@ OS_LIBS =
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
@ -36,3 +36,5 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2005/07/13 04:49:56 jolan Exp
DSO_LDFLAGS =
MKSHLIB = $(CC) $(DSO_LDOPTS)
+NSPR_LIBS = $(shell pkg-config --libs nspr)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-security_manager_Makefile_in,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/manager/Makefile.in.orig Tue Nov 7 14:11:01 2006
+++ security/manager/Makefile.in Tue Nov 7 14:11:29 2006
@@ -79,7 +79,7 @@ endif
# NSS makefiles are not safe for parallel execution.
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
DEFAULT_GMAKE_FLAGS += CC="$(CC)"
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(NSPR_CFLAGS) -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-security_nss_Makefile,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/Makefile.orig Tue Nov 7 14:11:42 2006
+++ security/nss/Makefile Tue Nov 7 14:11:51 2006
@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_dbm all
build_coreconf:
cd $(CORE_DEPTH)/coreconf ; $(MAKE)

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-security_nss_cmd_pkiutil_platlibs_mk,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/cmd/pkiutil/platlibs.mk.orig Tue Nov 7 14:12:03 2006
+++ security/nss/cmd/pkiutil/platlibs.mk Tue Nov 7 14:12:22 2006
@@ -50,8 +50,6 @@ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnsspki3 \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/cmd/platlibs.mk.orig Tue Nov 7 14:12:37 2006
+++ security/nss/cmd/platlibs.mk Tue Nov 7 14:13:26 2006
@@ -136,10 +136,7 @@ EXTRA_SHARED_LIBS += \
$(NULL)
else
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif
endif
@@ -222,9 +219,7 @@ EXTRA_SHARED_LIBS += \
-lssl3 \
-lsmime3 \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-security_nss_lib_ckfw_builtins_Makefile,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/lib/ckfw/builtins/Makefile.orig Tue Nov 7 14:13:36 2006
+++ security/nss/lib/ckfw/builtins/Makefile Tue Nov 7 14:14:18 2006
@@ -68,8 +68,8 @@ endif
else
EXTRA_LIBS += \
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
$(NULL)
endif

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig Tue Nov 7 14:14:29 2006
+++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Tue Nov 7 14:14:50 2006
@@ -98,8 +98,8 @@ EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
$(CRYPTO_LIB) \
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
$(NULL)
endif

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-security_nss_lib_nss_config_mk,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/lib/nss/config.mk.orig Tue Nov 7 14:15:02 2006
+++ security/nss/lib/nss/config.mk Tue Nov 7 14:15:19 2006
@@ -74,9 +74,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lsoftokn3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-security_nss_lib_smime_config_mk,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/lib/smime/config.mk.orig Tue Nov 7 14:15:32 2006
+++ security/nss/lib/smime/config.mk Tue Nov 7 14:16:09 2006
@@ -68,9 +68,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
ifeq ($(OS_ARCH), Darwin)

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/lib/softoken/config.mk.orig Tue Nov 7 14:16:36 2006
+++ security/nss/lib/softoken/config.mk Tue Nov 7 14:19:19 2006
@@ -80,10 +80,7 @@ else
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib/ \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-security_nss_lib_ssl_config_mk,v 1.1 2006/11/17 19:03:14 kurt Exp $
--- security/nss/lib/ssl/config.mk.orig Tue Nov 7 14:41:13 2006
+++ security/nss/lib/ssl/config.mk Tue Nov 7 14:41:27 2006
@@ -73,9 +73,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
ifeq ($(OS_ARCH), BeOS)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2006/01/10 17:58:47 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2006/11/17 19:03:14 kurt Exp $
bin/minimo
minimo/
minimo/LICENSE
@ -359,11 +359,8 @@ minimo/greprefs/security-prefs.js
@lib minimo/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
@lib minimo/libjsj.so.${LIBjsj_VERSION}
@lib minimo/libmozjs.so.${LIBmozjs_VERSION}
@lib minimo/libnspr4.so.${LIBnspr4_VERSION}
@lib minimo/libnss3.so.${LIBnss3_VERSION}
@lib minimo/libnssckbi.so.${LIBnssckbi_VERSION}
@lib minimo/libplc4.so.${LIBplc4_VERSION}
@lib minimo/libplds4.so.${LIBplds4_VERSION}
@lib minimo/libsmime3.so.${LIBsmime3_VERSION}
@lib minimo/libsoftokn3.so.${LIBsoftokn3_VERSION}
@lib minimo/libssl3.so.${LIBssl3_VERSION}