summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2020-06-11 13:07:58 +0200
committerPatrice Clement <monsieurp@gentoo.org>2020-06-11 13:07:58 +0200
commit99d6110fc6b30c51fabef6d171dd08cf81ff9b1e (patch)
tree3a9bada41374614621d0563a65889d16e0332281
parentapp-emulation/xen: add security patches XSA-320 / CVE-2020-0543 (diff)
downloadgentoo-99d6110fc6b30c51fabef6d171dd08cf81ff9b1e.tar.gz
gentoo-99d6110fc6b30c51fabef6d171dd08cf81ff9b1e.tar.bz2
gentoo-99d6110fc6b30c51fabef6d171dd08cf81ff9b1e.zip
net-misc/spiped: patch Makefile to honor LDFLAGS.
Closes: https://bugs.gentoo.org/725230 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
-rw-r--r--net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch22
-rw-r--r--net-misc/spiped/spiped-1.6.0-r1.ebuild4
2 files changed, 26 insertions, 0 deletions
diff --git a/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch b/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch
new file mode 100644
index 000000000000..e7502d539c94
--- /dev/null
+++ b/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch
@@ -0,0 +1,22 @@
+--- a/spiped/Makefile 2020-06-11 10:21:27.592104792 -0000
++++ b/spiped/Makefile 2020-06-11 10:21:55.028522571 -0000
+@@ -27,7 +27,7 @@
+ rm -f ${PROG} ${SRCS:.c=.o}
+
+ ${PROG}:${SRCS:.c=.o}
+- ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX}
++ ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS}
+
+ main.o: main.c ../libcperciva/util/asprintf.h ../libcperciva/util/daemonize.h ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../lib/util/graceful_shutdown.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h dispatch.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h
+ ${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -I.. ${IDIRS} -c main.c -o main.o
+--- a/spipe/Makefile 2020-06-11 10:21:19.025515816 -0000
++++ b/spipe/Makefile 2020-06-11 10:22:17.924981556 -0000
+@@ -27,7 +27,7 @@
+ rm -f ${PROG} ${SRCS:.c=.o}
+
+ ${PROG}:${SRCS:.c=.o}
+- ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX}
++ ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS}
+
+ main.o: main.c ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h ../proto/proto_conn.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h pushbits.h
+ ${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -I.. ${IDIRS} -c main.c -o main.o
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
index 7820531c9cd9..ca4826de3c19 100644
--- a/net-misc/spiped/spiped-1.6.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -25,6 +25,10 @@ RDEPEND="
${DEPEND}
!net-mail/qlogtools"
+PATCHES=(
+ "${FILESDIR}/${P}-ldflags-support.patch"
+)
+
src_compile() {
emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}