* [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3
@ 2020-02-25 6:37 Leo Yan
2020-02-25 6:41 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Leo Yan @ 2020-02-25 6:37 UTC (permalink / raw)
To: openembeded-devel, Khem Raj, Sumit Garg, Daniel Thompson, Loic Poulain
Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
.../luajit/luajit/clang.patch | 19 -------------------
.../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++--------
2 files changed, 6 insertions(+), 27 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch
rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (89%)
diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
deleted file mode 100644
index c39ef6fd4..000000000
--- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-clang pretends to be gcc 4.2.0 which is a big lie when it comes
-to features, its same as latest gcc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: LuaJIT-2.0.5/src/lj_arch.h
-===================================================================
---- LuaJIT-2.0.5.orig/src/lj_arch.h
-+++ LuaJIT-2.0.5/src/lj_arch.h
-@@ -313,7 +313,7 @@
- #error "Need at least GCC 4.2 or newer"
- #endif
- #elif !LJ_TARGET_PS3
--#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
-+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
- #error "Need at least GCC 4.3 or newer"
- #endif
- #endif
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
similarity index 89%
rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
index 93128dda8..da798328e 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -1,14 +1,13 @@
SUMMARY = "Just-In-Time Compiler for Lua"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
HOMEPAGE = "http://luajit.org"
-PV .= "+git${SRCPV}"
-SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
-SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
+PV = "2.0.5+2.1.0-beta3"
+SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
+SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
- file://clang.patch \
-"
+ "
S = "${WORKDIR}/git"
@@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
"
FILES_luajit-common = "${datadir}/${BPN}-${PV}"
-# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
-COMPATIBLE_HOST_aarch64 = "null"
+# mips64/ppc/ppc64/riscv64 is not supported in this release
COMPATIBLE_HOST_mipsarchn32 = "null"
COMPATIBLE_HOST_mipsarchn64 = "null"
COMPATIBLE_HOST_powerpc = "null"
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3
2020-02-25 6:37 [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3 Leo Yan
@ 2020-02-25 6:41 ` Khem Raj
2020-02-25 7:38 ` Leo Yan
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2020-02-25 6:41 UTC (permalink / raw)
To: Leo Yan, openembeded-devel, Sumit Garg, Daniel Thompson, Loic Poulain
On 2/24/20 10:37 PM, Leo Yan wrote:
> Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
> ---
> .../luajit/luajit/clang.patch | 19 -------------------
why is this patch dropped ? it building with clang handled differently
now ? if so please add a line or two in commit msg
> .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++--------
> 2 files changed, 6 insertions(+), 27 deletions(-)
> delete mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch
> rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (89%)
>
> diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> deleted file mode 100644
> index c39ef6fd4..000000000
> --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -clang pretends to be gcc 4.2.0 which is a big lie when it comes
> -to features, its same as latest gcc
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Pending
> -
> -Index: LuaJIT-2.0.5/src/lj_arch.h
> -===================================================================
> ---- LuaJIT-2.0.5.orig/src/lj_arch.h
> -+++ LuaJIT-2.0.5/src/lj_arch.h
> -@@ -313,7 +313,7 @@
> - #error "Need at least GCC 4.2 or newer"
> - #endif
> - #elif !LJ_TARGET_PS3
> --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
> - #error "Need at least GCC 4.3 or newer"
> - #endif
> - #endif
> diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> similarity index 89%
> rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> index 93128dda8..da798328e 100644
> --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> @@ -1,14 +1,13 @@
> SUMMARY = "Just-In-Time Compiler for Lua"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> HOMEPAGE = "http://luajit.org"
>
> -PV .= "+git${SRCPV}"
> -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> +PV = "2.0.5+2.1.0-beta3"
> +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> - file://clang.patch \
> -"
> + "
>
> S = "${WORKDIR}/git"
>
> @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
> "
> FILES_luajit-common = "${datadir}/${BPN}-${PV}"
>
> -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
> -COMPATIBLE_HOST_aarch64 = "null"
> +# mips64/ppc/ppc64/riscv64 is not supported in this release
> COMPATIBLE_HOST_mipsarchn32 = "null"
> COMPATIBLE_HOST_mipsarchn64 = "null"
> COMPATIBLE_HOST_powerpc = "null"
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3
2020-02-25 6:41 ` Khem Raj
@ 2020-02-25 7:38 ` Leo Yan
2020-02-25 15:57 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Leo Yan @ 2020-02-25 7:38 UTC (permalink / raw)
To: Khem Raj; +Cc: Daniel Thompson, Loic Poulain, openembeded-devel
Hi Khem,
On Mon, Feb 24, 2020 at 10:41:04PM -0800, Khem Raj wrote:
>
>
> On 2/24/20 10:37 PM, Leo Yan wrote:
> > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> >
> > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> > ---
> > .../luajit/luajit/clang.patch | 19 -------------------
>
>
> why is this patch dropped ? it building with clang handled differently now ?
> if so please add a line or two in commit msg
To be honest, I don't know how to hit the condition for
'#elif !LJ_TARGET_PS3', and since considering Clang has upgraded to new
version (9.0.1), this is another reason I dropped this patch.
But I cannot give out any concrete reason, will keep this patch.
Thanks,
Leo
> > .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++--------
> > 2 files changed, 6 insertions(+), 27 deletions(-)
> > delete mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (89%)
> >
> > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > deleted file mode 100644
> > index c39ef6fd4..000000000
> > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > +++ /dev/null
> > @@ -1,19 +0,0 @@
> > -clang pretends to be gcc 4.2.0 which is a big lie when it comes
> > -to features, its same as latest gcc
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > -Upstream-Status: Pending
> > -
> > -Index: LuaJIT-2.0.5/src/lj_arch.h
> > -===================================================================
> > ---- LuaJIT-2.0.5.orig/src/lj_arch.h
> > -+++ LuaJIT-2.0.5/src/lj_arch.h
> > -@@ -313,7 +313,7 @@
> > - #error "Need at least GCC 4.2 or newer"
> > - #endif
> > - #elif !LJ_TARGET_PS3
> > --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
> > - #error "Need at least GCC 4.3 or newer"
> > - #endif
> > - #endif
> > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > similarity index 89%
> > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > index 93128dda8..da798328e 100644
> > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > @@ -1,14 +1,13 @@
> > SUMMARY = "Just-In-Time Compiler for Lua"
> > LICENSE = "MIT"
> > -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> > HOMEPAGE = "http://luajit.org"
> > -PV .= "+git${SRCPV}"
> > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > +PV = "2.0.5+2.1.0-beta3"
> > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> > +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> > file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> > - file://clang.patch \
> > -"
> > + "
> > S = "${WORKDIR}/git"
> > @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
> > "
> > FILES_luajit-common = "${datadir}/${BPN}-${PV}"
> > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
> > -COMPATIBLE_HOST_aarch64 = "null"
> > +# mips64/ppc/ppc64/riscv64 is not supported in this release
> > COMPATIBLE_HOST_mipsarchn32 = "null"
> > COMPATIBLE_HOST_mipsarchn64 = "null"
> > COMPATIBLE_HOST_powerpc = "null"
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3
2020-02-25 7:38 ` Leo Yan
@ 2020-02-25 15:57 ` Khem Raj
2020-02-26 12:30 ` Leo Yan
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2020-02-25 15:57 UTC (permalink / raw)
To: Leo Yan; +Cc: Daniel Thompson, Loic Poulain, openembeded-devel
On 2/24/20 11:38 PM, Leo Yan wrote:
> Hi Khem,
>
> On Mon, Feb 24, 2020 at 10:41:04PM -0800, Khem Raj wrote:
>>
>>
>> On 2/24/20 10:37 PM, Leo Yan wrote:
>>> Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
>>> misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
>>>
>>> Signed-off-by: Leo Yan <leo.yan@linaro.org>
>>> ---
>>> .../luajit/luajit/clang.patch | 19 -------------------
>>
>>
>> why is this patch dropped ? it building with clang handled differently now ?
>> if so please add a line or two in commit msg
>
> To be honest, I don't know how to hit the condition for
> '#elif !LJ_TARGET_PS3', and since considering Clang has upgraded to new
> version (9.0.1), this is another reason I dropped this patch.
>
you could easily excercise the need for it, by adding meta-clang and setting
TOOLCHAIN_pn-luajit = "clang" (in local.conf)
bitbake luajit
> But I cannot give out any concrete reason, will keep this patch.
>
> Thanks,
> Leo
>
>>> .../luajit/{luajit_2.0.5.bb => luajit_git.bb} | 14 ++++++--------
>>> 2 files changed, 6 insertions(+), 27 deletions(-)
>>> delete mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch
>>> rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (89%)
>>>
>>> diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>>> deleted file mode 100644
>>> index c39ef6fd4..000000000
>>> --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>>> +++ /dev/null
>>> @@ -1,19 +0,0 @@
>>> -clang pretends to be gcc 4.2.0 which is a big lie when it comes
>>> -to features, its same as latest gcc
>>> -
>>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> -Upstream-Status: Pending
>>> -
>>> -Index: LuaJIT-2.0.5/src/lj_arch.h
>>> -===================================================================
>>> ---- LuaJIT-2.0.5.orig/src/lj_arch.h
>>> -+++ LuaJIT-2.0.5/src/lj_arch.h
>>> -@@ -313,7 +313,7 @@
>>> - #error "Need at least GCC 4.2 or newer"
>>> - #endif
>>> - #elif !LJ_TARGET_PS3
>>> --#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
>>> -+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
>>> - #error "Need at least GCC 4.3 or newer"
>>> - #endif
>>> - #endif
>>> diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>>> similarity index 89%
>>> rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>>> rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
>>> index 93128dda8..da798328e 100644
>>> --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>>> +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>>> @@ -1,14 +1,13 @@
>>> SUMMARY = "Just-In-Time Compiler for Lua"
>>> LICENSE = "MIT"
>>> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
>>> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
>>> HOMEPAGE = "http://luajit.org"
>>> -PV .= "+git${SRCPV}"
>>> -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
>>> -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
>>> +PV = "2.0.5+2.1.0-beta3"
>>> +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
>>> +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
>>> file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
>>> - file://clang.patch \
>>> -"
>>> + "
>>> S = "${WORKDIR}/git"
>>> @@ -90,8 +89,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
>>> "
>>> FILES_luajit-common = "${datadir}/${BPN}-${PV}"
>>> -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
>>> -COMPATIBLE_HOST_aarch64 = "null"
>>> +# mips64/ppc/ppc64/riscv64 is not supported in this release
>>> COMPATIBLE_HOST_mipsarchn32 = "null"
>>> COMPATIBLE_HOST_mipsarchn64 = "null"
>>> COMPATIBLE_HOST_powerpc = "null"
>>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3
2020-02-25 15:57 ` Khem Raj
@ 2020-02-26 12:30 ` Leo Yan
0 siblings, 0 replies; 5+ messages in thread
From: Leo Yan @ 2020-02-26 12:30 UTC (permalink / raw)
To: Khem Raj; +Cc: Daniel Thompson, Loic Poulain, openembeded-devel
Hi Khem,
On Tue, Feb 25, 2020 at 07:57:09AM -0800, Khem Raj wrote:
>
>
> On 2/24/20 11:38 PM, Leo Yan wrote:
> > Hi Khem,
> >
> > On Mon, Feb 24, 2020 at 10:41:04PM -0800, Khem Raj wrote:
> > >
> > >
> > > On 2/24/20 10:37 PM, Leo Yan wrote:
> > > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> > > >
> > > > Signed-off-by: Leo Yan <leo.yan@linaro.org>
> > > > ---
> > > > .../luajit/luajit/clang.patch | 19 -------------------
> > >
> > >
> > > why is this patch dropped ? it building with clang handled differently now ?
> > > if so please add a line or two in commit msg
> >
> > To be honest, I don't know how to hit the condition for
> > '#elif !LJ_TARGET_PS3', and since considering Clang has upgraded to new
> > version (9.0.1), this is another reason I dropped this patch.
> >
>
> you could easily excercise the need for it, by adding meta-clang and setting
>
> TOOLCHAIN_pn-luajit = "clang" (in local.conf)
> bitbake luajit
I tested up setting with MACHINE=qemumips, it can hit the condition
for '#elif !LJ_TARGET_PS3' and the patch clang.patch is still needed,
otherwise, it can cause building error.
So have sent out patch v4 to keep clang.patch with minor updating
to dismiss patching warning.
Thanks a lot for guidance.
Leo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-26 12:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-25 6:37 [meta-oe][PATCH v3] luajit: Upgrade to 2.1.0-beta3 Leo Yan
2020-02-25 6:41 ` Khem Raj
2020-02-25 7:38 ` Leo Yan
2020-02-25 15:57 ` Khem Raj
2020-02-26 12:30 ` Leo Yan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.