vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Aug 3 13:41:26 2011 +0300| [47645e9eee02a5a1024bec603df098d2ee969ae9] | committer: Rémi Denis-Courmont
contrib: always build ebml as PIC on Linux > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47645e9eee02a5a1024bec603df098d2ee969ae9 --- contrib/src/ebml/ebml-pic.patch | 22 ++++++++++++++++++++++ contrib/src/ebml/rules.mak | 1 + 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/contrib/src/ebml/ebml-pic.patch b/contrib/src/ebml/ebml-pic.patch new file mode 100644 index 0000000..c9511b1 --- /dev/null +++ b/contrib/src/ebml/ebml-pic.patch @@ -0,0 +1,22 @@ +diff -ru libebml.orig/make/linux/Makefile libebml/make/linux/Makefile +--- libebml.orig/make/linux/Makefile 2011-08-03 13:39:21.000000000 +0300 ++++ libebml/make/linux/Makefile 2011-08-03 13:39:57.000000000 +0300 +@@ -59,7 +59,7 @@ + + # object files; replace .cxx extension with .o + objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) +-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) ++objects_so:=$(objects) + + WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow + COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) +@@ -81,9 +81,6 @@ + + # Build rules + %.o: %$(EXTENSION) +- $(CXX) -c $(COMPILEFLAGS) -o $@ $< +- +-%.lo: %$(EXTENSION) + $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< + + $(LIBRARY): $(objects) diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index b7f7c6f..f8cc61b 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -11,6 +11,7 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2: libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml $(UNPACK) + $(APPLY) $(SRC)/ebml/ebml-pic.patch $(MOVE) .ebml: libebml _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
