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 94753139086 for ; Tue, 3 Jan 2017 17:30:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD6E6E0CEA; Tue, 3 Jan 2017 17:30:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78264E0CEA for ; Tue, 3 Jan 2017 17:30:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08E20341134 for ; Tue, 3 Jan 2017 17:30:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34A2D24E8 for ; Tue, 3 Jan 2017 17:30:08 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1483464598.ed6a2132e43a7d9c00b1bbe6b9a14edc6a0c06f0.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/lz4/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/lz4/lz4-9999.ebuild X-VCS-Directories: app-arch/lz4/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ed6a2132e43a7d9c00b1bbe6b9a14edc6a0c06f0 X-VCS-Branch: master Date: Tue, 3 Jan 2017 17:30:08 +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: 6facc61e-78ce-4376-8fcb-fcfd459e83ff X-Archives-Hash: f30217e798089594e28de3a5f895c740 commit: ed6a2132e43a7d9c00b1bbe6b9a14edc6a0c06f0 Author: Michał Górny gentoo org> AuthorDate: Tue Jan 3 17:13:14 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jan 3 17:29:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6a2132 app-arch/lz4: update -9999, switch to CMake Update the URLs in the live ebuild and switch it to use the CMake build system. It is free of all fancy things we had to hack around in Makefiles, and links all executables to the shared library. It lacks tests but they were not very useful anyway. app-arch/lz4/lz4-9999.ebuild | 58 ++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 43 deletions(-) diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild index 4ed5767..3e59139 100644 --- a/app-arch/lz4/lz4-9999.ebuild +++ b/app-arch/lz4/lz4-9999.ebuild @@ -2,63 +2,35 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit multilib multilib-minimal toolchain-funcs +inherit cmake-multilib if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" + EGIT_REPO_URI="https://github.com/lz4/lz4.git" EGIT_BRANCH=dev else - MY_PV="r${PV##0_p}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Extremely Fast Compression algorithm" -HOMEPAGE="https://github.com/Cyan4973/lz4" +HOMEPAGE="https://github.com/lz4/lz4" LICENSE="BSD-2 GPL-2" -# Upstream has trouble keeping ABI stable, so please test new versions -# with abi-compliance-checker and update the subslot every time ABI -# changes. This is the least we can do to keep things sane. +# https://abi-laboratory.pro/tracker/timeline/lz4/ +# note: abi-tracker is most likely wrong about 1.7.3 changing ABI, +# the maintainer is looking into fixing that SLOT="0/r131" -IUSE="static-libs test valgrind" +IUSE="static-libs" -DEPEND="test? ( valgrind? ( dev-util/valgrind ) )" +CMAKE_USE_DIR=${S}/contrib/cmake_unofficial -src_prepare() { - if ! use valgrind; then - sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die - fi - multilib_copy_sources -} - -lmake() { - emake \ - BUILD_STATIC=$(usex static-libs) \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/usr/$(get_libdir) \ - "$@" -} - -multilib_src_compile() { - tc-export CC AR - # we must not use the 'all' target since it builds test programs - # & extra -m32 executables - lmake -C lib liblz4 liblz4.pc - lmake -C programs lz4 lz4c - # work around lack of proper target dependencies - touch lib/liblz4 -} - -multilib_src_test() { - lmake -j1 test -} +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_STATIC_LIBS=$(usex static-libs) + ) -multilib_src_install() { - lmake install DESTDIR="${D}" + cmake-utils_src_configure }