1 |
commit: c4922b4a5ad6f52073f42799d7ef993d0cacf286 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 16 22:39:24 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 22:40:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4922b4a |
7 |
|
8 |
net-mail/serialmail: respect AR, CC, RANLIB |
9 |
|
10 |
Closes: https://bugs.gentoo.org/742743 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/serialmail-0.75-respect-AR-RANLIB.patch | 22 ++++++++++++++++++++++ |
15 |
net-mail/serialmail/serialmail-0.75-r5.ebuild | 12 +++++++++--- |
16 |
2 files changed, 31 insertions(+), 3 deletions(-) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..c04f0d78a28 |
21 |
--- /dev/null |
22 |
+++ b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch |
23 |
@@ -0,0 +1,22 @@ |
24 |
+diff --git a/Makefile b/Makefile |
25 |
+index 4edccea..7530107 100644 |
26 |
+--- a/Makefile |
27 |
++++ b/Makefile |
28 |
+@@ -369,7 +369,7 @@ warn-auto.sh systype |
29 |
+ ( cat warn-auto.sh; \ |
30 |
+ echo 'main="$$1"; shift'; \ |
31 |
+ echo 'rm -f "$$main"'; \ |
32 |
+- echo 'ar cr "$$main" $${1+"$$@"}'; \ |
33 |
++ echo '"$(AR)" cr "$$main" $${1+"$$@"}'; \ |
34 |
+ case "`cat systype`" in \ |
35 |
+ sunos-5.*) ;; \ |
36 |
+ unix_sv*) ;; \ |
37 |
+@@ -378,7 +378,7 @@ warn-auto.sh systype |
38 |
+ dgux-*) ;; \ |
39 |
+ hp-ux-*) ;; \ |
40 |
+ sco*) ;; \ |
41 |
+- *) echo 'ranlib "$$main"' ;; \ |
42 |
++ *) echo '"$(RANLIB)" "$$main"' ;; \ |
43 |
+ esac \ |
44 |
+ ) > makelib |
45 |
+ chmod 755 makelib |
46 |
|
47 |
diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild |
48 |
index cd27b3e46ce..275f044dad2 100644 |
49 |
--- a/net-mail/serialmail/serialmail-0.75-r5.ebuild |
50 |
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild |
51 |
@@ -3,6 +3,8 @@ |
52 |
|
53 |
EAPI=7 |
54 |
|
55 |
+inherit toolchain-funcs |
56 |
+ |
57 |
DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links" |
58 |
HOMEPAGE="http://cr.yp.to/serialmail.html" |
59 |
SRC_URI="http://cr.yp.to/software/${P}.tar.gz |
60 |
@@ -26,18 +28,22 @@ PATCHES=( |
61 |
"${WORKDIR}"/${P}-smtpauth.patch |
62 |
"${WORKDIR}"/${P}-smtpauth_comp.patch |
63 |
"${FILESDIR}"/${P}-implicit.patch |
64 |
+ "${FILESDIR}"/${PN}-0.75-respect-AR-RANLIB.patch |
65 |
) |
66 |
|
67 |
src_prepare() { |
68 |
default |
69 |
|
70 |
- sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc || die |
71 |
- use static && LDFLAGS="${LDFLAGS} -static" |
72 |
- sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld || die |
73 |
+ use static && LDFLAGS+="${LDFLAGS} -static" |
74 |
+ |
75 |
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc |
76 |
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld |
77 |
} |
78 |
|
79 |
src_compile() { |
80 |
sed -i -e '/(man|doc)/d' hier.c || die |
81 |
+ |
82 |
+ tc-export AR RANLIB |
83 |
emake it man |
84 |
} |