diff options
-rw-r--r-- | dev-libs/libebml/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/libebml/libebml-1.3.0-r1.ebuild | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest index 5e0bbf3..7a14f48 100644 --- a/dev-libs/libebml/Manifest +++ b/dev-libs/libebml/Manifest @@ -1,6 +1,6 @@ AUX libebml-1.2.0-makefile-fixup.patch 3568 SHA256 f3d1432c6b9b72e12621cc11679d80014b93ba553f8b20e0870f15147a922929 SHA512 2453b0fbc4401feb5f7fb32791bdc8aab02be0aff674df776f2b1f33da23e03219978c887e93f111b85af12088fdceba60c4869584ab397e0af8886cf2cc2eb4 WHIRLPOOL b64989f758fbc7e9fc05e0df2c9d432571887895d6c453d6a22d9321c0c75b6e402f871f41b3700bf931a873e1ea4bc6d4a8462c651640b741282220e3f80abb AUX libebml-1.3.0-makefile.patch 3291 SHA256 50d2fd586ca057bdeb4c000047de09b853594c2c8fae8e5ed299e651f228a72d SHA512 d88b94bdf1497a400bbedf48db9501310e8511632d5972134c931b790ffc15dd5bf74a2c8f297c0457734a5972a485b3a2bdfb6e681c2beef0f96c11cc526db1 WHIRLPOOL 118348a769e06e16c7b127a72da8cca287396d7e8d7d88218827af6c891f9ac70980544d25e93fabafda9777d8ed4fabb4597846044f49ce49fd0b1de2913638 DIST libebml-1.3.0.tar.gz 70425 SHA256 cd48a6d943905afe877e86f421647092956d71c7345dc9264a5123750ca8b158 SHA512 804b8e9e29add421304ef104f48170ee434cc97d6063dc4338b7fd6ad559733ed1bffd8440146674b70b3d6906f45ded4cc482d606c94c8c04bf424fd85c366e WHIRLPOOL b5656fa835753bee8b4cfa995db220de85d69604d7332e793c6b45c13100e4041e0fee8517940bde600909b529d3eee959340d3f997b174b249f13c4183ed5cd -EBUILD libebml-1.3.0-r1.ebuild 1600 SHA256 da5c054e9b75b894d2531099d6a7f8a2f5e1133f5db816805936570c7a397efb SHA512 eaceaf410ec3bf2c9999eaef939a76329597237a1ff9ff018f64df430020cb9b5f8ca84172923e331494e7a193ea685c41275c1ea35b7638a48843921e2dc437 WHIRLPOOL d26fa0a7474a24fba682c9e718ab05e67ed39af1d5929b118b71e963880b95653b1565fc3496e72d02bb083f65dc57e6ece02f2a6789a4a6155f67275b9044f8 +EBUILD libebml-1.3.0-r1.ebuild 1594 SHA256 f83de35979b0b35bfc41858662c4f30340b30c2c6e9ae46696384df095dc1848 SHA512 bf62842f4384e94cea202a8d0528536c90cfcafe638609511620b1b70696537e33d3427b122d13fc2d312cbf83ab22e7eb86c9514c2dab3d4508759ec3eac920 WHIRLPOOL 294885a16085e32345d8a274c88e8ae81c4a2f90ee1088b22f4bff30adfc15b349509ac89d0d12c93b849a6a8fb6ad8d5b06b292f1a5d69c501236b80ad1e615 MISC ChangeLog 17252 SHA256 d6f6fb31833520385f5c8bed0e149fc01bca583a4b91c5949bbf0886e601dbb6 SHA512 92c13ca5d7ea96ca658dc9f58379a0cc5fcfdd9798ea84af93a6a7e8a91d312388b20157a92a8a8db5a6292265cfd80fb729c1517422c7067bda330c218747a9 WHIRLPOOL 38097bc1f71081a02ea14dfda7e3b67af417918be43da8386f763c2d1bd10348ef109a8e989e4606672c4d190610bc44c4aaba1279c8191f66824c5f38af5ec2 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c diff --git a/dev-libs/libebml/libebml-1.3.0-r1.ebuild b/dev-libs/libebml/libebml-1.3.0-r1.ebuild index cbc451e..aa44213 100644 --- a/dev-libs/libebml/libebml-1.3.0-r1.ebuild +++ b/dev-libs/libebml/libebml-1.3.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils multilib toolchain-funcs +inherit eutils multilib toolchain-funcs multilib-minimal DESCRIPTION="Extensible binary format library (kinda like XML)" HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libebml/" @@ -12,18 +12,21 @@ SRC_URI="https://github.com/Matroska-Org/${PN}/archive/release-${PV}.tar.gz -> $ LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64" IUSE="debug static-libs" -S=${WORKDIR}/${PN}-release-${PV}/make/linux +S=${WORKDIR}/${PN}-release-${PV} src_prepare() { + cd make/linux epatch "${FILESDIR}"/${P}-makefile.patch sed -i "s:\(DEBUGFLAGS=\)-g :\1:" Makefile || die + multilib_copy_sources } -src_compile() { +multilib_src_compile() { + cd make/linux local targets if [[ ${CHOST} != *-darwin* ]] ; then targets="sharedlib" @@ -36,14 +39,15 @@ src_compile() { # install_name on Darwin emake \ prefix="${EPREFIX}"/usr \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ + AR="${AR:-$(tc-getAR)}" \ + CC="${CC:-$(tc-getCC)}" \ + CXX="${CXX:-$(tc-getCXX)}" \ $(use debug && echo DEBUG=yes || echo DEBUG=no) \ ${targets} } -src_install() { +multilib_src_install() { + cd make/linux local targets="install_headers" if [[ ${CHOST} != *-darwin* ]] ; then targets+=" install_sharedlib" @@ -57,6 +61,8 @@ src_install() { prefix="${EPREFIX}"/usr \ libdir="${EPREFIX}"/usr/$(get_libdir) \ ${targets} +} - dodoc "${WORKDIR}"/${PN}-release-${PV}/ChangeLog +multilib_src_install_all() { + dodoc ChangeLog } |