diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-02 15:23:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-02 15:23:50 +0000 |
| commit | f5801ea5ab72f37b6d0f3ad04555ba3e0a9229ce (patch) | |
| tree | c382a004932d57b0657025426ee8690aa63e796a /app-arch | |
| parent | Marked ~hppa (bug #503166). (diff) | |
| download | gentoo-2-f5801ea5ab72f37b6d0f3ad04555ba3e0a9229ce.tar.gz gentoo-2-f5801ea5ab72f37b6d0f3ad04555ba3e0a9229ce.tar.bz2 gentoo-2-f5801ea5ab72f37b6d0f3ad04555ba3e0a9229ce.zip | |
Update the live ebuild to conform with changes upstream. Fix the src_install() lib hack to handle $(get_libdir) == lib safely.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/lz4/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/lz4/lz4-9999.ebuild | 27 |
2 files changed, 16 insertions, 17 deletions
diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog index c9cd84476db5..e7a25cee61aa 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.13 2014/02/14 19:13:23 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.14 2014/03/02 15:23:50 mgorny Exp $ + + 02 Mar 2014; Michał Górny <mgorny@gentoo.org> lz4-9999.ebuild: + Update the live ebuild to conform with changes upstream. Fix the src_install() + lib hack to handle $(get_libdir) == lib safely. 14 Feb 2014; Markus Meier <maekke@gentoo.org> lz4-0_p106-r1.ebuild: add ~arm, bug #499468 diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild index 40a2cd2c29da..840dc3ec8e35 100644 --- a/app-arch/lz4/lz4-9999.ebuild +++ b/app-arch/lz4/lz4-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.8 2013/10/13 12:13:49 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.9 2014/03/02 15:23:50 mgorny Exp $ EAPI=5 inherit cmake-utils multilib -CMAKE_USE_DIR="${S}/cmake" +CMAKE_USE_DIR="${S}/cmake_unofficial" if [ ${PV} == "9999" ] ; then inherit subversion @@ -28,7 +28,7 @@ DEPEND="" RDEPEND="${DEPEND}" src_prepare() { - if [ ${PV} == "9999" ] + if [[ ${PV} == "9999" ]] then subversion_src_prepare else @@ -38,24 +38,19 @@ src_prepare() { } src_configure() { - local mycmakeargs=(-DBUILD_SHARED_LIBS=ON) + local mycmakeargs=(-DBUILD_LIBS=ON -DBUILD_SHARED_LIBS=ON) cmake-utils_src_configure } src_install() { - dodir /usr - dodir "/usr/$(get_libdir)" - ln -s "$(get_libdir)" "${ED}usr/lib" || \ - die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)" + if [[ $(get_libdir) != lib ]]; then + dodir "/usr/$(get_libdir)" + dosym "$(get_libdir)" /usr/lib + fi cmake-utils_src_install - rm "${ED}usr/lib" - - if [ -f "${ED}usr/bin/lz4c64" ] - then - dosym lz4c64 /usr/bin/lz4c - else - dosym lz4c32 /usr/bin/lz4c + if [[ $(get_libdir) != lib ]]; then + rm "${ED}usr/lib" || die fi } |