1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
http://trac.xbmc.org/ticket/11383
http://bugs.gentoo.org/367261
From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 30 Mar 2011 14:57:28 +0200
Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++++---------
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
index a7ef1a0..308664a 100644
--- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
@@ -148,32 +148,32 @@ liba52:
else
$(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
ifneq ($(ARCH), arm)
$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
else # No ARM version of swscale available yet.
$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libswscale/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
$(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
ffmpeg/libavutil/libavutil.so : ffmpeg;
@@ -185,17 +185,17 @@ ffmpeg:
$(MAKE) -C $@
$(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
libdts/libdts/bitstream.o \
libdts/libdts/downmix.o libdts/libdts/parse.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
libdts/libdts/libdts.a : libdts;
diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
index 3c487e9..6d4abd4 100644
--- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
+++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
--
1.7.0.2
|
