diff options
| author | schmonz <schmonz@pkgsrc.org> | 2019-03-10 13:21:05 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2019-03-10 13:21:05 +0000 |
| commit | 7353234e782deb5dd7267a4ac6dd658f08f44172 (patch) | |
| tree | c7cff77f38a31400ab816d056de32d18c3b84178 /textproc/xapian-omega | |
| parent | ff7c0dedc1f2b5dc8c70b5688348ca6b37b9b74d (diff) | |
| download | pkgsrc-7353234e782deb5dd7267a4ac6dd658f08f44172.tar.gz | |
Avoid conflicting with system bswap32(). Use SUBST_VARS to mollify pkglint.
Diffstat (limited to 'textproc/xapian-omega')
| -rw-r--r-- | textproc/xapian-omega/Makefile | 4 | ||||
| -rw-r--r-- | textproc/xapian-omega/distinfo | 3 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-values.h | 33 |
3 files changed, 37 insertions, 3 deletions
diff --git a/textproc/xapian-omega/Makefile b/textproc/xapian-omega/Makefile index f0f3e0d9225..57102c24624 100644 --- a/textproc/xapian-omega/Makefile +++ b/textproc/xapian-omega/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2018/08/26 13:26:12 schmonz Exp $ +# $NetBSD: Makefile,v 1.40 2019/03/10 13:21:05 schmonz Exp $ .include "../../textproc/xapian/Makefile.common" @@ -17,7 +17,7 @@ REPLACE_PERL= dbi2omega htdig2omega mbox2omega SUBST_CLASSES+= files SUBST_STAGE.files= do-configure SUBST_FILES.files= omega.conf -SUBST_SED.files= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_VARS.files= VARBASE SUBST_MESSAGE.files= Fixing configuration files. OWN_DIRS+= ${VARBASE}/log/${PKGBASE} diff --git a/textproc/xapian-omega/distinfo b/textproc/xapian-omega/distinfo index a7fd311ad53..bc23ffffcee 100644 --- a/textproc/xapian-omega/distinfo +++ b/textproc/xapian-omega/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2019/03/04 01:38:10 schmonz Exp $ +$NetBSD: distinfo,v 1.29 2019/03/10 13:21:05 schmonz Exp $ SHA1 (xapian-omega-1.4.11.tar.xz) = c85d6bbd53b92143d24ee80757bd38bda31ee926 RMD160 (xapian-omega-1.4.11.tar.xz) = 9952b6b5c3825bba6abead3c82c54f436ec292a4 @@ -6,3 +6,4 @@ SHA512 (xapian-omega-1.4.11.tar.xz) = 135077e26dc0b0707d1d14c64eeb25db67374b1b79 Size (xapian-omega-1.4.11.tar.xz) = 533596 bytes SHA1 (patch-Makefile.in) = eea809d9403820e86478d939a2dad4c67358ebf5 SHA1 (patch-omega.conf) = f1e941dac326de7005cad0a5a4a2848e401855c4 +SHA1 (patch-values.h) = b3758856f5a34c47e4247d8076fbbdc1e65305e2 diff --git a/textproc/xapian-omega/patches/patch-values.h b/textproc/xapian-omega/patches/patch-values.h new file mode 100644 index 00000000000..558f8bb834f --- /dev/null +++ b/textproc/xapian-omega/patches/patch-values.h @@ -0,0 +1,33 @@ +$NetBSD: patch-values.h,v 1.1 2019/03/10 13:21:05 schmonz Exp $ + +Avoid conflicting with system bswap32(). + +--- values.h.orig 2019-03-02 01:45:31.000000000 +0000 ++++ values.h +@@ -38,7 +38,7 @@ enum value_slot { + }; + + #ifndef WORDS_BIGENDIAN +-inline std::uint32_t bswap32(std::uint32_t v) { ++inline std::uint32_t xapian_bswap32(std::uint32_t v) { + # if HAVE_DECL___BUILTIN_BSWAP32 + return __builtin_bswap32(v); + # elif HAVE_DECL__BYTESWAP_ULONG +@@ -55,7 +55,7 @@ inline std::uint32_t binary_string_to_in + std::uint32_t v; + std::memcpy(&v, s.data(), 4); + #ifndef WORDS_BIGENDIAN +- v = bswap32(v); ++ v = xapian_bswap32(v); + #endif + return v; + } +@@ -63,7 +63,7 @@ inline std::uint32_t binary_string_to_in + inline std::string int_to_binary_string(std::uint32_t v) + { + #ifndef WORDS_BIGENDIAN +- v = bswap32(v); ++ v = xapian_bswap32(v); + #endif + return std::string(reinterpret_cast<const char*>(&v), 4); + } |