hashdb: fix ./configure openssl-1.1.0 detection

This commit is contained in:
Yury Martynov 2019-11-23 17:36:58 +03:00
parent 0094720c3d
commit a1a8a3f896
No known key found for this signature in database
GPG key ID: EBE62DD0CCEAE19E
2 changed files with 41 additions and 13 deletions

View file

@ -0,0 +1,12 @@
diff -ur a/configure.ac b/configure.ac
--- a/configure.ac 2017-05-19 21:40:12.000000000 +0300
+++ b/configure.ac 2019-11-23 17:31:01.910783054 +0300
@@ -203,7 +203,7 @@
# OpenSSL has been installed under at least two different names...
# note that crypto requires zlib
AC_CHECK_LIB([crypto],[EVP_get_digestbyname],[],[AC_MSG_ERROR([Could not find crypto library])])
-AC_CHECK_LIB([ssl],[SSL_library_init],[],[AC_MSG_ERROR([Could not find ssl library])])
+AC_CHECK_LIB([ssl],[OPENSSL_init_ssl],[],[AC_MSG_ERROR([Could not find ssl library])])
AC_CHECK_FUNCS([EVP_get_digestbyname],,
AC_MSG_ERROR([SSL/OpenSSL support required]))

View file

@ -10,11 +10,12 @@ inherit autotools flag-o-matic python-single-r1
DESCRIPTION="The hashdb block hash database tool and API"
HOMEPAGE="https://github.com/NPS-DEEP/hashdb"
SRC_URI="https://github.com/NPS-DEEP/hashdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~hppa ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
LICENSE="Unlicense"
SLOT="0"
IUSE="python static-libs"
KEYWORDS="~amd64 ~hppa ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
LICENSE="GPL-3 public-domain"
SLOT="0"
IUSE="python static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
@ -26,34 +27,49 @@ RDEPEND="
DEPEND="${RDEPEND}
python? ( dev-lang/swig )
sys-devel/libtool"
sys-devel/libtool
test? (
dev-util/valgrind
dev-python/matplotlib[${PYTHON_USEDEP}] )"
pkg_setup() {
use python && python-single-r1_pkg_setup
python-single-r1_pkg_setup
}
src_prepare() {
eapply "${FILESDIR}"/fix_undefined_reference_to_libewf_handle_read_random.patch
# https://github.com/NPS-DEEP/hashdb/issues/6
if has_version ">=dev-libs/openssl-1.1.0"; then
eapply "${FILESDIR}"/fix_configure_openssl-1.1.0_detection.patch
fi
python_fix_shebang "${S}"
eautoreconf
eapply_user
default
}
src_configure() {
append-cxxflags -std=c++11
econf \
--without-o3 \
$(use_enable python SWIG_Python) \
$(use_enable static-libs static)
}
src_test() {
pushd test/ >/dev/null || die
./memory_analysis.sh || die
popd >/dev/null || die
emake -j1 check
}
src_install() {
default
find "${D}" -name '*.la' -delete || die
if use python; then
rm -f "${D%/}$(python_get_sitedir)"/*.a || die
fi
if ! use static-libs; then
find "${D}" -name '*.la' -delete || die
if use python && ! use static-libs; then
rm -f "${D}$(python_get_sitedir)"/*.a || die
fi
}