diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-07-24 21:19:18 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-07-24 21:19:18 +0000 |
| commit | 1a9dea2a951d86060e999dfd32638d44c6bf73dc (patch) | |
| tree | a11e4a13499e1e60335a93abfd4a79fe75438566 /app-arch/lz4 | |
| parent | version bump (diff) | |
| download | gentoo-2-1a9dea2a951d86060e999dfd32638d44c6bf73dc.tar.gz gentoo-2-1a9dea2a951d86060e999dfd32638d44c6bf73dc.tar.bz2 gentoo-2-1a9dea2a951d86060e999dfd32638d44c6bf73dc.zip | |
Use the development branch. Switch back to plain Makefile which is better supported upstream. Enable tests. Enable multilib support.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-arch/lz4')
| -rw-r--r-- | app-arch/lz4/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/lz4/lz4-9999.ebuild | 53 |
2 files changed, 25 insertions, 34 deletions
diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog index 332af0edd359..90b0198bc4a0 100644 --- a/app-arch/lz4/ChangeLog +++ b/app-arch/lz4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/lz4 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.22 2014/07/11 22:12:12 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.23 2014/07/24 21:19:18 mgorny Exp $ + + 24 Jul 2014; Michał Górny <mgorny@gentoo.org> lz4-9999.ebuild: + Use the development branch. Switch back to plain Makefile which is better + supported upstream. Enable tests. Enable multilib support. 11 Jul 2014; <tgall@gentoo.org> lz4-0_p106-r1.ebuild: Keyworded on arm64, bug #499468 diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild index d909089b5c1d..9c6adf32ff87 100644 --- a/app-arch/lz4/lz4-9999.ebuild +++ b/app-arch/lz4/lz4-9999.ebuild @@ -1,17 +1,15 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.10 2014/05/28 12:58:22 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.11 2014/07/24 21:19:18 mgorny Exp $ EAPI=5 -inherit cmake-utils multilib +inherit multilib multilib-minimal -CMAKE_USE_DIR="${S}/cmake_unofficial" - -if [ ${PV} == "9999" ] ; then - inherit subversion - ESVN_REPO_URI="http://lz4.googlecode.com/svn/trunk/" - ESVN_PROJECT="lz4-read-only" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git" + EGIT_BRANCH=dev else SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux" @@ -20,37 +18,26 @@ fi DESCRIPTION="Extremely Fast Compression algorithm" HOMEPAGE="https://code.google.com/p/lz4/" -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" -IUSE="" +IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="" +DEPEND="test? ( dev-util/valgrind )" src_prepare() { - if [[ ${PV} == "9999" ]] - then - subversion_src_prepare - else - epatch "${FILESDIR}/${P}-install-to-bindir.patch" - fi - cmake-utils_src_prepare + multilib_copy_sources } -src_configure() { - local mycmakeargs=(-DBUILD_LIBS=ON -DBUILD_SHARED_LIBS=ON) - cmake-utils_src_configure +multilib_src_compile() { + # we must not use the 'all' target since it builds test programs + # & extra -m32 executables + emake + emake -C programs } -src_install() { - if [[ $(get_libdir) != lib ]]; then - dodir "/usr/$(get_libdir)" - dosym "$(get_libdir)" /usr/lib - fi - - cmake-utils_src_install - - if [[ $(get_libdir) != lib ]]; then - rm "${ED}usr/lib" || die - fi +multilib_src_install() { + emake install DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/usr/$(get_libdir) } |