Don't append nspr's shared lib version in PR_GetLibraryName. This fixes

missing 'Builtin Roots Module'/Authorities problem in mozilla* apps.
okay ajacoutot@
This commit is contained in:
kurt 2006-11-30 16:53:53 +00:00
parent 6fa372d430
commit 456dbd5108
2 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2006/11/23 10:13:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2006/11/30 16:53:53 kurt Exp $
# $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -8,7 +8,7 @@ COMMENT-docs= "HTML Documentation for NSPR"
VER= 4.6.4
DISTNAME= nspr-${VER}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}p1
PKGNAME-docs= ${DISTNAME:S/-/-docs-/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
nspr-reference${EXTRACT_SUFX}:0
@ -53,8 +53,6 @@ WRKSRC= ${WRKDIST}/mozilla/nsprpub
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build/autoconf
pre-configure:
perl -pi -e 's,_SO_VERSION_,${SO_VERSION},g' \
${WRKSRC}/pr/include/md/_openbsd.h
@cp ${FILESDIR}/nspr.pc.in ${WRKSRC}/config/
do-install:

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.3 2006/11/15 09:05:36 ajacoutot Exp $
$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.4 2006/11/30 16:53:53 kurt Exp $
--- mozilla/nsprpub/pr/include/md/_openbsd.h.orig Sun Apr 25 17:00:47 2004
+++ mozilla/nsprpub/pr/include/md/_openbsd.h Fri Nov 10 20:13:55 2006
@@ -54,9 +54,11 @@
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.3 2006/11/15 09:05:
#endif
-#define PR_DLL_SUFFIX ".so.1.0"
+#define PR_DLL_SUFFIX ".so._SO_VERSION_"
+#define PR_DLL_SUFFIX ".so"
#define _PR_VMBASE 0x30000000
#define _PR_STACK_VMBASE 0x50000000