diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2021-04-28 22:25:45 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2021-04-28 22:25:55 +0100 |
| commit | 8af307971f9af69a21d9a423650a5db5b9857ed2 (patch) | |
| tree | a09ca20b68a5238400e0b022d783be6d10a45d14 /net-ftp/proftpd | |
| parent | sys-apps/iproute2: Stabilize 5.10.0-r1 arm, #786390 (diff) | |
| download | gentoo-8af307971f9af69a21d9a423650a5db5b9857ed2.tar.gz gentoo-8af307971f9af69a21d9a423650a5db5b9857ed2.tar.bz2 gentoo-8af307971f9af69a21d9a423650a5db5b9857ed2.zip | |
net-ftp/proftpd: backport upstream slibtool workaround
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/778332
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'net-ftp/proftpd')
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch | 34 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch new file mode 100644 index 000000000000..35676777da05 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/778332 +https://github.com/proftpd/proftpd/commit/4ffe04158840130e023ed3d3e558b8d70e28e20e + +From 2a15ce409f70c67ba9b1e09de67c3fca0b38eff8 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sun, 21 Mar 2021 12:38:52 -0700 +Subject: [PATCH] build: Fix linking the static libsupp.a library. + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.in ++++ b/configure.in +@@ -88,7 +88,7 @@ if test $ac_cv_prog_gcc = no -a "$OSTYPE" = "-DHPUX10"; then + CFLAGS="$CFLAGS -Ae" + fi + +-LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS" ++LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS" + + # AIX has issues with the -rdynamic linker flag. How many different AIX + # versions should we support here? +--- a/configure ++++ b/configure +@@ -14932,7 +14944,7 @@ if test $ac_cv_c_compiler_gnu = no -a "$OSTYPE" = "-DHPUX10"; then + CFLAGS="$CFLAGS -Ae" + fi + +-LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS" ++LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS" + + # AIX has issues with the -rdynamic linker flag. How many different AIX + # versions should we support here? diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild index 249498784d2c..7bef13f65e49 100644 --- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild @@ -72,6 +72,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.6-use-trace.patch "${FILESDIR}"/${P}-tinfow-segv.patch "${FILESDIR}"/${P}-no-ncurses.patch + "${FILESDIR}"/${P}-slibtool.patch ) RESTRICT=test # Some tests are ran in chroot. Confuse sandbox. |