1 --- mplayer-r29930/configure~ 2009-11-18 23:39:45.454305454 +0100
2 +++ mplayer-r29930/configure 2009-11-18 23:57:29.464192117 +0100
5 Use these options if autodetection fails:
6 --extra-cflags=FLAGS extra CFLAGS
7 - --extra-ldflags=FLAGS extra LDFLAGS
8 + --real-ldflags=FLAGS LDFLAGS
9 + --extra-ldflags=FLAGS extra LIBS !
10 --extra-libs=FLAGS extra linker flags
11 --extra-libs-mplayer=FLAGS extra linker flags for MPlayer
12 --extra-libs-mencoder=FLAGS extra linker flags for MEncoder
15 extra_cflags=$(echo $ac_option | cut -d '=' -f 2-)
18 + real_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
21 extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
24 int main(void) { return 0; }
26 if cc_check -Wl,-z,noexecstack ; then
27 - extra_ldflags="-Wl,-z,noexecstack $extra_ldflags"
28 + real_ldflags="-Wl,-z,noexecstack $real_ldflags"
33 CFLAGS_TREMOR_LOW = $cflags_tremor_low
34 YASMFLAGS = $YASMFLAGS
36 +LDFLAGS = $real_ldflags
37 EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
38 EXTRALIBS_MPLAYER = $libs_mplayer
39 EXTRALIBS_MENCODER = $libs_mencoder
40 --- mplayer-r29930/Makefile~ 2009-11-17 23:59:50.000000000 +0100
41 +++ mplayer-r29930/Makefile 2009-11-19 00:07:17.952054067 +0100
43 mplayer$(EXESUF): $(MPLAYER_DEPS)
44 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
45 mencoder$(EXESUF) mplayer$(EXESUF):
46 - $(CC) -o $@ $^ $(EXTRALIBS)
47 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
49 codec-cfg$(EXESUF): codec-cfg.c help_mp.h
50 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
52 TOOLS/netstream$(EXESUF): TOOLS/netstream.c
53 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
54 TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
55 - $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
56 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
58 REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
59 REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)