Skip to content

Commit

Permalink
media-plugins/vdr-streamdev: fix Makefiles calling ar directly
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/854885
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Closes: #26174
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
  • Loading branch information
madmartin authored and juippis committed Jul 5, 2022
1 parent 271c58c commit 78c22f5
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 1 deletion.
@@ -0,0 +1,36 @@
diff -Naur vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile
--- vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile 2022-01-22 17:07:53.000000000 +0100
+++ vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile 2022-06-30 23:15:50.274114529 +0200
@@ -15,7 +15,7 @@

.PHONY: clean
libdvbmpegtools.a: $(OBJS)
- ar -rcs libdvbmpegtools.a $(OBJS)
+ $(AR) -rcs libdvbmpegtools.a $(OBJS)

### Implicit rules:

diff -Naur vdr-plugin-streamdev-0.6.3.orig/remux/Makefile vdr-plugin-streamdev-0.6.3/remux/Makefile
--- vdr-plugin-streamdev-0.6.3.orig/remux/Makefile 2022-01-22 17:07:53.000000000 +0100
+++ vdr-plugin-streamdev-0.6.3/remux/Makefile 2022-06-30 23:15:18.845454583 +0200
@@ -11,7 +11,7 @@

.PHONY: clean
remux.a: $(OBJS)
- ar -rcs remux.a $^
+ $(AR) -rcs remux.a $^

### Implicit rules:

diff -Naur vdr-plugin-streamdev-0.6.3.orig/tools/Makefile vdr-plugin-streamdev-0.6.3/tools/Makefile
--- vdr-plugin-streamdev-0.6.3.orig/tools/Makefile 2022-01-22 17:07:53.000000000 +0100
+++ vdr-plugin-streamdev-0.6.3/tools/Makefile 2022-06-30 23:16:14.494623068 +0200
@@ -11,7 +11,7 @@

.PHONY: clean
sockettools.a: $(OBJS)
- ar -rcs sockettools.a $(OBJS)
+ $(AR) -rcs sockettools.a $(OBJS)

### Implicit rules:

7 changes: 6 additions & 1 deletion media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
Expand Up @@ -3,7 +3,7 @@

EAPI=8

inherit vdr-plugin-2
inherit toolchain-funcs vdr-plugin-2

DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-streamdev"
Expand All @@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
QA_FLAGS_IGNORED="
usr/lib/vdr/plugins/libvdr-streamdev-.*
usr/lib64/vdr/plugins/libvdr-streamdev-.*"
PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )

# vdr-plugin-2.eclass changes
PO_SUBDIR="client server"
Expand Down Expand Up @@ -51,6 +52,10 @@ src_prepare() {
fix_vdr_libsi_include server/livestreamer.c
}

src_compile() {
emake AR="$(tc-getAR)"
}

src_install() {
vdr-plugin-2_src_install

Expand Down

0 comments on commit 78c22f5

Please sign in to comment.