From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 2F621615AC for ; Tue, 29 Oct 2013 04:35:14 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id r9T4ZE3C001708 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 28 Oct 2013 21:35:14 -0700 (PDT) Received: from [128.224.162.231] (128.224.162.231) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.2.347.0; Mon, 28 Oct 2013 21:35:14 -0700 Message-ID: <526F3B04.2000802@windriver.com> Date: Tue, 29 Oct 2013 12:35:16 +0800 From: Kang Kai User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: Khem Raj References: In-Reply-To: X-Originating-IP: [128.224.162.231] Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 1/1] lua: add lua recipe X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 04:35:14 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit On 2013年10月29日 11:52, Khem Raj wrote: > On Wed, Oct 23, 2013 at 12:18 AM, Kai Kang wrote: >> Migrate lua recipe and patches from meta-oe. And then update to 5.2.2. >> > no it can not be migrated. ABIs are different between 5.1 and 5.2 and > please submit these 5.2 recipes > to meta-oe OK, thanks. Kai >> Update: >> * remove bitwise_operators.patch that lua uses bit32 library to >> support for bitwise operations. >> * update uclibc-pthread.patch >> >> Signed-off-by: Kai Kang >> --- >> meta/recipes-devtools/lua/lua/lua.pc | 11 +++++ >> meta/recipes-devtools/lua/lua/uclibc-pthread.patch | 13 ++++++ >> meta/recipes-devtools/lua/lua_5.2.2.bb | 49 ++++++++++++++++++++++ >> 3 files changed, 73 insertions(+) >> create mode 100644 meta/recipes-devtools/lua/lua/lua.pc >> create mode 100644 meta/recipes-devtools/lua/lua/uclibc-pthread.patch >> create mode 100644 meta/recipes-devtools/lua/lua_5.2.2.bb >> >> diff --git a/meta/recipes-devtools/lua/lua/lua.pc b/meta/recipes-devtools/lua/lua/lua.pc >> new file mode 100644 >> index 0000000..e6f8b6f >> --- /dev/null >> +++ b/meta/recipes-devtools/lua/lua/lua.pc >> @@ -0,0 +1,11 @@ >> +prefix=/usr >> +libdir=${prefix}/lib >> +includedir=${prefix}/include >> + >> +Name: Lua >> +Description: Lua language engine >> +Version: 5.2.2 >> +Requires: >> +Libs: -L${libdir} -llua >> +Libs.private: -lm >> +Cflags: -I${includedir} >> diff --git a/meta/recipes-devtools/lua/lua/uclibc-pthread.patch b/meta/recipes-devtools/lua/lua/uclibc-pthread.patch >> new file mode 100644 >> index 0000000..f4cdc5d >> --- /dev/null >> +++ b/meta/recipes-devtools/lua/lua/uclibc-pthread.patch >> @@ -0,0 +1,13 @@ >> +Index: lua-5.1.4/src/Makefile >> +=================================================================== >> +--- a/src/Makefile.orig 2013-10-22 22:17:19.929103523 -0400 >> ++++ a/src/Makefile 2013-10-22 22:18:27.992104545 -0400 >> +@@ -9,7 +9,7 @@ >> + CC= gcc >> + CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) >> + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) >> +-LIBS= -lm $(SYSLIBS) $(MYLIBS) >> ++LIBS= -lm -lpthread $(SYSLIBS) $(MYLIBS) >> + >> + AR= ar rcu >> + RANLIB= ranlib >> diff --git a/meta/recipes-devtools/lua/lua_5.2.2.bb b/meta/recipes-devtools/lua/lua_5.2.2.bb >> new file mode 100644 >> index 0000000..500dd3a7 >> --- /dev/null >> +++ b/meta/recipes-devtools/lua/lua_5.2.2.bb >> @@ -0,0 +1,49 @@ >> +DESCRIPTION = "Lua is a powerful light-weight programming language designed \ >> +for extending applications." >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=364;endline=398;md5=ad3069a42853ac3efd7d379d87f6088b" >> +HOMEPAGE = "http://www.lua.org/" >> + >> +PR = "r0" >> + >> +DEPENDS = "readline" >> +SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ >> + file://lua.pc \ >> +" >> + >> +SRC_URI[md5sum] = "efbb645e897eae37cad4344ce8b0a614" >> +SRC_URI[sha256sum] = "3fd67de3f5ed133bf312906082fa524545c6b9e1b952e8215ffbd27113f49f00" >> + >> +inherit pkgconfig binconfig >> + >> +UCLIBC_PATCHES += "file://uclibc-pthread.patch" >> +SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}" >> + >> +TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" >> +EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'" >> + >> +do_configure_prepend() { >> + sed -i -e s:/usr/local:${prefix}:g src/luaconf.h >> +} >> + >> +do_compile () { >> + oe_runmake linux >> +} >> + >> +do_install () { >> + oe_runmake \ >> + 'INSTALL_TOP=${D}${prefix}' \ >> + 'INSTALL_BIN=${D}${bindir}' \ >> + 'INSTALL_INC=${D}${includedir}/' \ >> + 'INSTALL_MAN=${D}${mandir}/man1' \ >> + 'INSTALL_SHARE=${D}${datadir}/lua' \ >> + 'INSTALL_LIB=${D}${libdir}' \ >> + 'INSTALL_CMOD=${D}${libdir}/lua/5.2' \ >> + install >> + install -d ${D}${libdir}/pkgconfig >> + install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ >> + rmdir ${D}${datadir}/lua/5.2 >> + rmdir ${D}${datadir}/lua >> +} >> + >> +BBCLASSEXTEND = "native" >> -- >> 1.8.1.2 >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- Regards, Neil | Kai Kang