neomutt: fix build with bdb, add option for lmdb.
This commit is contained in:
nikita
parent
1ab52bbc9b
commit
a7ca1a43a0
4 changed files with 151 additions and 7 deletions
|
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.79 2022/06/28 11:34:23 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.80 2022/09/20 17:13:24 nikita Exp $
|
||||
|
||||
DISTNAME= neomutt-20220429
|
||||
PKGREVISION= 1
|
||||
PKGREVISION= 2
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/}
|
||||
GITHUB_TAG= ${PKGVERSION_NOREV}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.60 2022/04/29 13:47:42 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.61 2022/09/20 17:13:24 nikita Exp $
|
||||
|
||||
BLAKE2s (neomutt-20220429-20220429.tar.gz) = c049d271b5c4083b3f7b1e12dfd2d3c879f02acb2767fb9942c4825ac6a411e3
|
||||
SHA512 (neomutt-20220429-20220429.tar.gz) = ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
|
||||
Size (neomutt-20220429-20220429.tar.gz) = 3774374 bytes
|
||||
SHA1 (patch-auto.def) = c7acaa8ec5ecad6f2465d293a5a27a58529a25d0
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# $NetBSD: options.mk,v 1.17 2021/10/22 17:11:54 wiz Exp $
|
||||
# $NetBSD: options.mk,v 1.18 2022/09/20 17:13:24 nikita Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt
|
||||
PKG_OPTIONS_REQUIRED_GROUPS= display
|
||||
PKG_OPTIONS_GROUP.display= curses ncurses ncursesw
|
||||
PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
|
||||
PKG_SUPPORTED_OPTIONS+= tokyocabinet notmuch lua
|
||||
PKG_SUPPORTED_OPTIONS= tokyocabinet lmdb
|
||||
PKG_SUPPORTED_OPTIONS+= debug gpgme gssapi idn ssl smime sasl
|
||||
PKG_SUPPORTED_OPTIONS+= notmuch lua
|
||||
PKG_SUGGESTED_OPTIONS= gpgme gssapi idn ncursesw sasl smime ssl
|
||||
PKG_SUGGESTED_OPTIONS+= tokyocabinet notmuch
|
||||
|
||||
|
|
@ -87,7 +88,12 @@ CONFIGURE_ARGS+= --disable-smime
|
|||
###
|
||||
### Header cache
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Mtokyocabinet)
|
||||
.if !empty(PKG_OPTIONS:Mlmdb)
|
||||
.include "../../databases/lmdb/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --lmdb
|
||||
CONFIGURE_ARGS+= --disable-gdbm
|
||||
CONFIGURE_ARGS+= --disable-bdb
|
||||
.elif !empty(PKG_OPTIONS:Mtokyocabinet)
|
||||
.include "../../databases/tokyocabinet/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --tokyocabinet
|
||||
CONFIGURE_ARGS+= --disable-gdbm
|
||||
|
|
|
|||
137
mail/neomutt/patches/patch-auto.def
Normal file
137
mail/neomutt/patches/patch-auto.def
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
$NetBSD: patch-auto.def,v 1.1 2022/09/20 17:13:24 nikita Exp $
|
||||
|
||||
Improve Berkeley DB detection, account for more flavours
|
||||
Fixes #3525
|
||||
upstream commited as c12b986765091933bdadbf3d0a341e66bd42404a
|
||||
|
||||
--- auto.def.orig 2022-04-29 14:15:32.000000000 +0200
|
||||
+++ auto.def 2022-09-20 11:49:33.294171932 +0200
|
||||
@@ -166,8 +166,8 @@
|
||||
# relative --enable-opt to true. This allows "--with-opt=/usr" to be used as
|
||||
# a shortcut for "--opt --with-opt=/usr".
|
||||
foreach opt {
|
||||
- bdb gdbm gnutls gpgme gss homespool idn idn2 kyotocabinet lmdb lua lz4
|
||||
- mixmaster nls notmuch pcre2 qdbm rocksdb sasl sqlite ssl tdb tokyocabinet
|
||||
+ bdb gdbm gnutls gpgme gss homespool idn idn2 kyotocabinet lmdb lua lz4
|
||||
+ mixmaster nls notmuch pcre2 qdbm rocksdb sasl sqlite ssl tdb tokyocabinet
|
||||
zlib zstd
|
||||
} {
|
||||
if {[opt-val with-$opt] ne {}} {
|
||||
@@ -311,6 +311,7 @@
|
||||
lappend extensions -D_ALL_SOURCE=1
|
||||
lappend extensions -D_GNU_SOURCE=1
|
||||
lappend extensions -D__EXTENSIONS__
|
||||
+ lappend extensions -D_XOPEN_SOURCE_EXTENDED
|
||||
define-append CFLAGS_FOR_BUILD {*}$extensions
|
||||
define-append CFLAGS {*}$extensions
|
||||
}
|
||||
@@ -502,18 +503,17 @@
|
||||
msg-result $gpgme_version
|
||||
if {[get-define want-autocrypt]} {
|
||||
if {$gpgme_maj < 1 || $gpgme_min < 8} {
|
||||
+ # GPGME v1.8.0 was released on 2016-11-16
|
||||
user-error "Found GPGME version $gpgme_version, need 1.8.0 for AutoCrypt"
|
||||
}
|
||||
} else {
|
||||
if {$gpgme_maj < 1 || $gpgme_min < 4} {
|
||||
+ # GPGME v1.4.0 was released on 2013-02-26
|
||||
user-error "Found GPGME version $gpgme_version, need 1.4.0"
|
||||
}
|
||||
}
|
||||
define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj $gpgme_min $gpgme_patch]
|
||||
|
||||
- # RHEL6 doesn't have this function yet
|
||||
- cc-check-function-in-lib gpgme_op_export_keys gpgme
|
||||
-
|
||||
# CFLAGS
|
||||
if {[catch {exec-with-stderr $gpgme_config --cflags} res err]} {
|
||||
user-error "Could not derive --cflags from $gpgme_config"
|
||||
@@ -945,28 +941,16 @@
|
||||
###############################################################################
|
||||
# Header cache - bdb
|
||||
if {[get-define want-bdb]} {
|
||||
- set bdb_versions [opt-val with-bdb-version { 5.3 6.2 4.8 }] ;# Will be checked in order
|
||||
- set bdb_prefix [opt-val with-bdb $prefix]
|
||||
-
|
||||
- foreach ver $bdb_versions {
|
||||
- lassign [split $ver .] maj min
|
||||
- # This is ugly, but it allows us to not have an inner loop
|
||||
- lappend bdb_majors $maj $maj $maj $maj $maj $maj
|
||||
- lappend bdb_minors $min $min $min $min $min $min
|
||||
- lappend bdb_exploded "" db-$maj-$min db${maj}${min} db$maj.$min db-$maj db$maj
|
||||
- }
|
||||
-
|
||||
- foreach maj $bdb_majors min $bdb_minors ver $bdb_exploded {
|
||||
- set ver_inc_dir $bdb_prefix/include/$ver
|
||||
- set ver_lib_dir $bdb_prefix/$::libdir_tail/$ver
|
||||
+ proc find_bdb {bdb_prefix maj min path_tail lib_names} {
|
||||
+ set ver_inc_dir $bdb_prefix/include/$path_tail
|
||||
+ set ver_lib_dir $bdb_prefix/$::libdir_tail/$path_tail
|
||||
set ver_inc_file $ver_inc_dir/db.h
|
||||
- set ver_lib_file db-$maj.$min
|
||||
|
||||
# File exists?
|
||||
msg-checking "Checking for BerkeleyDB in $ver_inc_dir..."
|
||||
if {![file exists $ver_inc_file]} {
|
||||
msg-result "no"
|
||||
- continue
|
||||
+ return 0
|
||||
}
|
||||
|
||||
# Version is coherent?
|
||||
@@ -975,23 +959,44 @@
|
||||
if {$inc_maj eq {} || $inc_min eq {} ||
|
||||
$inc_maj != $maj || $inc_min != $min} {
|
||||
msg-result "no (expecting $maj.$min, got $inc_maj.$inc_min)"
|
||||
- continue
|
||||
+ return 0
|
||||
}
|
||||
msg-result "yes"
|
||||
|
||||
# Can link?
|
||||
- cc-with [list -libs -L$ver_lib_dir -cflags -I$ver_inc_dir] {
|
||||
- if {![check-inc-and-lib bdb {} db.h db_env_create db-$maj.$min]} {
|
||||
- msg-result "no"
|
||||
- continue
|
||||
+ foreach lib_name $lib_names {
|
||||
+ cc-with [list -libs -L$ver_lib_dir -cflags -I$ver_inc_dir] {
|
||||
+ check-inc-and-lib bdb {} db.h db_env_create $lib_name
|
||||
+ }
|
||||
+ if {[have-feature bdb]} {
|
||||
+ define-append CFLAGS -I$ver_inc_dir
|
||||
+ define-append LDFLAGS -L$ver_lib_dir
|
||||
+ define-append LIBS -l$lib_name
|
||||
+ define-append HCACHE_BACKENDS "bdb"
|
||||
+ define USE_HCACHE
|
||||
+ return 1
|
||||
+ }
|
||||
+ }
|
||||
+ return 0
|
||||
+ }
|
||||
+
|
||||
+ set bdb_versions [opt-val with-bdb-version { 5.3 6.2 4.8 }] ;# Will be checked in order
|
||||
+ set bdb_prefix [opt-val with-bdb $prefix]
|
||||
+
|
||||
+ foreach ver $bdb_versions {
|
||||
+ if {[have-feature bdb]} {
|
||||
+ break
|
||||
+ }
|
||||
+ lassign [split $ver .] maj min
|
||||
+ foreach path_tail [list "" db-$maj-$min db${maj}${min} db$maj.$min db-$maj db$maj] {
|
||||
+ if {[have-feature bdb]} {
|
||||
+ break
|
||||
+ }
|
||||
+ set lib_names [list db$maj-$maj.$min db$maj-$maj db-$maj.$min db-$maj]
|
||||
+ if {[find_bdb $bdb_prefix $maj $min $path_tail $lib_names]} {
|
||||
+ break
|
||||
}
|
||||
}
|
||||
- define-append CFLAGS -I$ver_inc_dir
|
||||
- define-append LDFLAGS -L$ver_lib_dir
|
||||
- define-append LIBS -ldb-$maj.$min
|
||||
- define-append HCACHE_BACKENDS "bdb"
|
||||
- define USE_HCACHE
|
||||
- break
|
||||
}
|
||||
|
||||
if {![have-feature bdb]} {
|
||||
Loading…
Reference in a new issue