commit: c5b00825cc9d777404947efc2986257522cea05e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jul 5 21:51:38 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jul 5 21:51:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b00825
dev-libs/libcdio-paranoia: Pass NM to build system Closes: https://bugs.gentoo.org/719064 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/libcdio-paranoia-2.0.1-pass-NM.patch | 38 ++++++++++++++++++++++ .../libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild | 3 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch new file mode 100644 index 00000000000..75cb650fc1b --- /dev/null +++ b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-2.0.1-pass-NM.patch @@ -0,0 +1,38 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -89,6 +89,9 @@ + AC_PROG_AWK + AC_SUBST(AWK) + ++AC_ARG_VAR([NM], [utility for listing symbols from object files]) ++AC_CHECK_TOOL([NM], [nm]) ++ + if test "x$GCC" != "xyes" + then + AC_MSG_WARN([ +--- a/lib/cdda_interface/Makefile.am ++++ b/lib/cdda_interface/Makefile.am +@@ -129,8 +129,8 @@ + echo 'CDIO_CDDA_$(libcdio_cdda_la_MAJOR) { ' > $@ + objs=`for obj in $(libcdio_cdda_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ + if test -n "$$objs" ; then \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_cdda.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ + fi + echo '};' >> $@ + else !BUILD_VERSIONED_LIBS +--- a/lib/paranoia/Makefile.am ++++ b/lib/paranoia/Makefile.am +@@ -142,8 +142,8 @@ + echo 'CDIO_PARANOIA_$(libcdio_paranoia_la_MAJOR) { ' > $@ + objs=`for obj in $(libcdio_paranoia_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ + if test -n "$$objs" ; then \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ +- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ ++ ${NM} $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio_paranoia.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ + fi + echo '};' >> $@ + else diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild index 07355295da2..f7d282ae17b 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild @@ -34,14 +34,13 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-2.0.1-pass-NM.patch ) DOCS=( AUTHORS ChangeLog NEWS.md README.md THANKS ) src_prepare() { default #sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410 eautoreconf - - [[ ${CC} == *clang* ]] && append-flags -std=gnu89 } multilib_src_configure() {
