summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dummer <martin.dummer@gmx.net>2022-06-30 23:29:49 +0200
committerJoonas Niilola <juippis@gentoo.org>2022-07-05 12:47:13 +0300
commit78c22f568a3feaa88baa273e19c5e0c65c235d9f (patch)
treea8c2c45762a357cbf2f20abeac13ae9282092cbe /media-plugins/vdr-streamdev
parentdev-db/sqlcl-bin: removed old (diff)
downloadgentoo-78c22f568a3feaa88baa273e19c5e0c65c235d9f.tar.gz
gentoo-78c22f568a3feaa88baa273e19c5e0c65c235d9f.tar.bz2
gentoo-78c22f568a3feaa88baa273e19c5e0c65c235d9f.zip
media-plugins/vdr-streamdev: fix Makefiles calling ar directly
Closes: https://bugs.gentoo.org/854885 Signed-off-by: Martin Dummer <martin.dummer@gmx.net> Closes: https://github.com/gentoo/gentoo/pull/26174 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-plugins/vdr-streamdev')
-rw-r--r--media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch36
-rw-r--r--media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild7
2 files changed, 42 insertions, 1 deletions
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch
new file mode 100644
index 000000000000..282108476c7b
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch
@@ -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:
+
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
index 3565a40465d6..02b5e7e2ae29 100644
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
@@ -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"
@@ -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"
@@ -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