Takashi Iwai
0fcb2a0c4b
- Backport upstream fixes: ucm-parser fixes and enhancements, configure script cleanup, fixes of 5.6 kernel ABI, O_CLOEXEC flag fix: 0064-ucm-parser-cosmetic-fixes-in-the-comments.patch 0065-configure.ac-remove-an-unnecessary-libtool-fix.patch 0066-ucm-parser-use-correct-filename-in-parser_master_fil.patch 0067-ucm-the-ucm2-subdirectory-is-driver-name-based.patch 0068-ucm-implement-RenameDevice-and-RemoveDevice-verb-man.patch 0069-ucm-fill-missing-device-entries-conflicting-supporte.patch 0070-control-Remove-access-to-the-deprecated-dimen-fields.patch 0071-topology-Drop-SNDRV_CTL_ELEM_ACCESS_TIMESTAMP-access.patch 0072-uapi-Sync-with-5.6-kernel-ABI.patch 0073-ucm-parser-add-error-message-to-verb_dev_list_add.patch 0074-do-not-set-close-on-exec-flag-on-descriptor-if-it-wa.patch OBS-URL: https://build.opensuse.org/request/show/774837 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=267
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From b2fe99277a73ec80eac0bd221672dd4aa02defa7 Mon Sep 17 00:00:00 2001
|
|
From: Tanu Kaskinen <tanuk@iki.fi>
|
|
Date: Fri, 20 Dec 2019 09:26:12 +0200
|
|
Subject: [PATCH 65/74] configure.ac: remove an unnecessary libtool fix
|
|
|
|
This code was added in commit 75d393a563efb578c79364a277087c6326267f52
|
|
without explaining why. I assume it was a mistake, since it looks like
|
|
the libtool problem should have gone away a long time ago. The referenced
|
|
wiki page https://wiki.debian.org/RpathIssue says:
|
|
|
|
Since libtool 1.5.2 (released 2004-01-25), on Linux libtool no
|
|
longer sets RPATH for any directories in the dynamic linker search
|
|
path, so this should no longer be an issue unless upstream used a
|
|
really old version of libtool when creating their distribution
|
|
tarball.
|
|
|
|
This code caused problems in OpenEmbedded, where the libtool script is
|
|
named "x86_64-oe-linux-libtool" or similar rather than just "libtool",
|
|
so the sed command failed with a file not found error. Rather than
|
|
adapting the code to OpenEmbedded's peculiarities, it seems best to just
|
|
remove the unnecessary code altogether.
|
|
|
|
Note: The rpath is set (hardcoded) for 'make' but it is corrected
|
|
for 'make install' by libtool.
|
|
|
|
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
configure.ac | 11 -----------
|
|
1 file changed, 11 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 886f87bc4458..fb60c03086da 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -765,14 +765,3 @@ test "$build_seq" = "yes" && echo "#include <alsa/seq.h>" >> include/asoundlib.h
|
|
test "$build_seq" = "yes" && echo "#include <alsa/seqmid.h>" >> include/asoundlib.h
|
|
test "$build_seq" = "yes" && echo "#include <alsa/seq_midi_event.h>" >> include/asoundlib.h
|
|
cat "$srcdir"/include/asoundlib-tail.h >> include/asoundlib.h
|
|
-
|
|
-dnl Taken from https://wiki.debian.org/RpathIssue
|
|
-case $host in
|
|
- *-*-linux-gnu)
|
|
- AC_MSG_RESULT([Fixing libtool for -rpath problems.])
|
|
- sed < libtool > libtool-2 \
|
|
- 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
|
|
- mv libtool-2 libtool
|
|
- chmod 755 libtool
|
|
- ;;
|
|
-esac
|
|
--
|
|
2.16.4
|
|
|