pkg/42632: libnbcompat build failure on OpenBSD

[alnsn%yandex.ru@localhost]

>Number:         42632
>Category:       pkg
>Synopsis:       libnbcompat build failure on OpenBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 17 14:25:00 +0000 2010
>Originator:     Alexander Nasonov
>Release:        OpenBSD 4.6
>Organization:
>Environment:
OpenBSD obed.my.domain 4.6 GENERIC.MP#81 amd64
>Description:
Bootstrap fails in libnbcompat because OpenBSD system compiler doesn't 
understand __asm__ in __weak_alias macro invocation.
I see that many __weak_alias invocations are commented out with #if 0 ... 
#endif but some are guarded by #ifdef conditions, e.g. #ifdef _KERNEL or #ifdef 
_LIBC.
If I disable _weak_alias in all files that fail, bootstrap finishes fine.
>How-To-Repeat:
Run bootstrap on OpenBSD.
>Fix:
Index: files/db/db/db.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/libnbcompat/files/db/db/db.c,v
retrieving revision 1.2
diff -u -r1.2 db.c
--- files/db/db/db.c    28 Oct 2008 18:01:06 -0000      1.2
+++ files/db/db/db.c    17 Jan 2010 13:29:02 -0000
@@ -45,9 +45,11 @@
 #include <nbcompat/db.h>
 static int __dberr(void);
 
+#if 0
 #ifdef __weak_alias
 __weak_alias(dbopen,_dbopen)
 #endif
+#endif
 
 DB *
 dbopen(const char *fname, int flags, mode_t mode, DBTYPE type,
Index: files/db/mpool/mpool.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/libnbcompat/files/db/mpool/mpool.c,v
retrieving revision 1.3
diff -u -r1.3 mpool.c
--- files/db/mpool/mpool.c      28 Oct 2008 15:06:26 -0000      1.3
+++ files/db/mpool/mpool.c      17 Jan 2010 13:29:02 -0000
@@ -53,6 +53,7 @@
 #define        EFTYPE          EINVAL
 #endif
 
+#if 0
 #ifdef __weak_alias
 __weak_alias(mpool_close,_mpool_close)
 __weak_alias(mpool_filter,_mpool_filter)
@@ -62,6 +63,7 @@
 __weak_alias(mpool_put,_mpool_put)
 __weak_alias(mpool_sync,_mpool_sync)
 #endif
+#endif
 
 static BKT *mpool_bkt(MPOOL *);
 static BKT *mpool_look(MPOOL *, pgno_t);