public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/serialmail/files/, net-mail/serialmail/
Date: Wed, 16 Sep 2020 22:40:37 +0000 (UTC)	[thread overview]
Message-ID: <1600296031.c4922b4a5ad6f52073f42799d7ef993d0cacf286.sam@gentoo> (raw)

commit:     c4922b4a5ad6f52073f42799d7ef993d0cacf286
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 22:39:24 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 22:40:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4922b4a

net-mail/serialmail: respect AR, CC, RANLIB

Closes: https://bugs.gentoo.org/742743
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/serialmail-0.75-respect-AR-RANLIB.patch  | 22 ++++++++++++++++++++++
 net-mail/serialmail/serialmail-0.75-r5.ebuild      | 12 +++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch
new file mode 100644
index 00000000000..c04f0d78a28
--- /dev/null
+++ b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 4edccea..7530107 100644
+--- a/Makefile
++++ b/Makefile
+@@ -369,7 +369,7 @@ warn-auto.sh systype
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+ 	echo 'rm -f "$$main"'; \
+-	echo 'ar cr "$$main" $${1+"$$@"}'; \
++	echo '"$(AR)" cr "$$main" $${1+"$$@"}'; \
+ 	case "`cat systype`" in \
+ 	sunos-5.*) ;; \
+ 	unix_sv*) ;; \
+@@ -378,7 +378,7 @@ warn-auto.sh systype
+ 	dgux-*) ;; \
+ 	hp-ux-*) ;; \
+ 	sco*) ;; \
+-	*) echo 'ranlib "$$main"' ;; \
++	*) echo '"$(RANLIB)" "$$main"' ;; \
+ 	esac \
+ 	) > makelib
+ 	chmod 755 makelib

diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild
index cd27b3e46ce..275f044dad2 100644
--- a/net-mail/serialmail/serialmail-0.75-r5.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
 HOMEPAGE="http://cr.yp.to/serialmail.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz
@@ -26,18 +28,22 @@ PATCHES=(
 	"${WORKDIR}"/${P}-smtpauth.patch
 	"${WORKDIR}"/${P}-smtpauth_comp.patch
 	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${PN}-0.75-respect-AR-RANLIB.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc || die
-	use static && LDFLAGS="${LDFLAGS} -static"
-	sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld || die
+	use static && LDFLAGS+="${LDFLAGS} -static"
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 }
 
 src_compile() {
 	sed -i -e '/(man|doc)/d' hier.c || die
+
+	tc-export AR RANLIB
 	emake it man
 }
 


                 reply	other threads:[~2020-09-16 22:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1600296031.c4922b4a5ad6f52073f42799d7ef993d0cacf286.sam@gentoo \
    --to=sam@gentoo.org \
    --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