Revert "luajit: Upgrade to 2.1 beta1"
PATCH 1/1 Revert "luajit: Upgrade to 2.1 beta1"
This reverts commit 2ce3086aa859178fb5f7d6db9876229c8ed5a6eb.
Causes sysdig and devilspie2 build failures.
--- ...p-automatically-this-leaves-the-stripping.patch | 33 +++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56 ++++++++++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 67 ---------------------- 3 files changed, 89 insertions(+), 67 deletions(-) create mode 100644 meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.bb
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 May 2013 10:42:45 -0700 +Subject: [PATCH] Do not strip automatically, this leaves the stripping + busines to OE + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 278324a..5ecd6d5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -665,12 +665,10 @@ $(LUAJIT_A): $(LJVMCORE_O) + $(LUAJIT_SO): $(LJVMCORE_O) + $(E) "DYNLINK $@" + $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS) +- $(Q)$(TARGET_STRIP) $@ + + $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) + $(E) "LINK $@" + $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) +- $(Q)$(TARGET_STRIP) $@ + $(E) "OK Successfully built LuaJIT" + + ############################################################################## +-- +1.7.9.5 +
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +56 -0
56 lines not on this page · raw message
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0 -67
67 lines not on this page · raw message
Signature · 1 line
2.6.2
Quoted 138 lines · Martin Jansa
This reverts commit
2ce3086aa859178fb5f7d6db9876229c8ed5a6eb.Causes sysdig and devilspie2 build failures.
Signed-off-by Martin Jansa <[email protected]>--- ...p-automatically-this-leaves-the-stripping.patch | 33 +++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56 ++++++++++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 67 ---------------------- 3 files changed, 89 insertions(+), 67 deletions(-) create mode 100644 meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.bbmeta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +33
-0@@ -0,0 +1,33 @@ +From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 May 2013 10:42:45 -0700 +Subject: [PATCH] Do not strip automatically, this leaves the stripping + busines to OE + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 278324a..5ecd6d5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -665,12 +665,10 @@ $(LUAJIT_A): $(LJVMCORE_O) + $(LUAJIT_SO): $(LJVMCORE_O) + $(E) "DYNLINK $@" + $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS) +- $(Q)$(TARGET_STRIP) $@ + + $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) + $(E) "LINK $@" + $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) +- $(Q)$(TARGET_STRIP) $@ + $(E) "OK Successfully built LuaJIT" + + ############################################################################## +-- +1.7.9.5 +meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +56
-0@@ -0,0 +1,56 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6" +HOMEPAGE = "http://luajit.org" + +SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ + file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ +" +SRC_URI[md5sum] = "dd9c38307f2223a504cbfb96e477eca0" +SRC_URI[sha256sum] = "620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d" + +S = "${WORKDIR}/LuaJIT-${PV}" + +inherit pkgconfig binconfig + +BBCLASSEXTEND = "native" + +do_configure_prepend() { + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile + sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile +} + +EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ + TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ + TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ + TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_powerpc64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rmdir ${D}${datadir}/lua/5.* \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.* \ + ${D}${libdir}/lua +} + +PACKAGES += 'luajit-common' + +FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ + ${libdir}/libluajit-5.1.so.${PV} \ +" +FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" +meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-17@@ -1,67 +0,0 @@ -SUMMARY = "Just-In-Time Compiler for Lua" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6" -HOMEPAGE = "http://luajit.org" - -SRCREV = "776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v${PV} \ -" - -SPIN = ".0-beta1" - -S = "${WORKDIR}/git" - -inherit pkgconfig binconfig - -BBCLASSEXTEND = "native" -
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 27
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-10-do_configure_prepend() { - sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile - sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile -} - -EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ - TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ - TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ - TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_STRIP="/bin/echo"' -
Would it be a big issue to re-add comment below - I was not aware of the build host requirements and there could be other users
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 36
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-9-# Important note: On the build machine bit compatible glibc-dev and libgcc must -# be installed. E.g if the target architecture has 32 bit (see '-m32' below), -# 32 bit versions of glibc-dev/libgcc (e.g glibc-devel.i686 / libgcc.i686 on -# fedora) are required. -# -# Otherwise the following error occurs: -# | /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory -# | # include <gnu/stubs-32.h> -
Andreas
Was it needed for 2.0 as well? If yes, then I'll re-add it.
On Sun, Nov 8, 2015 at 9:32 PM, Andreas Müller <[email protected]
Quoted 191 lines
wrote:
Quoted 8 lines · Martin Jansa
This reverts commit
2ce3086aa859178fb5f7d6db9876229c8ed5a6eb.Causes sysdig and devilspie2 build failures.
Signed-off-by Martin Jansa <[email protected]>--- ...p-automatically-this-leaves-the-stripping.patch | 33 +++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56++++++++++++++++++
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 67----------------------
Quoted 2 lines
3 files changed, 89 insertions(+), 67 deletions(-) create mode 100644
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.bbdiff --git
a/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchb/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
new file mode 100644
index 0000000..f123b3f
---/dev/null
+++
b/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 12 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +11
-0@@ -0,0 +1,33 @@ +From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 May 2013 10:42:45 -0700 +Subject: [PATCH] Do not strip automatically, this leaves the stripping + busines to OE + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 2 --meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 21
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +10
-0+ 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 278324a..5ecd6d5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -665,12 +665,10 @@ $(LUAJIT_A): $(LJVMCORE_O) + $(LUAJIT_SO): $(LJVMCORE_O) + $(E) "DYNLINK $@" + $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO)$(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
Quoted 5 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +5
-0+- $(Q)$(TARGET_STRIP) $@ + + $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) + $(E) "LINK $@" + $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O)$(TARGET_O) $(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 33
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +4
-0+- $(Q)$(TARGET_STRIP) $@ + $(E) "OK Successfully built LuaJIT" + +##############################################################################
Review
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +3
-0+-- +1.7.9.5 +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 3
Quoted 8 lines
new file mode 100644
index 0000000..4a15a4emeta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0@@ -0,0 +1,56 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 11
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +4
-0+HOMEPAGE = "http://luajit.org" + +SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ +file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
Quoted 3 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0+" +SRC_URI[md5sum] = "dd9c38307f2223a504cbfb96e477eca0" +SRC_URI[sha256sum] ="
620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d"Review
Quoted 47 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +46
-0+ +S = "${WORKDIR}/LuaJIT-${PV}" + +inherit pkgconfig binconfig + +BBCLASSEXTEND = "native" + +do_configure_prepend() { + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile + sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile +} + +EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ + TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ + TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ + TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_powerpc64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rmdir ${D}${datadir}/lua/5.* \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.* \ + ${D}${libdir}/lua +} + +PACKAGES += 'luajit-common' + +FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ + ${libdir}/libluajit-5.1.so.${PV} \ +" +FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 3
Quoted 8 lines
deleted file mode 100644
index 5cee532..0000000meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-3@@ -1,67 +0,0 @@ -SUMMARY = "Just-In-Time Compiler for Lua" -LICENSE = "MIT" -LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-HOMEPAGE = "http://luajit.org" - -SRCREV = "776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v${PV} \
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-9-" - -SPIN = ".0-beta1" - -S = "${WORKDIR}/git" - -inherit pkgconfig binconfig - -BBCLASSEXTEND = "native"meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-10- -do_configure_prepend() { - sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile - sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile -} - -EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ - TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ - TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ - TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"TARGET_STRIP="/bin/echo"'
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 27
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-Would it be a big issue to re-add comment below - I was not aware of the build host requirements and there could be other users
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 28
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# Important note: On the build machine bit compatible glibc-dev andlibgcc must
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 29
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# be installed. E.g if the target architecture has 32 bit (see '-m32'below),
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 30
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# 32 bit versions of glibc-dev/libgcc (e.g glibc-devel.i686 /libgcc.i686 on
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-# fedora) are required. -# -# Otherwise the following error occurs: -# | /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No suchfile or directory
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 36
Quoted 2 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-2-# | # include <gnu/stubs-32.h> -Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin
The build failures are not due to luajit, they are due to lua itself being upgraded beyond 5.1 and its ABI incompatible. Its being highlighted
by luajit 2.1 most probbably, If the lua 5.1 reintroduction patch has been applied then we can look into the fact that lua 5.1 is chosen for these packages.
and yes the 32bit host dependencies has always been a requirement for luajit.
Quoted 199 lines · Martin Jansa
Was it needed for 2.0 as well? If yes, then I'll re-add it.
On Sun, Nov 8, 2015 at 9:32 PM, Andreas Müller <[email protected]
Quoted 182 lines
wrote:
Quoted 8 lines · Martin Jansa
This reverts commit
2ce3086aa859178fb5f7d6db9876229c8ed5a6eb.Causes sysdig and devilspie2 build failures.
Signed-off-by Martin Jansa <[email protected]>--- ...p-automatically-this-leaves-the-stripping.patch | 33 +++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56++++++++++++++++++
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 67----------------------
Quoted 2 lines
3 files changed, 89 insertions(+), 67 deletions(-) create mode 100644
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.bbdiff --git
a/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchb/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
new file mode 100644
index 0000000..f123b3f
---/dev/null
+++
b/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 12 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +11
-0@@ -0,0 +1,33 @@ +From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 May 2013 10:42:45 -0700 +Subject: [PATCH] Do not strip automatically, this leaves the stripping + busines to OE + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 2 --meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 21
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +10
-0+ 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 278324a..5ecd6d5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -665,12 +665,10 @@ $(LUAJIT_A): $(LJVMCORE_O) + $(LUAJIT_SO): $(LJVMCORE_O) + $(E) "DYNLINK $@" + $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO)$(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
Quoted 5 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +5
-0+- $(Q)$(TARGET_STRIP) $@ + + $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) + $(E) "LINK $@" + $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O)$(TARGET_O) $(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 33
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +4
-0+- $(Q)$(TARGET_STRIP) $@ + $(E) "OK Successfully built LuaJIT" + +##############################################################################
Review
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +3
-0+-- +1.7.9.5 +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 3
Quoted 8 lines
new file mode 100644
index 0000000..4a15a4emeta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0@@ -0,0 +1,56 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 11
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +4
-0+HOMEPAGE = "http://luajit.org" + +SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ +file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
Quoted 3 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0+" +SRC_URI[md5sum] = "dd9c38307f2223a504cbfb96e477eca0" +SRC_URI[sha256sum] ="
620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d"Review
Quoted 47 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +46
-0+ +S = "${WORKDIR}/LuaJIT-${PV}" + +inherit pkgconfig binconfig + +BBCLASSEXTEND = "native" + +do_configure_prepend() { + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile + sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile +} + +EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ + TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ + TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ + TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_powerpc64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rmdir ${D}${datadir}/lua/5.* \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.* \ + ${D}${libdir}/lua +} + +PACKAGES += 'luajit-common' + +FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ + ${libdir}/libluajit-5.1.so.${PV} \ +" +FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 3
Quoted 8 lines
deleted file mode 100644
index 5cee532..0000000meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-3@@ -1,67 +0,0 @@ -SUMMARY = "Just-In-Time Compiler for Lua" -LICENSE = "MIT" -LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-HOMEPAGE = "http://luajit.org" - -SRCREV = "776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v${PV} \
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-9-" - -SPIN = ".0-beta1" - -S = "${WORKDIR}/git" - -inherit pkgconfig binconfig - -BBCLASSEXTEND = "native"meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-10- -do_configure_prepend() { - sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile - sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile -} - -EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ - TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ - TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ - TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"TARGET_STRIP="/bin/echo"'
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 27
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-Would it be a big issue to re-add comment below - I was not aware of the build host requirements and there could be other users
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 28
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# Important note: On the build machine bit compatible glibc-dev andlibgcc must
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 29
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# be installed. E.g if the target architecture has 32 bit (see '-m32'below),
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 30
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# 32 bit versions of glibc-dev/libgcc (e.g glibc-devel.i686 /libgcc.i686 on
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-# fedora) are required. -# -# Otherwise the following error occurs: -# | /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No suchfile or directory
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 36
Quoted 2 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-2-# | # include <gnu/stubs-32.h> -Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 8 lines · Khem Raj
Martin
The build failures are not due to luajit, they are due to lua itself being upgraded beyond 5.1 and its ABI incompatible. Its being highlighted
by luajit 2.1 most probbably, If the lua 5.1 reintroduction patch has been applied then we can look into the fact that lua 5.1 is chosen for these packages.
It's failing with this commit even without lua 5.2 upgrade.
And it's beta anyway, so I would like to revert this for jethro branch and then it can be re-applied in master when sysdig and devilspie are working correctly with it, ok?
Quoted 208 lines
and yes the 32bit host dependencies has always been a requirement for luajit.
Quoted 199 lines · Martin Jansa
Was it needed for 2.0 as well? If yes, then I'll re-add it.
On Sun, Nov 8, 2015 at 9:32 PM, Andreas Müller <[email protected]
Quoted 182 lines
wrote:
Quoted 8 lines · Martin Jansa
This reverts commit
2ce3086aa859178fb5f7d6db9876229c8ed5a6eb.Causes sysdig and devilspie2 build failures.
Signed-off-by Martin Jansa <[email protected]>--- ...p-automatically-this-leaves-the-stripping.patch | 33 +++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56++++++++++++++++++
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 67----------------------
Quoted 2 lines
3 files changed, 89 insertions(+), 67 deletions(-) create mode 100644
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.bbdiff --git
a/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchb/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
new file mode 100644
index 0000000..f123b3f
---/dev/null
+++
b/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 12 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +11
-0@@ -0,0 +1,33 @@ +From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 May 2013 10:42:45 -0700 +Subject: [PATCH] Do not strip automatically, this leaves the stripping + busines to OE + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 2 --meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 21
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +10
-0+ 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 278324a..5ecd6d5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -665,12 +665,10 @@ $(LUAJIT_A): $(LJVMCORE_O) + $(LUAJIT_SO): $(LJVMCORE_O) + $(E) "DYNLINK $@" + $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO)$(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
Quoted 5 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +5
-0+- $(Q)$(TARGET_STRIP) $@ + + $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) + $(E) "LINK $@" + $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O)$(TARGET_O) $(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 33
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +4
-0+- $(Q)$(TARGET_STRIP) $@ + $(E) "OK Successfully built LuaJIT" + +##############################################################################
Review
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +3
-0+-- +1.7.9.5 +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 3
Quoted 8 lines
new file mode 100644
index 0000000..4a15a4emeta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0@@ -0,0 +1,56 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 11
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +4
-0+HOMEPAGE = "http://luajit.org" + +SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ +file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
Quoted 3 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0+" +SRC_URI[md5sum] = "dd9c38307f2223a504cbfb96e477eca0" +SRC_URI[sha256sum] ="
620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d"Review
Quoted 47 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +46
-0+ +S = "${WORKDIR}/LuaJIT-${PV}" + +inherit pkgconfig binconfig + +BBCLASSEXTEND = "native" + +do_configure_prepend() { + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile + sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile +} + +EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ + TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ + TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ + TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_powerpc64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rmdir ${D}${datadir}/lua/5.* \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.* \ + ${D}${libdir}/lua +} + +PACKAGES += 'luajit-common' + +FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ + ${libdir}/libluajit-5.1.so.${PV} \ +" +FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 3
Quoted 8 lines
deleted file mode 100644
index 5cee532..0000000meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-3@@ -1,67 +0,0 @@ -SUMMARY = "Just-In-Time Compiler for Lua" -LICENSE = "MIT" -LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-HOMEPAGE = "http://luajit.org" - -SRCREV = "776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v${PV} \
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-9-" - -SPIN = ".0-beta1" - -S = "${WORKDIR}/git" - -inherit pkgconfig binconfig - -BBCLASSEXTEND = "native"meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-10- -do_configure_prepend() { - sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile - sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile -} - -EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ - TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ - TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ - TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"TARGET_STRIP="/bin/echo"'
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 27
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-Would it be a big issue to re-add comment below - I was not aware of the build host requirements and there could be other users
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 28
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# Important note: On the build machine bit compatible glibc-dev andlibgcc must
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 29
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# be installed. E.g if the target architecture has 32 bit (see '-m32'below),
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 30
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# 32 bit versions of glibc-dev/libgcc (e.g glibc-devel.i686 /libgcc.i686 on
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-# fedora) are required. -# -# Otherwise the following error occurs: -# | /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No suchfile or directory
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 36
Quoted 2 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-2-# | # include <gnu/stubs-32.h> -Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develSignature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 10 lines · Martin Jansa
Quoted 8 lines · Khem Raj
Martin
The build failures are not due to luajit, they are due to lua itself being upgraded beyond 5.1 and its ABI incompatible. Its being highlighted
by luajit 2.1 most probbably, If the lua 5.1 reintroduction patch has been applied then we can look into the fact that lua 5.1 is chosen for these packages.
Quoted 5 lines
It's failing with this commit even without lua 5.2 upgrade.
And it's beta anyway, so I would like to revert this for jethro branch and then it can be re-applied in master when sysdig and devilspie are working correctly with it, ok?
for jethro thats fine, let me see this week if I can come up with a fix I was not getting the compile issues in my env so obviously I am missing something.
Quoted 219 lines
Quoted 204 lines
and yes the 32bit host dependencies has always been a requirement for luajit.
Quoted 194 lines · Martin Jansa
Was it needed for 2.0 as well? If yes, then I'll re-add it.
On Sun, Nov 8, 2015 at 9:32 PM, Andreas Müller <[email protected]
Quoted 182 lines
wrote:
Quoted 8 lines · Martin Jansa
This reverts commit
2ce3086aa859178fb5f7d6db9876229c8ed5a6eb.Causes sysdig and devilspie2 build failures.
Signed-off-by Martin Jansa <[email protected]>--- ...p-automatically-this-leaves-the-stripping.patch | 33 +++++++++++ meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56++++++++++++++++++
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 67----------------------
Quoted 2 lines
3 files changed, 89 insertions(+), 67 deletions(-) create mode 100644
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.1.bbdiff --git
a/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchb/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 4 lines
new file mode 100644
index 0000000..f123b3f
---/dev/null
+++
b/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patchQuoted 12 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +11
-0@@ -0,0 +1,33 @@ +From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 May 2013 10:42:45 -0700 +Subject: [PATCH] Do not strip automatically, this leaves the stripping + busines to OE + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 2 --meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 21
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +10
-0+ 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 278324a..5ecd6d5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -665,12 +665,10 @@ $(LUAJIT_A): $(LJVMCORE_O) + $(LUAJIT_SO): $(LJVMCORE_O) + $(E) "DYNLINK $@" + $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO)$(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
Quoted 5 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +5
-0+- $(Q)$(TARGET_STRIP) $@ + + $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) + $(E) "LINK $@" + $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O)$(TARGET_O) $(TARGET_ALIBS)
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch line 33
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +4
-0+- $(Q)$(TARGET_STRIP) $@ + $(E) "OK Successfully built LuaJIT" + +##############################################################################
Review
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file +3
-0+-- +1.7.9.5 +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 3
Quoted 8 lines
new file mode 100644
index 0000000..4a15a4emeta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0@@ -0,0 +1,56 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb line 11
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +4
-0+HOMEPAGE = "http://luajit.org" + +SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ +file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
Quoted 3 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +3
-0+" +SRC_URI[md5sum] = "dd9c38307f2223a504cbfb96e477eca0" +SRC_URI[sha256sum] ="
620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d"Review
Quoted 47 lines
meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb new file +46
-0+ +S = "${WORKDIR}/LuaJIT-${PV}" + +inherit pkgconfig binconfig + +BBCLASSEXTEND = "native" + +do_configure_prepend() { + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile + sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile +} + +EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ + TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ + TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ + TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_powerpc64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rmdir ${D}${datadir}/lua/5.* \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.* \ + ${D}${libdir}/lua +} + +PACKAGES += 'luajit-common' + +FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ + ${libdir}/libluajit-5.1.so.${PV} \ +" +FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" +(quoted diff) +0
-0b/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 3
Quoted 8 lines
deleted file mode 100644
index 5cee532..0000000meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-3@@ -1,67 +0,0 @@ -SUMMARY = "Just-In-Time Compiler for Lua" -LICENSE = "MIT" -LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=3992f1fbae3b8b061f9056b7fcda8cc6"
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-HOMEPAGE = "http://luajit.org" - -SRCREV = "776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de" -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v${PV} \
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-9-" - -SPIN = ".0-beta1" - -S = "${WORKDIR}/git" - -inherit pkgconfig binconfig - -BBCLASSEXTEND = "native"meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 10 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-10- -do_configure_prepend() { - sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile - sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile -} - -EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \ - TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \ - TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \ - TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"TARGET_STRIP="/bin/echo"'
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 27
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-Would it be a big issue to re-add comment below - I was not aware of the build host requirements and there could be other users
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 28
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# Important note: On the build machine bit compatible glibc-dev andlibgcc must
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 29
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# be installed. E.g if the target architecture has 32 bit (see '-m32'below),
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 30
Quoted 1 line
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-1-# 32 bit versions of glibc-dev/libgcc (e.g glibc-devel.i686 /libgcc.i686 on
meta-oe/recipes-devtools/luajit/luajit_2.1.bb
Quoted 4 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-4-# fedora) are required. -# -# Otherwise the following error occurs: -# | /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No suchfile or directory
Quoted 9 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb line 36
Quoted 2 lines
meta-oe/recipes-devtools/luajit/luajit_2.1.bb deleted +0
-2-# | # include <gnu/stubs-32.h> -Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel