* [PATCH 0/1] Migrate lua from meta-oe @ 2013-10-23 7:18 Kai Kang 2013-10-23 7:18 ` [PATCH 1/1] lua: add lua recipe Kai Kang 2013-10-23 10:29 ` [PATCH 0/1] Migrate lua from meta-oe Saul Wold 0 siblings, 2 replies; 6+ messages in thread From: Kai Kang @ 2013-10-23 7:18 UTC (permalink / raw) To: openembedded-core The following changes since commit ffb440c37c3491fa5d9a1408341f7c15eacdc9ce: midori: exclude from self-hosted for mips64 (2013-10-23 07:18:54 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/lua http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lua Kai Kang (1): lua: add lua recipe 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 -- 1.8.1.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] lua: add lua recipe 2013-10-23 7:18 [PATCH 0/1] Migrate lua from meta-oe Kai Kang @ 2013-10-23 7:18 ` Kai Kang 2013-10-29 3:52 ` Khem Raj 2013-10-23 10:29 ` [PATCH 0/1] Migrate lua from meta-oe Saul Wold 1 sibling, 1 reply; 6+ messages in thread From: Kai Kang @ 2013-10-23 7:18 UTC (permalink / raw) To: openembedded-core Migrate lua recipe and patches from meta-oe. And then update to 5.2.2. Update: * remove bitwise_operators.patch that lua uses bit32 library to support for bitwise operations. * update uclibc-pthread.patch Signed-off-by: Kai Kang <kai.kang@windriver.com> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] lua: add lua recipe 2013-10-23 7:18 ` [PATCH 1/1] lua: add lua recipe Kai Kang @ 2013-10-29 3:52 ` Khem Raj 2013-10-29 4:35 ` Kang Kai 0 siblings, 1 reply; 6+ messages in thread From: Khem Raj @ 2013-10-29 3:52 UTC (permalink / raw) To: Kai Kang; +Cc: Patches and discussions about the oe-core layer On Wed, Oct 23, 2013 at 12:18 AM, Kai Kang <kai.kang@windriver.com> 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 > Update: > * remove bitwise_operators.patch that lua uses bit32 library to > support for bitwise operations. > * update uclibc-pthread.patch > > Signed-off-by: Kai Kang <kai.kang@windriver.com> > --- > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] lua: add lua recipe 2013-10-29 3:52 ` Khem Raj @ 2013-10-29 4:35 ` Kang Kai 0 siblings, 0 replies; 6+ messages in thread From: Kang Kai @ 2013-10-29 4:35 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer On 2013年10月29日 11:52, Khem Raj wrote: > On Wed, Oct 23, 2013 at 12:18 AM, Kai Kang <kai.kang@windriver.com> 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 <kai.kang@windriver.com> >> --- >> 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/1] Migrate lua from meta-oe 2013-10-23 7:18 [PATCH 0/1] Migrate lua from meta-oe Kai Kang 2013-10-23 7:18 ` [PATCH 1/1] lua: add lua recipe Kai Kang @ 2013-10-23 10:29 ` Saul Wold 2013-10-24 1:40 ` Kang Kai 1 sibling, 1 reply; 6+ messages in thread From: Saul Wold @ 2013-10-23 10:29 UTC (permalink / raw) To: Kai Kang, openembedded-core On 10/23/2013 12:18 AM, Kai Kang wrote: > The following changes since commit ffb440c37c3491fa5d9a1408341f7c15eacdc9ce: > > midori: exclude from self-hosted for mips64 (2013-10-23 07:18:54 +0100) > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib kangkai/lua > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lua > > Kai Kang (1): > lua: add lua recipe > Why? You talk about the migration, but git no indication of why this should be moved into OE-Core, this was discussed recently (Late July, Early August) when Randy MacLeod proposed it and it was rejected then. Sau! > 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 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/1] Migrate lua from meta-oe 2013-10-23 10:29 ` [PATCH 0/1] Migrate lua from meta-oe Saul Wold @ 2013-10-24 1:40 ` Kang Kai 0 siblings, 0 replies; 6+ messages in thread From: Kang Kai @ 2013-10-24 1:40 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 2013年10月23日 18:29, Saul Wold wrote: > On 10/23/2013 12:18 AM, Kai Kang wrote: >> The following changes since commit >> ffb440c37c3491fa5d9a1408341f7c15eacdc9ce: >> >> midori: exclude from self-hosted for mips64 (2013-10-23 07:18:54 +0100) >> >> are available in the git repository at: >> >> git://git.pokylinux.org/poky-contrib kangkai/lua >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lua >> >> Kai Kang (1): >> lua: add lua recipe >> > Why? > > You talk about the migration, but git no indication of why this should > be moved into OE-Core, this was discussed recently (Late July, Early > August) when Randy MacLeod proposed it and it was rejected then. I searched the maillist, and found nothing about lua. So I sent the recipe. Sorry for the noise. Kai > > Sau! > >> 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 >> > > -- Regards, Neil | Kai Kang ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-29 4:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-10-23 7:18 [PATCH 0/1] Migrate lua from meta-oe Kai Kang 2013-10-23 7:18 ` [PATCH 1/1] lua: add lua recipe Kai Kang 2013-10-29 3:52 ` Khem Raj 2013-10-29 4:35 ` Kang Kai 2013-10-23 10:29 ` [PATCH 0/1] Migrate lua from meta-oe Saul Wold 2013-10-24 1:40 ` Kang Kai
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox