mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 13:00:02 +00:00
Code Issues Projects Releases Wiki Activity

luajit: Upgrade to 2.1 beta1

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2015-10-19 21:29:19 -07:00
committed by Martin Jansa
parent 77582ef1be
commit 2ce3086aa8
2 changed files with 9 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
-33
View File
@@ -1,33 +0,0 @@
From 528009f5ca0685c95ef27f6c8957160499c0576a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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 → meta-oe/recipes-devtools/luajit/luajit_2.1.bb
+9 -8
View File
@@ -3,13 +3,13 @@ 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 \
SRCREV = "776c6935ed807fc3b1ee6cd89a0cf682ffb7e9de"
SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v${PV} \
"
SRC_URI[md5sum] = "dd9c38307f2223a504cbfb96e477eca0"
SRC_URI[sha256sum] = "620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d"
S = "${WORKDIR}/LuaJIT-${PV}"
SPIN = ".0-beta1"
S = "${WORKDIR}/git"
inherit pkgconfig binconfig
@@ -23,7 +23,7 @@ do_configure_prepend() {
EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \
TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"'
TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_STRIP="/bin/echo"'
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}"'
@@ -36,7 +36,8 @@ do_compile () {
}
do_install () {
oe_runmake 'DESTDIR=${D}' install
oe_runmake 'DESTDIR=${D}' 'TARGET_STRIP=/bin/echo' install
ln -s ${bindir}/${BPN}-${PV}${SPIN} ${D}${bindir}/luajit
rmdir ${D}${datadir}/lua/5.* \
${D}${datadir}/lua \
${D}${libdir}/lua/5.* \
@@ -52,5 +53,5 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
${libdir}/libluajit-5.1.so \
${libdir}/pkgconfig/luajit.pc \
"
FILES_luajit-common = "${datadir}/${BPN}-${PV}"
FILES_luajit-common = "${datadir}/${BPN}-${PV}${SPIN}"