From fff62b3b96794ecd2a912eff451949321c382798 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Fri, 15 Oct 2010 23:09:20 +0000 Subject: [PATCH] lua5.1: link to libpthread when using uclibc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When the Lua modules are linked with pthreads, loading them crashes Lua. It's some bug in pthread_create() in uclibc. Anyway, linking Lua against pthread fixes this issue. Signed-off-by: Petr Å tetiar Signed-off-by: Khem Raj --- recipes/lua/lua5.1/uclibc-pthread.patch | 13 +++++++++++++ recipes/lua/lua5.1_5.1.4.bb | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 recipes/lua/lua5.1/uclibc-pthread.patch diff --git a/recipes/lua/lua5.1/uclibc-pthread.patch b/recipes/lua/lua5.1/uclibc-pthread.patch new file mode 100644 index 0000000000..0555e81b19 --- /dev/null +++ b/recipes/lua/lua5.1/uclibc-pthread.patch @@ -0,0 +1,13 @@ +Index: lua-5.1.4/src/Makefile +=================================================================== +--- lua-5.1.4.orig/src/Makefile 2010-10-16 09:51:52.000000000 +0200 ++++ lua-5.1.4/src/Makefile 2010-10-16 09:52:15.000000000 +0200 +@@ -12,7 +12,7 @@ + AR= ar rcu + RANLIB= ranlib + RM= rm -f +-LIBS= -lm $(MYLIBS) ++LIBS= -lm -lpthread $(MYLIBS) + + MYCFLAGS= + MYLDFLAGS= diff --git a/recipes/lua/lua5.1_5.1.4.bb b/recipes/lua/lua5.1_5.1.4.bb index 75b48f4064..ba2f8b9e50 100644 --- a/recipes/lua/lua5.1_5.1.4.bb +++ b/recipes/lua/lua5.1_5.1.4.bb @@ -4,14 +4,19 @@ LICENSE = "MIT" HOMEPAGE = "http://www.lua.org/" DEPENDS += "readline" -PR = "r6" +PR = "r7" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ file://bitwise_operators.patch \ - file://lua5.1.pc" + file://lua5.1.pc \ + " S = "${WORKDIR}/lua-${PV}" inherit pkgconfig binconfig +UCLIBC_PATCHES += "file://uclibc-pthread.patch" +SRC_URI_append_linux-uclibc = "${UCLIBC_PATCHES}" +SRC_URI_append_linux-uclibceabi = "${UCLIBC_PATCHES}" + TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'" -- 2.39.5