public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: app-arch/pax/
Date: Sun,  8 Jan 2017 21:37:56 +0000 (UTC)	[thread overview]
Message-ID: <1483911423.ff1b5922a5f55a683a72aa120f19ab59714045fe.lluixhi@gentoo> (raw)

commit:     ff1b5922a5f55a683a72aa120f19ab59714045fe
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan  8 21:37:03 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan  8 21:37:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=ff1b5922

app-arch/pax: Fix LDFLAGS

While the patch applied -lfts, LDFLAGS should go before objects

 app-arch/pax/Manifest            | 2 +-
 app-arch/pax/pax-20160306.ebuild | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index b1d6fa2..2692c2a 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,4 +1,4 @@
 AUX pax-20160306-glibc-to-linux.patch 932 SHA256 5dd64a70e394c15de0be8d9c4c2a366cb4cd998c2e32611dd0aced799a2c18e3 SHA512 96d018bd1be2b0d22c9c5e11a92d8cf7ef9bc72d1b13686e572aa15935f2fda9d507baf1e0eb916fec776c2f9d7bab458c203cab64446eed34b70f544109d1d7 WHIRLPOOL a9362fe33bd93532a123b35b4b12b97890b863035773dbcd79820cd7eb4ce4536c46fcff47a8d3947676ee166a4e10e62c1ccc84423ab3ee40d97d91fc67df1e
 DIST paxmirabilis-20160306.cpio.gz 147448 SHA256 4e36fabfabc01a15e0d01eee0306cef79a7f374586f46254dae139eb866ae81b SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f WHIRLPOOL 5945f45cc69cfd25d7754a9b6b25db98170de2fc926ffe3a661402d95bc41517e40ff059998d682cc65e32fd7e70a78e222525012eb98dde54c1d67c0c6c2277
-EBUILD pax-20160306.ebuild 1448 SHA256 a5004bcd662ead8e2047922f6527f4fdf3fb4d0b80dddb15fe1f834e61825781 SHA512 60629b46c2ce23eb5e060a198deac7857a3614afb298bedbce67d30b36285ba0105f0be2c911a6146055b1fe6498dadacab039f4bf846bb9a63c0dfe62f11cbf WHIRLPOOL 740b7ce6f76c2e608950226be9fd92e927b75104bf33378e5f7f977a875171b715b5a34c2929d1eb1170cd27a92a31f2c6bda16695641799e793b0565d5eeced
+EBUILD pax-20160306.ebuild 1421 SHA256 f2071656e5d2c83824303fb30ddd0447c9edd0c5436d99d529e688d09dffe79a SHA512 b3da2701e8f4067af860fff2a2cc5e568890dc8eec8914b198b4628d47b9c91002a4f465d7914f969b4ca730b668433ce06ab548646f590a607f0aa3f377a87a WHIRLPOOL 51b9fa096415f2df71e58fff2937e62652ffa5bea82611a65f41ab0781f0701ce368811a8cf99bd532752f33b023640974a2fb19d104712afab3454a20454afa
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968

diff --git a/app-arch/pax/pax-20160306.ebuild b/app-arch/pax/pax-20160306.ebuild
index 753f685..39ba7ae 100644
--- a/app-arch/pax/pax-20160306.ebuild
+++ b/app-arch/pax/pax-20160306.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit unpacker toolchain-funcs flag-o-matic
+inherit unpacker toolchain-funcs
 
 DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
 HOMEPAGE="https://www.mirbsd.org/pax.htm"
@@ -37,15 +37,13 @@ src_configure() {
 }
 
 src_compile() {
-	use elibc_musl && append-ldflags "-lfts"
-
 	# We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
 	set -- \
 		${CC} ${CPPFLAGS} ${CFLAGS} \
 		-DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \
 		-DLONG_OFF_T -DHAVE_LINKAT \
 		$(${PKG_CONFIG} --cflags libbsd-overlay) \
-		-Wall *.c -o ${PN} ${LDFLAGS} \
+		-Wall ${LDFLAGS} *.c -o ${PN} $(usex elibc_musl '-lfts' '')\
 		$(${PKG_CONFIG} --libs libbsd-overlay)
 	echo "$@"
 	"$@" || die


             reply	other threads:[~2017-01-08 21:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-08 21:37 Aric Belsito [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-01-08 21:46 [gentoo-commits] proj/musl:master commit in: app-arch/pax/ Aric Belsito
2017-01-08 21:47 Aric Belsito
2017-01-15 21:46 Aric Belsito
2017-12-18  4:04 Aric Belsito
2018-12-29 15:15 Anthony G. Basile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1483911423.ff1b5922a5f55a683a72aa120f19ab59714045fe.lluixhi@gentoo \
    --to=lluixhi@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox