commit: 63385fa5058e0dd87eedf325ab329ba7a939ebaa Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Jul 7 12:36:45 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Jul 7 12:36:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63385fa5
media-video/makemkv: Respect LDFLAGS when building mmgplsrv Closes: https://bugs.gentoo.org/856772 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-video/makemkv/files/makemkv-flags.patch | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch index d7a2f1be16c5..0f05aa7a751b 100644 --- a/media-video/makemkv/files/makemkv-flags.patch +++ b/media-video/makemkv/files/makemkv-flags.patch @@ -1,11 +1,17 @@ ---- a/Makefile.in 2021-03-19 13:06:50.000000000 +0000 -+++ b/Makefile.in 2021-03-30 23:28:42.720480399 +0100 -@@ -112,7 +112,7 @@ - +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 2022-06-26 20:14:12.000000000 +0100 ++++ b/Makefile.in 2022-07-07 13:28:27.481730073 +0100 +@@ -113,12 +113,12 @@ + out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h mkdir -p out - $(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ + $(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \ -ffunction-sections -Wl,--gc-sections -Wl,-z,defs - - tmp/gen_buildinfo.h: + + out/mmgplsrv.full: $(MMGPL_SRC) + mkdir -p out +- $(GCC) $(CFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \ ++ $(GCC) $(CFLAGS) $(LDFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \ + $(INCF)$(LIBDRIVEIO_INC) $(INCF)$(LIBABI_INC) $(MMGPL_DEF) -D_GNU_SOURCE -Dstl=std -o$@ $(MMGPL_SRC) $(MMGPL_SRC_LINUX) -lc -lstdc++ \ + -ffunction-sections -Wl,--gc-sections -Wl,-z,defs
