contrib: matroska needs PIC on Linux even for staticlib

diff --git a/contrib/src/matroska/matroska-pic.patch b/contrib/src/matroska/matroska-pic.patch
new file mode 100644 (file)
index 0000000..a573d79
--- /dev/null
+++ b/contrib/src/matroska/matroska-pic.patch
@@ -0,0 +1,22 @@
+diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile
+--- libmatroska.orig/make/linux/Makefile       2011-06-15 15:00:37.000000000 +0300
++++ libmatroska/make/linux/Makefile    2011-08-03 13:33:25.000000000 +0300
+@@ -65,7 +65,7 @@
+ # object files; replace .cxx extension with .o\r
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
+ \r
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r
++objects_so:=$(objects)\r
+ \r
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \\r
+               -Wshadow\r
+@@ -89,9 +89,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/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 8bbeab7f81813e2d5587c0e29792c1afb2b7c90f..9d1def175e7ca50583d11a4bc8b0e24c77bd84d3 100644 (file)
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -14,6 +14,7 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
        $(UNPACK)
+       $(APPLY) $(SRC)/matroska/matroska-pic.patch
        $(MOVE)
 
 .matroska: libmatroska