From 7701cc07d33be08766c48f156bf3fad8a3da2be8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 11 Mar 2014 20:20:07 -0700 Subject: luajit: Upgrade to 2.0.1 -> 2.0.2 Drop the backported hotfixes Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/luajit/luajit_2.0.1.bb | 58 ------------------------- meta-oe/recipes-devtools/luajit/luajit_2.0.2.bb | 54 +++++++++++++++++++++++ 2 files changed, 54 insertions(+), 58 deletions(-) delete mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.1.bb create mode 100644 meta-oe/recipes-devtools/luajit/luajit_2.0.2.bb (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.1.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.1.bb deleted file mode 100644 index 36ec58f5fd..0000000000 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.1.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Just-In-Time Compiler for Lua" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1793ef52a5d577794cd886a501a7f861" -HOMEPAGE = "http://luajit.org" - -DEPENDS += "lua5.1" -SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz;name=tarball \ - file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - http://luajit.org/download/v2.0.1_hotfix1.patch;name=hotfix1 \ - " -SRC_URI_append_fslmachine = " file://ppc-fixplt.patch " - -SRC_URI[tarball.md5sum] = "85e406e8829602988eb1233a82e29f1f" -SRC_URI[tarball.sha256sum] = "2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0" - -SRC_URI[hotfix1.md5sum] = "5186c5901e37679a3c835d7b7cdac88e" -SRC_URI[hotfix1.sha256sum] = "143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368" - -S = "${WORKDIR}/LuaJIT-${PV}" - -inherit pkgconfig binconfig - -do_configure_prepend() { - sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile - sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile -} - -EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} TARGET_CFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' -EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' -EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' -EXTRA_OEMAKE_append_i586 = ' HOST_CC="${BUILD_CC} -m32"' -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.1 \ - ${D}${datadir}/lua \ - ${D}${libdir}/lua/5.1 \ - ${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}" - diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.2.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.2.bb new file mode 100644 index 0000000000..b719b48e09 --- /dev/null +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.2.bb @@ -0,0 +1,54 @@ +SUMMARY = "Just-In-Time Compiler for Lua" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1793ef52a5d577794cd886a501a7f861" +HOMEPAGE = "http://luajit.org" + +DEPENDS += "lua5.1" +SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz;name=tarball \ + file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ + " +SRC_URI[tarball.md5sum] = "112dfb82548b03377fbefbba2e0e3a5b" +SRC_URI[tarball.sha256sum] = "c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38" + +SRC_URI_append_fslmachine = " file://ppc-fixplt.patch " + +S = "${WORKDIR}/LuaJIT-${PV}" + +inherit pkgconfig binconfig + +do_configure_prepend() { + sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile + sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile +} + +EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} TARGET_CFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"' +EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"' +EXTRA_OEMAKE_append_i586 = ' HOST_CC="${BUILD_CC} -m32"' +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.1 \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.1 \ + ${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}" + -- cgit 1.2.3-korg