diff options
| -rw-r--r-- | meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb (renamed from meta-oe/recipes-devtools/luajit/luajit_2.1.bb) | 27 |
2 files changed, 41 insertions, 19 deletions
diff --git a/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch b/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch new file mode 100644 index 00000000000..f123b3f55a5 --- /dev/null +++ b/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch @@ -0,0 +1,33 @@ +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 + diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.1.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb index 5cee53267c9..4a15a4e1b73 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.1.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb @@ -3,13 +3,13 @@ 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} \ +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" -SPIN = ".0-beta1" - -S = "${WORKDIR}/git" +S = "${WORKDIR}/LuaJIT-${PV}" inherit pkgconfig binconfig @@ -23,17 +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_STRIP="/bin/echo"' - -# 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> - + 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}"' @@ -46,8 +36,7 @@ do_compile () { } do_install () { - oe_runmake 'DESTDIR=${D}' 'TARGET_STRIP=/bin/echo' install - ln -s ${bindir}/${BPN}-${PV}${SPIN} ${D}${bindir}/luajit + oe_runmake 'DESTDIR=${D}' install rmdir ${D}${datadir}/lua/5.* \ ${D}${datadir}/lua \ ${D}${libdir}/lua/5.* \ @@ -63,5 +52,5 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ ${libdir}/libluajit-5.1.so \ ${libdir}/pkgconfig/luajit.pc \ " -FILES_luajit-common = "${datadir}/${BPN}-${PV}${SPIN}" +FILES_luajit-common = "${datadir}/${BPN}-${PV}" |