diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-multimedia/recipes-mkv/libebml | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-mkv/libebml')
3 files changed, 158 insertions, 0 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file mode 100644 index 000000000..a01c7544b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch @@ -0,0 +1,57 @@ +Use LD and obey LDFLAGS + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Upstream-Status: Pending + +diff --git a/make/linux/Makefile b/make/linux/Makefile +index 391b6e3..a2ac13e 100644 +--- a/make/linux/Makefile ++++ b/make/linux/Makefile +@@ -64,6 +64,7 @@ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) + WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow + COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) + DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) ++LINKFLAGS=$(LDFLAGS) + + ifeq (Darwin,$(shell uname -s)) + all: staticlib +@@ -91,7 +92,7 @@ $(LIBRARY): $(objects) + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) ++ $(LD) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + +diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile +index e5986ef..6ca16aa 100644 +--- a/make/mingw32/Makefile ++++ b/make/mingw32/Makefile +@@ -18,6 +18,7 @@ DEBUGFLAGS=-g -DDEBUG + endif + CROSS = + CXX = $(CROSS)g++ ++LD = $(CXX) + CC = $(CROSS)gcc + WINDRES = $(CROSS)windres + RANLIB = $(CROSS)ranlib +@@ -33,6 +34,7 @@ LIBS = libebml.a + endif + INCS = -I"$(shell pwd)/../.." + COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(DLLFLAGS) $(CXXFLAGS) ++LINKFLAGS = $(LDFLAGS) + + .PHONY: all all-before all-after clean clean-custom + +@@ -54,7 +56,7 @@ libebml.a: $(OBJ) + $(RANLIB) $@ + + libebml.dll: $(OBJ) +- $(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) ++ $(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) + + depend: + @echo Calculating dependecies: +-- +2.8.0 diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file mode 100644 index 000000000..57eb3450d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch @@ -0,0 +1,42 @@ +Allow override of the 'uname -s' for cross-compilation + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Upstream-Status: Pending + +diff --git a/make/linux/Makefile b/make/linux/Makefile +index a2ac13e..4188bee 100644 +--- a/make/linux/Makefile ++++ b/make/linux/Makefile +@@ -9,9 +9,11 @@ + # 'make DEBUG=yes'. + # + ++TARGET_OS ?= $(shell uname -s) ++ + # Paths + # BeOS wants the libs and headers in /boot/home/config +-ifeq (BeOS,$(shell uname -s)) ++ifeq (BeOS,$(TARGET_OS)) + prefix=/boot/home/config + else + prefix=/usr/local +@@ -66,7 +68,7 @@ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) + DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) + LINKFLAGS=$(LDFLAGS) + +-ifeq (Darwin,$(shell uname -s)) ++ifeq (Darwin,$(TARGET_OS)) + all: staticlib + else + all: staticlib sharedlib +@@ -116,7 +118,7 @@ depend: + $(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \ + done + +-ifeq (Darwin,$(shell uname -s)) ++ifeq (Darwin,$(TARGET_OS)) + install: install_staticlib install_headers + else + install: install_staticlib install_sharedlib install_headers +-- +2.8.0 diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb new file mode 100644 index 000000000..16e17e9ab --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb @@ -0,0 +1,59 @@ +SUMMARY = "libebml is a C++ libary to parse EBML files" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "\ + http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2 \ + file://ldflags.patch \ + file://override-uname.patch \ +" +SRC_URI[md5sum] = "efec729bf5a51e649e1d9d1f61c0ae7a" +SRC_URI[sha256sum] = "83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" + +inherit dos2unix + +LIBEBML_OS = "Unknown" +LIBEBML_OS_linux = "Linux" +LIBEBML_OS_darwin = "Darwin" +LIBEBML_OS_mingw32 = "Windows" + +EXTRA_OEMAKE = "\ + 'TARGET_OS=${LIBEBML_OS}' \ + \ + 'CXX=${CXX}' \ + 'LD=${CXX}' \ + 'AR=${AR}' \ + 'RANLIB=${RANLIB}' \ + \ + 'DEBUGFLAGS=' \ + 'CPPFLAGS=${CPPFLAGS}' \ + 'CXXFLAGS=${CXXFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ + \ + 'prefix=${prefix}' \ + 'libdir=${libdir}' \ + 'includedir=${includedir}/ebml' \ +" + +do_compile () { + oe_runmake -C make/linux +} + +do_install() { + cd ${S}/make/linux + + install -d ${D}${libdir} + install -m 0644 libebml.a ${D}${libdir} + install -m 0755 libebml.so.* ${D}${libdir} + cp -R --no-dereference --preserve=mode,links -v libebml.so ${D}${libdir} + + install -d ${D}${includedir}/ebml + for i in ../../ebml/*.h; do + install -m 0644 $i ${D}${includedir}/ebml + done + + install -d ${D}${includedir}/ebml/c + for i in ../../ebml/c/*.h; do + install -m 0644 $i ${D}${includedir}/ebml/c + done +} |