summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-10-12 21:04:50 -0700
committerKhem Raj <raj.khem@gmail.com>2021-10-16 08:25:21 -0700
commitdf196ab5a7523d1aa2cec2268098c0a2831a9cd8 (patch)
tree3d550051b3f6bbcd5a623c480186846ed5ed54c3 /meta-oe
parent034a25f08511bd5e4b5609fd6e13cdcb49288c56 (diff)
downloadmeta-openembedded-df196ab5a7523d1aa2cec2268098c0a2831a9cd8.tar.gz
luaposix: Upgrade to 35.1
automake has been dropped therefore switch to using luke build system Drop automake specific patch which is no longer needed Use lua 5.4 since thats whats provided in oe-core License-Update: File renamed to LICENSE and copyright year changed to 2021 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch75
-rw-r--r--meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb21
-rw-r--r--meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb27
3 files changed, 27 insertions, 96 deletions
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch b/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch
deleted file mode 100644
index d8a9e3d2b7..0000000000
--- a/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From 4dfca036c96071bd2a2c80ff84719c6d37858373 Mon Sep 17 00:00:00 2001
2From: Haseeb Ashraf <Haseeb_Ashraf@mentor.com>
3Date: Fri, 17 Apr 2020 14:36:50 +0500
4Subject: [PATCH 1/1] fix: avoid race condition between test and mkdir
5
6when building in parallel the race condition, when the directory
7is tested for existence and it is created, can break the build
8
9Signed-off-by: Haseeb Ashraf <Haseeb_Ashraf@mentor.com>
10---
11 Makefile.in | 6 +++---
12 build-aux/rockspecs.mk | 2 +-
13 local.mk | 2 +-
14 3 files changed, 5 insertions(+), 5 deletions(-)
15
16diff --git a/Makefile.in b/Makefile.in
17index 9b51ef3..4722525 100644
18--- a/Makefile.in
19+++ b/Makefile.in
20@@ -1637,7 +1637,7 @@ distclean-tags:
21
22 distdir: $(DISTFILES)
23 $(am__remove_distdir)
24- test -d "$(distdir)" || mkdir "$(distdir)"
25+ $(MKDIR_P) "$(distdir)"
26 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
27 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
28 list='$(DISTFILES)'; \
29@@ -1975,7 +1975,7 @@ clean-local:
30 rm -f $(posix_submodules)
31
32 $(allhtml): $(EXTRA_ext_posix_posix_la_SOURCES) $(ext_posix_posix_la_SOURCES)
33- test -d $(builddir)/doc || mkdir $(builddir)/doc
34+ $(MKDIR_P) $(builddir)/doc
35 @HAVE_LDOC_TRUE@ $(LDOC) -c build-aux/config.ld -d $(abs_srcdir)/doc .
36 @HAVE_LDOC_FALSE@ $(MKDIR_P) doc
37 @HAVE_LDOC_FALSE@ touch doc/index.html doc/ldoc.css
38@@ -1983,7 +1983,7 @@ $(allhtml): $(EXTRA_ext_posix_posix_la_SOURCES) $(ext_posix_posix_la_SOURCES)
39 doc: $(allhtml)
40
41 $(luarocks_config): Makefile.am
42- @test -d build-aux || mkdir build-aux
43+ @$(MKDIR_P) build-aux
44 $(AM_V_GEN){ \
45 $(set_LUA_BINDIR); \
46 echo 'rocks_trees = { "$(abs_srcdir)/luarocks" }'; \
47diff --git a/build-aux/rockspecs.mk b/build-aux/rockspecs.mk
48index ebd1dbf..c8fbdbc 100644
49--- a/build-aux/rockspecs.mk
50+++ b/build-aux/rockspecs.mk
51@@ -62,7 +62,7 @@ LUA_INCDIR = `cd $$LUA_BINDIR/../include && pwd`
52 LUA_LIBDIR = `cd $$LUA_BINDIR/../lib && pwd`
53
54 $(luarocks_config): Makefile.am
55- @test -d build-aux || mkdir build-aux
56+ @$(MKDIR_P) build-aux
57 $(AM_V_GEN){ \
58 $(set_LUA_BINDIR); \
59 echo 'rocks_trees = { "$(abs_srcdir)/luarocks" }'; \
60diff --git a/local.mk b/local.mk
61index d391ef7..80b22ce 100644
62--- a/local.mk
63+++ b/local.mk
64@@ -255,7 +255,7 @@ dist_examples_DATA += \
65 allhtml = $(dist_doc_DATA) $(dist_examples_DATA) $(dist_modules_DATA) $(dist_classes_DATA)
66
67 $(allhtml): $(EXTRA_ext_posix_posix_la_SOURCES) $(ext_posix_posix_la_SOURCES)
68- test -d $(builddir)/doc || mkdir $(builddir)/doc
69+ $(MKDIR_P) $(builddir)/doc
70 if HAVE_LDOC
71 $(LDOC) -c build-aux/config.ld -d $(abs_srcdir)/doc .
72 else
73--
742.17.1
75
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb b/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb
deleted file mode 100644
index 9a66d8fb28..0000000000
--- a/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "luaposix is a POSIX binding for Lua."
2LICENSE = "MIT"
3HOMEPAGE = "https://github.com/luaposix/luaposix"
4LIC_FILES_CHKSUM = "file://COPYING;md5=7dd2aad04bb7ca212e69127ba8d58f9f"
5
6DEPENDS += "lua-native lua"
7
8SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release \
9 file://0001-fix-avoid-race-condition-between-test-and-mkdir.patch \
10"
11SRCREV = "8e4902ed81c922ed8f76a7ed85be1eaa3fd7e66d"
12S = "${WORKDIR}/git"
13LUA_VERSION = "5.4"
14
15inherit autotools pkgconfig
16
17do_install() {
18 oe_runmake 'DESTDIR=${D}' 'luadir=${datadir}/lua/${LUA_VERSION}' 'luaexecdir=${libdir}/lua/${LUA_VERSION}' install
19}
20
21FILES:${PN} = "${datadir}/lua/${LUA_VERSION} ${libdir}/lua/${LUA_VERSION}"
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb b/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb
new file mode 100644
index 0000000000..5c7d4c9199
--- /dev/null
+++ b/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb
@@ -0,0 +1,27 @@
1DESCRIPTION = "luaposix is a POSIX binding for Lua."
2LICENSE = "MIT"
3HOMEPAGE = "https://github.com/luaposix/luaposix"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=f81069e00c0cad249f20efe958276db1"
5
6DEPENDS += "lua-native lua"
7
8SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v${PV} \
9"
10SRCREV = "14043c5086ae738823a5dfbc9170d9e14193fbef"
11S = "${WORKDIR}/git"
12LUA_VERSION = "5.4"
13
14B = "${S}"
15
16inherit pkgconfig
17
18do_compile() {
19 ${S}/build-aux/luke
20}
21
22do_install() {
23 ${S}/build-aux/luke PREFIX=${D}${prefix} install
24}
25
26FILES:${PN} = "${datadir}/lua/${LUA_VERSION} \
27 ${libdir}/lua/${LUA_VERSION}"