diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-03-06 16:44:34 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-03-06 16:44:34 +0000 |
| commit | 2cc1ca0998e260d6ba7677d3193fb8a9080bd960 (patch) | |
| tree | ae37135cd2be538de88d1f495b9ee03202a14d42 | |
| parent | 7e0d3e87f0da2a04f787c19bc9747e711f3f538b (diff) | |
MFH: r338064
- Allow build with clang [1]
- Remove explicit -lstdc++
- Bump PORTREVISION for package change
Submitted by: vanilla [1]
Approved by: portmgr (mat, via IRC)
Notes
svn path=/branches/2014Q1/; revision=347276
| -rw-r--r-- | databases/kyototycoon/Makefile | 6 | ||||
| -rw-r--r-- | databases/kyototycoon/files/patch-ktdbext.h | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/databases/kyototycoon/Makefile b/databases/kyototycoon/Makefile index 69f621fcf87c..0a051c66ba8f 100644 --- a/databases/kyototycoon/Makefile +++ b/databases/kyototycoon/Makefile @@ -3,6 +3,7 @@ PORTNAME= kyototycoon PORTVERSION= 0.9.56 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://fallabs.com/${PORTNAME}/pkg/ \ LOCAL/sunpoet @@ -16,19 +17,18 @@ LIB_DEPENDS= libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet OPTIONS_DEFINE= DOCS -CONFIGURE_ARGS= --enable-profile --enable-uyield +CONFIGURE_ARGS= --enable-uyield CPPFLAGS+= -fPIC GNU_CONFIGURE= yes MAKE_ARGS= PCDIR=${PREFIX}/libdata/pkgconfig REINPLACE_ARGS= -i '' -USE_GCC= any USE_LDCONFIG= yes USES= gmake pkgconfig .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g; s|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile .if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in .endif diff --git a/databases/kyototycoon/files/patch-ktdbext.h b/databases/kyototycoon/files/patch-ktdbext.h new file mode 100644 index 000000000000..20d980ff81e3 --- /dev/null +++ b/databases/kyototycoon/files/patch-ktdbext.h @@ -0,0 +1,10 @@ +--- ktdbext.h.orig 2012-05-25 01:44:34.000000000 +0800 ++++ ktdbext.h 2013-12-28 01:21:30.081508681 +0800 +@@ -16,6 +16,7 @@ + #ifndef _KTDBEXT_H // duplication check + #define _KTDBEXT_H + ++#include <myconf.h> + #include <ktcommon.h> + #include <ktutil.h> + #include <ktulog.h> |