summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2021-04-07 20:54:15 +0200
committerJoerg Bornkessel <hd_brummy@gentoo.org>2021-04-07 20:54:15 +0200
commit55fa32bae26c4de869becc09d8a866f0b605e9ac (patch)
treeafe805a4d2071dd714ce9823d78908d0dbf3829c
parentdev-libs/mxml: fix compilation with slibtool (diff)
downloadgentoo-55fa32bae26c4de869becc09d8a866f0b605e9ac.tar.gz
gentoo-55fa32bae26c4de869becc09d8a866f0b605e9ac.tar.bz2
gentoo-55fa32bae26c4de869becc09d8a866f0b605e9ac.zip
media-plugins/vdr-xineliboutput: call cc/gcc directly fixed
Closes: https://bugs.gentoo.org/780462 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
-rw-r--r--media-plugins/vdr-xineliboutput/Manifest2
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch33
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild (renamed from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild)7
3 files changed, 38 insertions, 4 deletions
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 5e739095809..c2fec1236e8 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,2 +1,2 @@
DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
-DIST vdr-xineliboutput-2.2.0_c++11.patch.bz2 7609 BLAKE2B fe3b9f8d8fb1425e11e068a410844c2ad4f7afa60ad815ee0918a9ce2fa16e450b418358f7688047a5d5b185bb783890a31cfa174d7dc4b29deb9d96f9295fbd SHA512 8323b73b082ef61fe74ef1110e991c8f8acfcf22ac8ddd9f06cd5f8cba6d0087a5500658e20402b8b590a1bb4f10ad7bf712be12a11c447f943aafa4a32413e3
+DIST vdr-xineliboutput-2.2.0_clang.patch.bz2 7405 BLAKE2B 80d4a0ca3673f61cd14538c2fbdc03017f8c993a55b4c3de0349c799b7239052bc452fbd78689e9ccace2e865b4d08ec69365ed9ad6900e08205676135dac3b9 SHA512 c02cc9a6ee8c9b3458dec6439ea4fa85421f3ac01828e65b123d13db689a75cbba5622a7e1fd76066a19a714c2debdb08f4c78139573a4563aefab19107a5512
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
new file mode 100644
index 00000000000..ac7cf5007ce
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
@@ -0,0 +1,33 @@
+get rid off call cc gcc directly
+disabled apple darwin check
+we are on gentoo!!!
+https://bugs.gentoo.org/show_bug.cgi?id=780462
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2021/April/07 )
+diff -Naur xineliboutput-2.2.0.orig/Makefile xineliboutput-2.2.0/Makefile
+--- xineliboutput-2.2.0.orig/Makefile 2021-04-07 20:28:54.667000000 +0200
++++ xineliboutput-2.2.0/Makefile 2021-04-07 20:29:31.558000000 +0200
+@@ -19,9 +19,9 @@
+
+ # check for Apple Darwin
+ ARCH_APPLE_DARWIN = no
+-ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
+- ARCH_APPLE_DARWIN = yes
+-endif
++#ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
++# ARCH_APPLE_DARWIN = yes
++#endif
+
+ #
+ # Override configuration here or in ../../../Make.config
+@@ -43,8 +43,8 @@
+ ### The C++ compiler and options:
+ ###
+
+-CXX ?= g++
+-CC ?= gcc
++#CXX ?= g++
++#CC ?= gcc
+ OPTFLAGS ?=
+
+ ifeq ($(ARCH_APPLE_DARWIN), yes)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index beec586bcb2..b9d615c9322 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r3.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -10,7 +10,7 @@ GENTOO_VDR_CONDITIONAL=yes
DESCRIPTION="VDR Plugin: Xinelib PlugIn"
HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
- http://vdr.websitec.de/download/${PN}/${P}_c++11.patch.bz2"
+ http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
SLOT="0"
LICENSE="GPL-2+"
@@ -73,8 +73,9 @@ src_prepare() {
# bug 711978
sed -e "s:X11 opengl:X11 OpenGl:" -i configure || die
- # bug 771036, fix compile llvm/clang
- eapply "${WORKDIR}/${P}_c++11.patch"
+ # bug 771036,780462 do not call cc directly
+ eapply "${FILESDIR}/${P}_no-gcc.patch"
+ eapply "${WORKDIR}/${P}_clang.patch"
}
src_configure() {