diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-03-19 22:31:42 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2017-08-04 20:39:48 -0700 |
| commit | 0730f3f420c8b36a77d1c3aa0768ea64d9559e33 (patch) | |
| tree | 6d1309793a5c45f17808d90bde6c09005dc0a845 | |
| parent | 709b2adfa9a6e52f0317397a0160811255e49c9d (diff) | |
| download | meta-openembedded-contrib-0730f3f420c8b36a77d1c3aa0768ea64d9559e33.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>
(cherry picked from commit e961adf6cb5db90d4220412fa5a91eb9146909a0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -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 0000000000..90e997561a --- /dev/null +++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch @@ -0,0 +1,28 @@ +From f0c879097c331d1dabe6ee92b583a8badb62ea6d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Mar 2017 08:26:35 -0700 +Subject: [PATCH] Makefile: Use LINKFLAGS during link step + +Adds much needed GNU_HASH section into the .so + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + make/linux/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/make/linux/Makefile b/make/linux/Makefile +index 3ca7b0f..b5c9645 100644 +--- a/make/linux/Makefile ++++ b/make/linux/Makefile +@@ -104,7 +104,7 @@ $(LIBRARY): $(objects) + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml ++ $(CXX) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + +-- +2.12.0 + 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 1ad87cba79..fdffa41ec5 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" DEPENDS = "libebml" -SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0001-Makefile-Use-LINKFLAGS-during-link-step.patch \ + " SRC_URI[md5sum] = "f61b2e5086f4bb9d24a43cc8af43a719" SRC_URI[sha256sum] = "086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" |