Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-embedded
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-13 08:24:49 +0000
committerMike Frysinger <vapier@gentoo.org>2015-07-13 08:24:49 +0000
commit427ec2408f67a6e41ca42418160e6439f50a0702 (patch)
treec4a7eeb0fb5127efba09211c69d9edaf20129b3b /dev-embedded
parentDisable explicit ccache handling as portage already does this for us. (diff)
downloadhistorical-427ec2408f67a6e41ca42418160e6439f50a0702.tar.gz
historical-427ec2408f67a6e41ca42418160e6439f50a0702.tar.bz2
historical-427ec2408f67a6e41ca42418160e6439f50a0702.zip
Fix handling of AR/AS tools.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/sdcc/ChangeLog6
-rw-r--r--dev-embedded/sdcc/Manifest32
-rw-r--r--dev-embedded/sdcc/sdcc-3.5.0.ebuild12
-rw-r--r--dev-embedded/sdcc/sdcc-9999.ebuild14
4 files changed, 42 insertions, 22 deletions
diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog
index 595d9c6b63c0..3d6326443554 100644
--- a/dev-embedded/sdcc/ChangeLog
+++ b/dev-embedded/sdcc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-embedded/sdcc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.55 2015/07/13 08:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.56 2015/07/13 08:24:46 vapier Exp $
+
+ 13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild,
+ sdcc-9999.ebuild:
+ Fix handling of AR/AS tools.
13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild,
sdcc-9999.ebuild:
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index bb25e1757af4..4b28105d9e2a 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -24,24 +24,24 @@ EBUILD sdcc-2.6.0.ebuild 1575 SHA256 f25810c3129b36ff265da9e857e27d49a542a9fa5e0
EBUILD sdcc-2.7.0.ebuild 1577 SHA256 b5bd996bd02e31e297e366a000babd5f56ba8fd3ee046d721f6af3fc0ec114de SHA512 6f33044f78499df541374ec8ef3ad2a80d61bf302c84e5d02cdab5d868d09be7027ea5e89b7b5c79aff9dfb00cd3cc547093fd7a82c877e2f457ae16c4fcdff0 WHIRLPOOL 0eae202fa9e91c128b373440442b3696c0475910e63b0f4e3e6fb6c6475aab041ba0aab33f2df9b63b504cdf64a67c7d7488a2a656594319363d0d0a74893c4a
EBUILD sdcc-2.8.0.ebuild 2087 SHA256 400e3c7ec3b0325549033435b8d320a1677e118f7fc92c0e458bf2f63057788e SHA512 eb999c838d372eee0e9d62a9a48b9f6caf133aa2aa4c8a5aca5e8f229b4e50d80a1c77a8328e700b4f980321b24a90a690b0e991d5c5d5fc33e2cb1de3f2aa4f WHIRLPOOL e9fd0b3121ac1fde0769edae008e4beab2e45d805fe330e4458d323fe5f39edf499b6cc3037b3270e0072576d4e7e06ddb3b348c5b4efe1cb621498048040f72
EBUILD sdcc-2.9.0.ebuild 2396 SHA256 326504d5b4f77aa03bdd100a811f6fdc0c9fc054b2794c09367a33a19f7b2c4a SHA512 ad39aa59b2138db840c5f83c3d4c5dba593ee36b1fb477082b5e3e2e1b7f1bc3648c859166b2cd76c110ab46e8967247ea48a108aa6ef70d5ae07366ecd69ef6 WHIRLPOOL ae49d98ec4de563aa48620bd61941d10faf4a60b140a6f5717d5955b80ce974284ed5734b3aa0e253dcff84181905446c070792fab26548ee1cc0cc4bf875dce
-EBUILD sdcc-3.5.0.ebuild 3099 SHA256 f720cd4f3b8abd9cf3ae1324625b6cfbc6af20907e028879c1f5c127703411f1 SHA512 134d6403d40fba5b6ec85a1a8554d8bcea62469a8e489ba48b905fc3ef0c6fed4d519cdab091338590749db358df047a78c9a22ba96f4b2f79217295be9b30d6 WHIRLPOOL d5951cc03349a4b56cd10587c213824acaf2d754c255547b36eb3cb0e5582bc96b2f6157f2cfe0a3d91f9c26b8f456792dd1ae4e4fe868f4ce71fca97833b3fa
-EBUILD sdcc-9999.ebuild 2127 SHA256 83445afd1f851f0f651443cf167e5c1b8d1ceb409951fc74288d3bd8421a318a SHA512 72456badb7b370c8931933c381947f5392456c5bfeb25b53dd0732ed6c91b083892f8d2c3189854f6167620a01e18e9a7402b76280129c287e238cf9c7e5707a WHIRLPOOL 6690a8ae83253cd6e77df5b5e1427f7d0c0ddb74bb3921fa7c7fd0ec375e61257cb8acdf08f7f9ddceba3ef05126f1087b4025e502409259c6ea5191e5bd518b
-MISC ChangeLog 8813 SHA256 1b1e713c74725fff6d206473008c602884ffc96b622bd8ad581a40df605fe575 SHA512 1eb07b829d0dc85d21aeb8a49d3ffb84bf6a9a264c9b7549e93c48b4851d7e40e529a9d2677250a90bec623dd47b5941af497a2579eea7a4495b3e5188e07c7d WHIRLPOOL 625f80135c155b8a3e08afc469220ef2e37747da5497eb7924d4f3b4066d2b834ba317f35aa985a3b32f8a81af7dca1d5487fb0d9fec6ea33fc470fc18640177
+EBUILD sdcc-3.5.0.ebuild 3352 SHA256 2d11040a41f0a1d9c2013febbfe8d82cdea9b2c534b2b312ab9e56ebf650efd9 SHA512 d34e5c2ceaae475c5bc44de605de63f8f23c7c55a3e5ae0f2066795f93aa90ad38ff7dd322a47773a96be5da2249f96ff14b58d3e56949a4818c275f3646ed22 WHIRLPOOL a68dc0a57eea1739468151587542d11d7e4b244238a687088a41db453a21373d6ee900f7c1325a31ec4819395328cab29c57b6c671ee1e16bf0b4897604c7139
+EBUILD sdcc-9999.ebuild 2381 SHA256 6d6207c3dfeb9a9e1ae29774a1f6a875f6dce0d45f465bf21120cdac974390d8 SHA512 523f513ca4adc54127255030d197aa1b512dfdf5448b2c10c4821787c838d7c29c3c79428a5274d104daabe5479839f92963032b47645f733e9d88970358b18c WHIRLPOOL 7f947999ef1347d09fb052542f008fd4a992e4af69c3169b210677bb7fa3d867cd46a01715737b6fea50991433e71efbe66a0a8f140da1c42538d94fd9d8ac88
+MISC ChangeLog 8934 SHA256 30d6a42f60a075124b927dce5336c3d6651896fc0606a0fb8bf124738710ef18 SHA512 d8b8310479d377113b186981d9ce2cc69d317da7f08284fb3cbcb20833af12d8f3184a1b996c0069b5029c899b8b3dd82dd699e5e7051c20eee415c3c3946b84 WHIRLPOOL 39e915e7a1624be5974d85fc6b3002430ad5ff710f8e1730e7725c85c96499b8e1bb0c021518b6bdb220b2831524cabad67ce7e61691ba96677c990f56801438
MISC metadata.xml 2127 SHA256 feb21b4a44a0d8a54618276763cbfcb418067ae5102f0b8d2575731aff986bde SHA512 71c4eb72abe7a582ce785df9e542e2c83ac1fa9e45a20d0258cea3d625552291032adf0d84287e6f570b3e6f04f6e632d3481665711a603b9a14ae3368ac27e2 WHIRLPOOL a3b74adab58f7c935611033b27d9a2544270219f9ee5592ed4dfd9630c322e6f42369f6d29e413563246d63e0d55f8b069a4092daa00a7061825e1574791ea43
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVo3BbAAoJEPGu1DbS6WIA8YMP/3o8aEpnHjcf6WTtVZfVr+kZ
-SJxYF1Bbri0iWsYntfpj0/WhwrJ2OtGG0ahoEQZA5dcP1dgIUVNsVPlfvGItOHvq
-/wjtwA3JhYzUU1lK/i4Fp6MG0Vc4/66fIYsmtIIwK+ddFVCt0tJxcvO9KBMdoT9t
-/INdCd/kE01CKpRkVnRN+QiAqwwcIz1f4GJnJauhLQ3X9+27bJTeNh7t1ZUk3LBQ
-t7sXZaR/bv8VGz6Z0ObaoF8Admjt7PbgUwObUDfVdo26XaKIMLlOAF3AcSz/Nh5Z
-L2mQdVWfRqH783/WBrg9acrDJs++TvFjbWkaeIyvcNDy+w9HwZN3rkxE2ASqcm4h
-jvrJXMqK31DOp07bkO9X2MqhhXLltf7Iq4+q9dGVvrZEEJ3pTlDqxSTDOkWu+Gpo
-X2gPLK2a0x1Q6pW604YeSLMB5mP/k23TLRsChR3eXSN5wjfXUc5HIAmJHKCPIQ2e
-5d4B9nGD/jOsNbYjP5Pm3U6II+kaO8rakckbQ7uG+DbrKNfuJvLghN02pYYcVxfK
-G5mkC+Y/XQP6A0hFoQyrvVTsbQ7Do4zbsUsTr3OBOdnqSpHL9VxyHqbOHF1PT4LG
-gyseHNvRpaIE+qwkfV10Ky4sqV443umMEtaAkuUQ0MD2i33PD8l5FHwSa5Fn4znX
-vi1Wnnkc9Hm8g5Os3Fvc
-=4A/J
+iQIcBAEBCAAGBQJVo3XQAAoJEPGu1DbS6WIAemQQAJDfwSh7l0N1rXzypoedy7Gz
+GJIagF3nTz3iSTFl2DNTstHO4OwGUxMHaVdOHHFRnw1e2qnC78KbMF0HySphkKib
+c6nr+4FJ0CONT2dSeS6JulKMm50rH1XCaudK+03UUYALfGMXrQOzzlPKF5hJdgvg
+IXjoorxyt7nBU9Zpw4GNRZJ1UaZTQG29sQzvuKiZFnlXOSLlBxCC6LmkOrKIhO26
+HDx2wypACt3opBViMHj+ewh2EjDMq6XCwE2ho+Iu5lJpMAdTXDx3WiXotdbJA86D
+3nwr2teg3PrgtN+h4qIJgUrs85BECmvHfuuP4HSJZdHN0Ts+nlHGETk8pebaX8Ry
+aYq/skcfR23p1y5W+oxccY/dd0BFusobuAtVNTnvBPpmWQN/U+uTRemTvZcaAcSE
+Tc6UsD4cKBrbHLi3FuvJr2cgW3X0gy5awwuHi5+qtsAmzGbILS1J7/NnDETGkX06
+nHJITCSzJmu6GShtjspBpKRgZr0p0sHu4ZVzdVIBqDrp2DZd7jcoAI300NU3Xejc
+gKgRstXmFsXxoBmpN6lc89gjKUIZI1pDdVypIvTAea+KhN43QBEammbHke639Ijb
+c+dNeIUEbg7qzzvR0YFGwpnfOJVuVPMjPzSrqDf2HEDrRpZbpD97P4gjYkCFXPpS
+rKT3Xjqd5gHiR4hL6sWq
+=s1Ns
-----END PGP SIGNATURE-----
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index b2ea5d8a5a83..3c4c9fbc754a 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.7 2015/07/13 08:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.8 2015/07/13 08:24:46 vapier Exp $
EAPI="5"
-inherit eutils
+inherit eutils toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
@@ -61,12 +61,20 @@ src_prepare() {
-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
{} + || die
+ # https://sourceforge.net/p/sdcc/bugs/2398/
+ sed -i '1iAR = @AR@' Makefile.common.in || die
+ sed -i \
+ -e "/^AR =/s:=.*:=$(tc-getAR):" \
+ support/cpp/Makefile.in || die
+
# Make sure timestamps don't get messed up.
[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
}
src_configure() {
econf \
+ ac_cv_prog_AS="$(tc-getAS)" \
+ ac_cv_prog_AR="$(tc-getAR)" \
--docdir='$(datarootdir)'/doc/${PF} \
--without-ccache \
$(use_enable mcs51 mcs51-port) \
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 9a323b87854e..8e724857ef91 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.6 2015/07/13 08:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.7 2015/07/13 08:24:46 vapier Exp $
EAPI="5"
-inherit eutils
+inherit eutils toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
@@ -49,6 +49,12 @@ src_prepare() {
-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
{} + || die
+ # https://sourceforge.net/p/sdcc/bugs/2398/
+ sed -i '1iAR = @AR@' Makefile.common.in || die
+ sed -i \
+ -e "/^AR =/s:=.*:=$(tc-getAR):" \
+ support/cpp/Makefile.in || die
+
# We'll install doc manually
sed -i -e '/SDCC_DOC/d' Makefile.in || die
sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die
@@ -61,8 +67,10 @@ src_prepare() {
}
src_configure() {
- ac_cv_prog_STRIP=true \
econf \
+ ac_cv_prog_STRIP=true \
+ ac_cv_prog_AS="$(tc-getAS)" \
+ ac_cv_prog_AR="$(tc-getAR)" \
--without-ccache \
$(use_enable boehm-gc libgc) \
$(docs_compile && use_enable doc || echo --disable-doc)