| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 01cd8cb6d594d7a12c67d21d689ebe0e347469c0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tanu Kaskinen <tanuk@iki.fi> |
| 3 | Date: Fri, 20 Dec 2019 09:26:12 +0200 |
| 4 | Subject: [PATCH] configure.ac: remove an unnecessary libtool fix |
| 5 | |
| 6 | This code was added in commit 75d393a563efb578c79364a277087c6326267f52 |
| 7 | without explaining why. I assume it was a mistake, since it looks like |
| 8 | the libtool problem should have gone away a long time ago. The referenced |
| 9 | wiki page https://wiki.debian.org/RpathIssue says: |
| 10 | |
| 11 | Since libtool 1.5.2 (released 2004-01-25), on Linux libtool no |
| 12 | longer sets RPATH for any directories in the dynamic linker search |
| 13 | path, so this should no longer be an issue unless upstream used a |
| 14 | really old version of libtool when creating their distribution |
| 15 | tarball. |
| 16 | |
| 17 | This code caused problems in OpenEmbedded, where the libtool script is |
| 18 | named "x86_64-oe-linux-libtool" or similar rather than just "libtool", |
| 19 | so the sed command failed with a file not found error. Rather than |
| 20 | adapting the code to OpenEmbedded's peculiarities, it seems best to just |
| 21 | remove the unnecessary code altogether. |
| 22 | |
| 23 | Upstream-Status: Submitted [https://github.com/alsa-project/alsa-lib/pull/19] |
| 24 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> |
| 25 | --- |
| 26 | configure.ac | 11 ----------- |
| 27 | 1 file changed, 11 deletions(-) |
| 28 | |
| 29 | diff --git a/configure.ac b/configure.ac |
| 30 | index 119ef600..22a4a885 100644 |
| 31 | --- a/configure.ac |
| 32 | +++ b/configure.ac |
| 33 | @@ -764,14 +764,3 @@ test "$build_seq" = "yes" && echo "#include <alsa/seq.h>" >> include/asoundlib.h |
| 34 | test "$build_seq" = "yes" && echo "#include <alsa/seqmid.h>" >> include/asoundlib.h |
| 35 | test "$build_seq" = "yes" && echo "#include <alsa/seq_midi_event.h>" >> include/asoundlib.h |
| 36 | cat "$srcdir"/include/asoundlib-tail.h >> include/asoundlib.h |
| 37 | - |
| 38 | -dnl Taken from https://wiki.debian.org/RpathIssue |
| 39 | -case $host in |
| 40 | - *-*-linux-gnu) |
| 41 | - AC_MSG_RESULT([Fixing libtool for -rpath problems.]) |
| 42 | - sed < libtool > libtool-2 \ |
| 43 | - 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' |
| 44 | - mv libtool-2 libtool |
| 45 | - chmod 755 libtool |
| 46 | - ;; |
| 47 | -esac |
| 48 | -- |
| 49 | 2.20.1 |
| 50 | |