summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-05-11 13:49:32 -0400
committerMike Frysinger <vapier@gentoo.org>2016-05-11 13:52:57 -0400
commitc88cfc982e83bc7eec4bf37babc1ff2dfce2a79d (patch)
treef87a18dc3b5d0b676180abd3a947ea0f1f00e87b /net-fs/netatalk
parentnet-news/quiterss: version bump; drop USE=qt4 as per Qt team policy (diff)
downloadgentoo-c88cfc982e83bc7eec4bf37babc1ff2dfce2a79d.tar.gz
gentoo-c88cfc982e83bc7eec4bf37babc1ff2dfce2a79d.tar.bz2
gentoo-c88cfc982e83bc7eec4bf37babc1ff2dfce2a79d.zip
net-fs/netatalk: fix crashes w/newer binutils #564350
Diffstat (limited to 'net-fs/netatalk')
-rw-r--r--net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch34
-rw-r--r--net-fs/netatalk/netatalk-3.1.8.ebuild1
2 files changed, 35 insertions, 0 deletions
diff --git a/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch b/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch
new file mode 100644
index 00000000000..0335366b23b
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch
@@ -0,0 +1,34 @@
+there's no need to set LD_LIBRARY_PATH in order to perform link tests, and
+it's actually undesirable as it'll cause the toolchain to search a different
+path than the ones it's configured to (host lib wise).
+
+https://bugs.gentoo.org/564350
+
+--- a/macros/db3-check.m4
++++ b/macros/db3-check.m4
+@@ -142,15 +142,7 @@ if test "x$bdb_required" = "xyes"; then
+ CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
+ LDFLAGS="-L$bdblibdir $LDFLAGS"
+
+- dnl -- Uses version set by NETATALK_BDB_HEADER to try to run
+- dnl -- a conftest that checks that header/lib version match
+- dnl -- $shlibpath_var is set by LIBTOOL, its value is
+- dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly
+- dnl -- portable hopefully. Reference:
+- dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html
+- eval export $shlibpath_var=$bdblibdir
+ NETATALK_BDB_TRY_LINK
+- eval export $shlibpath_var=$saved_shlibpath_var
+
+ if test x"${atalk_cv_bdb_version}" = x"yes"; then
+ BDB_CFLAGS="-I${bdbdir}/include${subdir}"
+@@ -174,9 +166,7 @@ if test "x$bdb_required" = "xyes"; then
+ CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS"
+ LDFLAGS="-L$bdblibdir $LDFLAGS"
+
+- eval export $shlibpath_var=$bdblibdir
+ NETATALK_BDB_TRY_LINK
+- eval export $shlibpath_var=$saved_shlibpath_var
+
+ if test x"${atalk_cv_bdb_version}" = x"yes"; then
+ BDB_CFLAGS="-I${bdbdir}/include${subdir}"
diff --git a/net-fs/netatalk/netatalk-3.1.8.ebuild b/net-fs/netatalk/netatalk-3.1.8.ebuild
index b99120c5cdf..41d2c5e8401 100644
--- a/net-fs/netatalk/netatalk-3.1.8.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.8.ebuild
@@ -58,6 +58,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
+ "${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
)
src_prepare() {