diff options
| -rw-r--r-- | net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch | 22 | ||||
| -rw-r--r-- | 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 000000000000..c04f0d78a28c --- /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 cd27b3e46cee..275f044dad2c 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 } |