From 0310e3f0d14f788eb1193025bd9f5e35fe233ced Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 27 Dec 2007 18:54:18 +0000 Subject: Fix type issue with siglongjmp. Fix autoconf test for pthread_barrier macros to actually work, using assert(3) for possibly non-existing functions with -DNDEBUG set earlier and without linkage is not likely tobe a good test. --- net/openwbem/Makefile | 3 +- net/openwbem/distinfo | 5 ++-- net/openwbem/patches/patch-aa | 65 ++++++++++++++++++++++++++++++++++++++++--- net/openwbem/patches/patch-ae | 30 ++++++++++++++++++++ 4 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 net/openwbem/patches/patch-ae (limited to 'net') diff --git a/net/openwbem/Makefile b/net/openwbem/Makefile index 64cc363024a..301002a0ced 100644 --- a/net/openwbem/Makefile +++ b/net/openwbem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/10/29 15:05:20 agc Exp $ +# $NetBSD: Makefile,v 1.2 2007/12/27 18:54:18 joerg Exp $ DISTNAME= openwbem-3.2.2 CATEGORIES= net devel @@ -82,4 +82,5 @@ SUBST_FILES.mkdir+= ${WRKSRC}/src/providers/cpp/instance/OpenWBEM_ConfigSettingD SUBST_SED.mkdir= -e "s|\$$(INSTALL_PROGRAM) -d|\$${mkdir_p}|g" SUBST_MESSAGE.mkdir= Fixing ${INSTALL_PROGRAM} -d lines (the -s does not interoperate with -d) +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/openwbem/distinfo b/net/openwbem/distinfo index 09c3c2050df..fb3c40c0e5b 100644 --- a/net/openwbem/distinfo +++ b/net/openwbem/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/10/29 15:05:20 agc Exp $ +$NetBSD: distinfo,v 1.2 2007/12/27 18:54:18 joerg Exp $ SHA1 (openwbem-3.2.2.tar.gz) = 3272e5cbcfb2a864cccf71e15e0da0f6623420bb RMD160 (openwbem-3.2.2.tar.gz) = 31ce8c80d47ff7539315e3978b8c1c493bd17f35 Size (openwbem-3.2.2.tar.gz) = 2919455 bytes -SHA1 (patch-aa) = 8dec53b2617dda354b4af226e48d8e7a20cdacc3 +SHA1 (patch-aa) = 33cd8d21ed698b511fc662686a7bf7abbf85c232 SHA1 (patch-ab) = c83f632376f12d7378b1f013a0db5d4ae63f15bf SHA1 (patch-ac) = ea2f928b13eaef464e133b0e510fa4b8cfee95b9 SHA1 (patch-ad) = 52d05017718446076417c140b14ef6296ae2e8e4 +SHA1 (patch-ae) = a9d923bdf6e52acff83588605f2913b196c92038 diff --git a/net/openwbem/patches/patch-aa b/net/openwbem/patches/patch-aa index d8bd48f81ed..0e41f0783f7 100644 --- a/net/openwbem/patches/patch-aa +++ b/net/openwbem/patches/patch-aa @@ -1,8 +1,30 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/10/29 15:05:21 agc Exp $ +$NetBSD: patch-aa,v 1.2 2007/12/27 18:54:19 joerg Exp $ ---- configure 2006/02/21 21:18:12 1.1 -+++ configure 2006/02/21 21:19:32 -@@ -4652,8 +4652,20 @@ +--- configure.orig 2006-10-19 23:08:04.000000000 +0000 ++++ configure +@@ -4590,7 +4590,7 @@ _ACEOF + #define HPUX 1 + _ACEOF + +- LIBS="$LIBS -lxnet -lpthread -lrt" ++ LIBS="$LIBS -lxnet ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lrt" + PLAT_CFLAGS="+Z -mt -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" + PLAT_CXXFLAGS="-AA +Z -mt +p -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__HPACC_THREAD_SAFE_RB_TREE" + CPPFLAGS="-AA $CPPFLAGS" # need this so the configure tests work right. +@@ -4614,9 +4614,9 @@ _ACEOF + PLAT_CFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe" + PLAT_CXXFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe" + CXXCOMMONLINKFLAGS="" +- CXXBINLINKFLAGS="-Wl,-Bdynamic -lpthread -Wl,-E $LDFLAGS" +- CBINLINKFLAGS="-Wl,-Bdynamic -lpthread $LDFLAGS" +- CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) -lpthread' ++ CXXBINLINKFLAGS="-Wl,-Bdynamic ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -Wl,-E $LDFLAGS" ++ CBINLINKFLAGS="-Wl,-Bdynamic ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LDFLAGS" ++ CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}' + PLAT_OPTFLAGS="-O3" + PIDFILE_DIR="/var/run" + LIB_EXT="so" +@@ -4652,8 +4652,20 @@ _ACEOF PLAT_CXXFLAGS="-DEXPERIMENTAL" LIBS="$LIBS -lnetware" ;; @@ -25,3 +47,38 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/10/29 15:05:21 agc Exp $ *-*-freebsd*) cat >>confdefs.h <<\_ACEOF #define FREEBSD 1 +@@ -4694,9 +4706,9 @@ echo "$as_me: WARNING: ***************** + PLAT_CFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe" + PLAT_CXXFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe" + CXXCOMMONLINKFLAGS="" +- CXXBINLINKFLAGS="-Wl,-Bdynamic -lpthread -Wl,-E $LDFLAGS" +- CBINLINKFLAGS="-Wl,-Bdynamic -lpthread $LDFLAGS" +- CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) -lpthread' ++ CXXBINLINKFLAGS="-Wl,-Bdynamic ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -Wl,-E $LDFLAGS" ++ CBINLINKFLAGS="-Wl,-Bdynamic ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LDFLAGS" ++ CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}' + PLAT_OPTFLAGS="-O3" + PIDFILE_DIR="/var/run" + LIB_EXT="so" +@@ -16646,9 +16658,9 @@ main () + { + + pthread_barrier_t barrier; +- assert(pthread_barrier_init(&barrier, NULL, 1) == 0); +- assert(pthread_barrier_wait(&barrier) == PTHREAD_BARRIER_SERIAL_THREAD); +- assert(pthread_barrier_destroy(&barrier) == 0); ++ pthread_barrier_init(&barrier, NULL, 1); ++ pthread_barrier_wait(&barrier); ++ pthread_barrier_destroy(&barrier); + return 0; + + ; +@@ -16657,7 +16669,7 @@ main () + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++ (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 diff --git a/net/openwbem/patches/patch-ae b/net/openwbem/patches/patch-ae new file mode 100644 index 00000000000..41b25a66bb2 --- /dev/null +++ b/net/openwbem/patches/patch-ae @@ -0,0 +1,30 @@ +$NetBSD: patch-ae,v 1.1 2007/12/27 18:54:19 joerg Exp $ + +--- src/common/OW_SafeLibCreate.hpp.orig 2007-12-27 16:26:28.000000000 +0000 ++++ src/common/OW_SafeLibCreate.hpp +@@ -185,7 +185,11 @@ public: + } + + private: ++#ifdef WIN32 + static jmp_buf theLoaderBuf; ++#else ++ static sigjmp_buf theLoaderBuf; ++#endif + + // this is commented out because it won't compile. As it is, it may + // invoke undefined behavior if the C calling convention is different +@@ -205,7 +209,12 @@ private: + + }; + template +-jmp_buf SafeLibCreate::theLoaderBuf; ++#ifdef WIN32 ++jmp_buf ++#else ++sigjmp_buf ++#endif ++SafeLibCreate::theLoaderBuf; + + } // end namespace OW_NAMESPACE + -- cgit v1.2.3