contrib: always build ebml as PIC on Linux

diff --git a/contrib/src/ebml/ebml-pic.patch b/contrib/src/ebml/ebml-pic.patch
new file mode 100644 (file)
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 @@
+ \r
+ # object files; replace .cxx extension with .o\r
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r
++objects_so:=$(objects)\r
+ \r
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow\r
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)\r
+@@ -81,9 +81,6 @@
+ \r
+ # Build rules\r
+ %.o: %$(EXTENSION)\r
+-      $(CXX) -c $(COMPILEFLAGS) -o $@ $<\r
+-\r
+-%.lo: %$(EXTENSION)\r
+       $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<\r
+ \r
+ $(LIBRARY): $(objects)\r

diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index b7f7c6f08398f2885e01a6fcd59c4fff5d5be7bf..f8cc61b2cfb16243966c46525875f3a8f6d9aafc 100644 (file)
--- 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