summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-07-07 10:59:07 +0200
committerJeroen Roovers <jer@gentoo.org>2019-07-07 10:59:57 +0200
commitcd9b1d7b718109ba94696dbaa90d1350aecffec8 (patch)
tree862835320a5a9a3201a89c68a387398f78591b05
parentprofiles/arch/hppa: mask app-text/asciidoc[test] (diff)
downloadgentoo-cd9b1d7b718109ba94696dbaa90d1350aecffec8.tar.gz
gentoo-cd9b1d7b718109ba94696dbaa90d1350aecffec8.tar.bz2
gentoo-cd9b1d7b718109ba94696dbaa90d1350aecffec8.zip
net-analyzer/barnyard2: Fix library discovery using LIBDIR
Package-Manager: Portage-2.3.68, Repoman-2.3.16 Bug: https://bugs.gentoo.org/689326 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--net-analyzer/barnyard2/barnyard2-1.13.ebuild2
-rw-r--r--net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch112
2 files changed, 113 insertions, 1 deletions
diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
index 4a238eca628..5068d965c0d 100644
--- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild
+++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-
inherit autotools
DESCRIPTION="Parser for Snort unified/unified2 files"
@@ -28,6 +27,7 @@ DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*"
S="${WORKDIR}/${PN}-2-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-1.13-free.patch
+ "${FILESDIR}"/${PN}-1.13-libdir.patch
"${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch
)
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch
new file mode 100644
index 00000000000..5d3c7e37aa3
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-libdir.patch
@@ -0,0 +1,112 @@
+--- a/configure.in
++++ b/configure.in
+@@ -570,53 +570,7 @@
+ fi
+ done
+
+- for i in $mysql_lib_directory; do
+- if test -z "$MYSQL_LIB_DIR"; then
+- str="$i/libmysqlclient.*"
+- for j in `echo $str`; do
+- if test -r $j; then
+- MYSQL_LIB_DIR=$i
+- break 2
+- fi
+- done
+- fi
+- if test -z "$MYSQL_LIB_DIR"; then
+- str="$i/lib/libmysqlclient.*"
+- for j in `echo $str`; do
+- if test -r "$j"; then
+- MYSQL_LIB_DIR="$i/lib"
+- break 2
+- fi
+- done
+- fi
+- if test -z "$MYSQL_LIB_DIR"; then
+- str="$i/mysql/libmysqlclient.*"
+- for j in `echo $str`; do
+- if test -r "$j"; then
+- MYSQL_LIB_DIR="$i/mysql"
+- break 2
+- fi
+- done
+- fi
+- if test -z "$MYSQL_LIB_DIR"; then
+- str="$i/mysql/lib/libmysqlclient.*"
+- for j in `echo $str`; do
+- if test -r "$j"; then
+- MYSQL_LIB_DIR="$i/mysql/lib"
+- break 2
+- fi
+- done
+- fi
+- if test -z "$MYSQL_LIB_DIR"; then
+- str="$i/lib/mysql/libmysqlclient.*"
+- for j in `echo $str`; do
+- if test -r "$j"; then
+- MYSQL_LIB_DIR="$i/lib/mysql"
+- break 2
+- fi
+- done
+- fi
+- done
++ AC_CHECK_LIB([mysqlclient],[mysql_query],[MYSQL_LIB_DIR="$libdir"])
+
+ if test -z "$MYSQL_INC_DIR"; then
+ if test "x$mysql_fail" != "xno"; then
+@@ -760,13 +714,7 @@
+ fi
+ else
+
+- str="$ODBC_DIR/lib/libodbc.*"
+- for j in `echo $str`; do
+- if test -r "$j"; then
+- ODBC_LIB_DIR="$ODBC_DIR/lib"
+- ODBC_LIB="odbc"
+- fi
+- done
++ AC_CHECK_LIB([odbc],[SQLAllocHandle],[ODBC_LIB_DIR="$libdir";ODBC_LIB="odbc"])
+
+ dnl if test -z "$ODBC_LIB_DIR"; then
+ dnl str="$ODBC_DIR/lib/libiodbc.*"
+@@ -786,7 +734,6 @@
+ fi
+ else
+ AC_MSG_RESULT(yes)
+- LDFLAGS="${LDFLAGS} -L${ODBC_LIB_DIR}"
+ CPPFLAGS="${CPPFLAGS} -I${ODBC_INC_DIR} -DENABLE_ODBC"
+ LIBS="${LIBS} -l$ODBC_LIB"
+ fi
+@@ -863,21 +810,7 @@
+ fi
+
+
+- if test -z "$POSTGRESQL_DIR"; then
+- for dir in $postgresql_directory; do
+- for i in "lib" "lib/pgsql"; do
+- str="$dir/$i/libpq.*"
+- for j in `echo $str`; do
+- if test -r $j; then
+- POSTGRESQL_LIB_DIR="$dir/$i"
+- break 2
+- fi
+- done
+- done
+- done
+- else
+- POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib"
+- fi
++ AC_CHECK_LIB([pq],[PQexec],[POSTGRESQL_LIB_DIR="$libdir"])
+
+ if test -z "$POSTGRESQL_LIB_DIR"; then
+ if test "$postgresql_fail" != "no"; then
+@@ -892,7 +825,7 @@
+ CPPFLAGS="${CPPFLAGS} -I${POSTGRESQL_INC_DIR} -DENABLE_POSTGRESQL"
+ AC_CHECK_LIB(pq, PQexec,, PQLIB="no")
+ if test "x$PQLIB" != "xno"; then
+- LIBS="${LIBS} -lpq"
++ :
+ else
+ echo
+ echo " ERROR! libpq (postgresql) not found!"