From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 870FA138334 for ; Sun, 28 Oct 2018 18:05:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73615E0BB2; Sun, 28 Oct 2018 18:05:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EA0BE0BB2 for ; Sun, 28 Oct 2018 18:05:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECB16335C5D for ; Sun, 28 Oct 2018 18:05:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C531447 for ; Sun, 28 Oct 2018 18:05:28 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1540749916.6d25fb606f1cf674648e79da2ce71fe7da439508.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beecrypt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild X-VCS-Directories: dev-libs/beecrypt/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 6d25fb606f1cf674648e79da2ce71fe7da439508 X-VCS-Branch: master Date: Sun, 28 Oct 2018 18:05:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 85048a8c-17fd-4c9e-88f0-608411d0ed34 X-Archives-Hash: a7c8019b97468808ddeacd5f31b3b50c commit: 6d25fb606f1cf674648e79da2ce71fe7da439508 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Oct 28 18:04:51 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Oct 28 18:05:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d25fb60 dev-libs/beecrypt: disable assembly for x32, bug #461960 beecrypt has target-specifix assembly code for arithmetics in gas/mpopt.x86_64.m4. That assumes that x86_64 has 64-bit items to represent bignums. Unfortunately that is not true for x32 ABI as detection is based on size of 'unsigned long': ``` AC_DEFUN([BEE_CPU_BITS],[ AC_CHECK_SIZEOF([unsigned long]) if test $ac_cv_sizeof_unsigned_long -eq 8; then AC_SUBST(MP_WBITS,64U) ``` To workaround this deficiency disable assembly code completely: pass --enable-debug. Closes: https://bugs.gentoo.org/461960 Signed-off-by: Sergei Trofimovich gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild | 104 +++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild new file mode 100644 index 00000000000..7ec1630ce8c --- /dev/null +++ b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 + +DESCRIPTION="General-purpose cryptography library" +HOMEPAGE="https://sourceforge.net/projects/beecrypt/" +SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+threads java cxx python static-libs doc" +REQUIRED_USE="cxx? ( threads ) + python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND="!=dev-libs/icu-6.1:= ) + python? ( ${PYTHON_DEPS} )" + +DEPEND="${COMMON_DEPEND} + java? ( >=virtual/jdk-1.4 ) + doc? ( app-doc/doxygen + virtual/latex-base + dev-texlive/texlive-fontsextra + )" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.4 )" + +DOCS=( BUGS README BENCHMARKS NEWS ) +PATCHES=( + "${FILESDIR}"/${P}-build-system.patch + "${FILESDIR}"/${P}-gcc-4.7.patch + + # Fixes bug 596904 + "${FILESDIR}"/${P}-c++11-allow-throw-in-destructors.patch + "${FILESDIR}"/${P}-cast-uchar.patch #618676 + + "${FILESDIR}"/${P}-icu-61.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # ICU needs char16_t support now + # bug 649548 + append-cxxflags -std=c++14 + + # Crudely disable amd64 assembly code + # as it assumes 64-bit 'unsinged long' size. bug #461960 + local x32_hack=() + use amd64 && [[ ${ABI} == "x32" ]] && x32_hack=(--enable-debug) + + # cplusplus needs threads support + ac_cv_java_include=$(use java && java-pkg_get-jni-cflags) \ + econf \ + --disable-expert-mode \ + $(use_enable static-libs static) \ + $(use_enable threads) \ + $(use_with python python "${PYTHON}") \ + $(use_with cxx cplusplus) \ + $(use_with java) \ + "${x32_hack[@]}" +} + +src_compile() { + default + + if use doc; then + pushd include/beecrypt >/dev/null || die + doxygen || die "doxygen failed" + popd >/dev/null || die + HTML_DOCS=( docs/html/*.{css,html,js,png} ) + fi +} + +src_test() { + export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf" + echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}" || die + emake check bench +} + +src_install() { + default + + if use python; then + rm -f "${D%/}$(python_get_sitedir)"/_bc.*a || die + fi + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +}