summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-02-17 13:53:34 +0100
committerJeroen Roovers <jer@gentoo.org>2019-02-17 13:54:00 +0100
commit9869c57802fc123b8e785992106ea54fb65512bf (patch)
treec8f84dab0ddf693f43f33e2886b3808d3077df98
parentsys-apps/texinfo: Removed old. (diff)
downloadgentoo-9869c57802fc123b8e785992106ea54fb65512bf.tar.gz
gentoo-9869c57802fc123b8e785992106ea54fb65512bf.tar.bz2
gentoo-9869c57802fc123b8e785992106ea54fb65512bf.zip
net-analyzer/argus-clients: Fix USE=mysql
Package-Manager: Portage-2.3.60, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/678214 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild1
-rw-r--r--net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
index 34882be08c07..42799057487b 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+ "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
)
src_prepare() {
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch
new file mode 100644
index 000000000000..fc8d3d0ed6e2
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch
@@ -0,0 +1,21 @@
+--- a/examples/ramysql/Makefile.in
++++ b/examples/ramysql/Makefile.in
+@@ -56,7 +56,8 @@
+
+
+ MYSQLLIB = @MYSQL_LDFLAGS@
+-CURSESLIB = @CURSESLIB@ @V_READLINE@
++CURSESLIB = @CURSESLIB@
++V_READLINE = @V_READLINE@
+
+
+ # Standard CFLAGS
+@@ -94,7 +95,7 @@
+ $(CC) $(CCOPT) -o $@ rasql.o $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)
+
+ $(INSTALLBIN)/rasqlinsert: rasqlinsert.o raclient.o $(LIB)
+- $(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB)
++ $(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB) $(V_READLINE)
+
+ $(INSTALLBIN)/rasqltimeindex: rasqltimeindex.o $(LIB)
+ $(CC) $(CCOPT) -o $@ rasqltimeindex.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)