diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-03-19 22:31:42 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-31 13:25:57 +0200 |
commit | e961adf6cb5db90d4220412fa5a91eb9146909a0 (patch) | |
tree | f1a4eeaa418ed5f457f25dc4790716ee90baf249 /meta-multimedia | |
parent | 2e3645ea471c95f75aec2fd044950926e008959c (diff) | |
download | meta-openembedded-e961adf6cb5db90d4220412fa5a91eb9146909a0.tar.gz |
libmatroska: Fix missing GNU_HASH errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch | 28 | ||||
-rw-r--r-- | meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb | 4 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch new file mode 100644 index 000000000..90e997561 --- /dev/null +++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From f0c879097c331d1dabe6ee92b583a8badb62ea6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 18 Mar 2017 08:26:35 -0700 | ||
4 | Subject: [PATCH] Makefile: Use LINKFLAGS during link step | ||
5 | |||
6 | Adds much needed GNU_HASH section into the .so | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | make/linux/Makefile | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/make/linux/Makefile b/make/linux/Makefile | ||
14 | index 3ca7b0f..b5c9645 100644 | ||
15 | --- a/make/linux/Makefile | ||
16 | +++ b/make/linux/Makefile | ||
17 | @@ -104,7 +104,7 @@ $(LIBRARY): $(objects) | ||
18 | $(RANLIB) $@ | ||
19 | |||
20 | $(LIBRARY_SO): $(objects_so) | ||
21 | - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml | ||
22 | + $(CXX) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml | ||
23 | rm -f $(LIBRARY_SO) | ||
24 | ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) | ||
25 | |||
26 | -- | ||
27 | 2.12.0 | ||
28 | |||
diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb index 1ad87cba7..fdffa41ec 100644 --- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb +++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb | |||
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" | |||
4 | 4 | ||
5 | DEPENDS = "libebml" | 5 | DEPENDS = "libebml" |
6 | 6 | ||
7 | SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" | 7 | SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ |
8 | file://0001-Makefile-Use-LINKFLAGS-during-link-step.patch \ | ||
9 | " | ||
8 | SRC_URI[md5sum] = "f61b2e5086f4bb9d24a43cc8af43a719" | 10 | SRC_URI[md5sum] = "f61b2e5086f4bb9d24a43cc8af43a719" |
9 | SRC_URI[sha256sum] = "086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" | 11 | SRC_URI[sha256sum] = "086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" |
10 | 12 | ||