Skip to contentSkip to conversation

libebml: don't rely on make -e, obey LDFLAGS

PATCH In review Christopher Larson 3 participants 3 messages Jun 17, 2016 – Jul 27, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libebml: don't rely on make -e, obey LDFLAGS

From: Christopher Larson <[email protected]>

We need to obey LDFLAGS to get the correct hash style for external toolchains, and passing vars explicitly is better than relying on implicitly overriding everything blindly from the environment.

---
 .../recipes-mkv/libebml/libebml/ldflags.patch      | 57 ++++++++++++++++++++++
 .../libebml/libebml/override-uname.patch           | 42 ++++++++++++++++
 .../recipes-mkv/libebml/libebml_1.3.0.bb           | 44 +++++++++++++++--
 3 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644 meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch
 create mode 100644 meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +57 -0
new file mode 100644
index 0000000..a01c754
@@ -0,0 +1,57 @@
+Use LD and obey LDFLAGS
+
+Signed-off-by: Christopher Larson <[email protected]>
+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,[email protected] -o $@ $(OBJ)
++	$(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,[email protected] -o $@ $(OBJ)
+
+ depend:
+	@echo Calculating dependecies:
+--
+2.8.0
meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file +42 -0

42 lines not on this page · raw message

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +39 -5

54 lines not on this page · raw message

Signature · 1 line
2.8.0
#1 lore raw
Quoted 146 lines · Christopher Larson

From: Christopher Larson <[email protected]>

We need to obey LDFLAGS to get the correct hash style for external toolchains, and passing vars explicitly is better than relying on implicitly overriding everything blindly from the environment.

---
 .../recipes-mkv/libebml/libebml/ldflags.patch      | 57 ++++++++++++++++++++++
 .../libebml/libebml/override-uname.patch           | 42 ++++++++++++++++
 .../recipes-mkv/libebml/libebml_1.3.0.bb           | 44 +++++++++++++++--
 3 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644 meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch
 create mode 100644 meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +57 -0
new file mode 100644
index 0000000..a01c754
@@ -0,0 +1,57 @@
+Use LD and obey LDFLAGS
+
+Signed-off-by: Christopher Larson <[email protected]>
+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,[email protected] -o $@ $(OBJ)
++	$(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,[email protected] -o $@ $(OBJ)
+
+ depend:
+	@echo Calculating dependecies:
+--
+2.8.0
meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file +42 -0
new file mode 100644
index 0000000..57eb345
@@ -0,0 +1,42 @@
+Allow override of the 'uname -s' for cross-compilation
+
+Signed-off-by: Christopher Larson <[email protected]>
+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
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +6 -2
index 71e2bfc..b756a39 100644
@@ -2,15 +2,49 @@ SUMMARY = "libebml is a C++ libary to parse EBML files"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=f14599a2f089f6ff8c97e2baa4e3d575"
 
-SRC_URI = "http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2"
+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"
 
-EXTRA_OEMAKE = "-e MAKEFLAGS="
+do_unpack[postfuncs] += "dos2unix"
 

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb SUMMARY = "libebml is a C++ libary to parse EBML files" · line 21

Quoted 10 lines
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +7 -3
-do_compile() {
-    cd ${S}/make/linux
-    oe_runmake CROSS="${TARGET_PREFIX}"
+dos2unix () {
+    cr="$(printf '\r')"
+    for f in make/*/Makefile; do
+        tr -d "$cr" <"$f" >"$f.new" && \
+            mv "$f.new" "$f"
+    done
+}

This doesn't seem to work now:

| NOTE: Unpacking /home/jenkins/oe/world/shr-core/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch to /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/
| DEBUG: Python function base_do_unpack finished
| DEBUG: Python function do_unpack finished
| DEBUG: Executing python function do_qa_unpack
| NOTE: Checking has ${S} been created
| DEBUG: Python function do_qa_unpack finished
| DEBUG: Executing shell function dos2unix
| /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/temp/run.dos2unix.30265: 104: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/temp/run.dos2unix.30265: cannot open make/*/Makefile: No such file
| WARNING: exit code 2 from a shell command.
| ERROR: Function failed: dos2unix (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/temp/log.do_unpack.30265)

NOTE: recipe libebml-1.3.0-r0: task do_unpack: Failed

Quoted 37 lines
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +26 -0
+
+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() {
Signature · 7 lines
2.8.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 190 lines · Martin Jansa
Quoted 3 lines · Christopher Larson

From: Christopher Larson <[email protected]>

We need to obey LDFLAGS to get the correct hash style for external

toolchains,

Quoted 1 line

and passing vars explicitly is better than relying on implicitly

overriding

Quoted 5 lines

everything blindly from the environment.

---
 .../recipes-mkv/libebml/libebml/ldflags.patch      | 57

++++++++++++++++++++++

Quoted 2 lines
 .../libebml/libebml/override-uname.patch           | 42 ++++++++++++++++
 .../recipes-mkv/libebml/libebml_1.3.0.bb           | 44

+++++++++++++++--

Quoted 2 lines
 3 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch

Quoted 1 line
 create mode 100644

meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch

Quoted 6 lines

new file mode 100644
index 0000000..a01c754

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +1 -0
@@ -0,0 +1,57 @@
+Use LD and obey LDFLAGS

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch line 11

Quoted 10 lines
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +10 -0
+
+Signed-off-by: Christopher Larson <[email protected]>
+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

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch line 12

Quoted 1 line
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +1 -0
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS)

$(INCLUDE)

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch

Quoted 10 lines
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +10 -0
+ 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)

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch line 23

Quoted 1 line
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +1 -0
++    $(LD) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o

$(LIBRARY_SO_VER) $(objects_so)

Quoted 19 lines
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +19 -0
+     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)

meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch

Quoted 10 lines
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +10 -0
++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,[email protected] -o $@ $(OBJ)
++    $(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,[email protected]

-o $@ $(OBJ)

Quoted 6 lines
meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file +5 -0
+
+ depend:
+     @echo Calculating dependecies:
+--
+2.8.0

diff --git

a/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch b/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch

Quoted 18 lines

new file mode 100644
index 0000000..57eb345

meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file +13 -0
@@ -0,0 +1,42 @@
+Allow override of the 'uname -s' for cross-compilation
+
+Signed-off-by: Christopher Larson <[email protected]>
+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'.
+ #
+

meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch line 23

Quoted 10 lines
meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file +10 -0
++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)

Review

Quoted 20 lines
meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file +19 -0
+ 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
(quoted diff) +0 -0

b/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb SUMMARY = "libebml is a C++ libary to parse EBML files" · line 3

Quoted 6 lines

index 71e2bfc..b756a39 100644

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +0 -0
@@ -2,15 +2,49 @@ SUMMARY = "libebml is a C++ libary to parse EBML files"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM =

"file://LICENSE.LGPL;md5=f14599a2f089f6ff8c97e2baa4e3d575"

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb SUMMARY = "libebml is a C++ libary to parse EBML files" · line 4

Quoted 2 lines
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +0 -1
-SRC_URI = "

http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2"

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb SUMMARY = "libebml is a C++ libary to parse EBML files"

Quoted 7 lines
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +5 -0
+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"

Quoted 4 lines
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +1 -1
-EXTRA_OEMAKE = "-e MAKEFLAGS="
+do_unpack[postfuncs] += "dos2unix"
 

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb SUMMARY = "libebml is a C++ libary to parse EBML files" · line 21

Quoted 10 lines
meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +7 -3
-do_compile() {
-    cd ${S}/make/linux
-    oe_runmake CROSS="${TARGET_PREFIX}"
+dos2unix () {
+    cr="$(printf '\r')"
+    for f in make/*/Makefile; do
+        tr -d "$cr" <"$f" >"$f.new" && \
+            mv "$f.new" "$f"
+    done
+}

This doesn't seem to work now:

| NOTE: Unpacking /home/jenkins/oe/world/shr-core/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch to
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/

| DEBUG: Python function base_do_unpack finished
| DEBUG: Python function do_unpack finished
| DEBUG: Executing python function do_qa_unpack
| NOTE: Checking has ${S} been created
| DEBUG: Python function do_qa_unpack finished
| DEBUG: Executing shell function dos2unix
|
Quoted 8 lines

/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/temp/run.dos2unix.30265:
104:
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/temp/run.dos2unix.30265:
cannot open make/*/Makefile: No such file
| WARNING: exit code 2 from a shell command.
| ERROR: Function failed: dos2unix (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/libebml/1.3.0-r0/temp/log.do_unpack.30265)
NOTE: recipe libebml-1.3.0-r0: task do_unpack: Failed

Looks like fallout from the removal of the default 'dirs' flag, I'll take care of it when I get back from vacation if nobody gets to it first. Thanks.

Signature · 5 lines
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics