From ffd44c925d1306e64fe920a7718f59ea23229732 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 2 Mar 2012 09:44:36 +0100 Subject: [PATCH] lua: build host and fix target package Signed-off-by: Stephan Raue --- packages/lang/lua/build | 52 +++++++++++++++++++++++++++++------------ packages/lang/lua/meta | 2 +- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/packages/lang/lua/build b/packages/lang/lua/build index 68bba2f219..a75045dcbc 100755 --- a/packages/lang/lua/build +++ b/packages/lang/lua/build @@ -24,20 +24,42 @@ cd $PKG_BUILD -make -C src \ - INSTALL_TOP=/usr \ - PLAT=linux \ - CC=$TARGET_CC \ - AR="$TARGET_AR rcu" \ - RANLIB=$TARGET_RANLIB \ - liblua.a +# build and install host packages + setup_toolchain host -mkdir -p $SYSROOT_PREFIX/usr/lib - cp src/liblua.a $SYSROOT_PREFIX/usr/lib + cp -R src src.host + make -C src.host \ + INSTALL_TOP=/usr \ + PLAT=linux \ + CC="$HOST_CC" \ + AR="$HOST_AR rcu" \ + RANLIB="$HOST_RANLIB" \ + CFLAGS="$HOST_CFLAGS" \ + LDFLAGS="$HOST_LDFLAGS" \ + linux -mkdir -p $SYSROOT_PREFIX/usr/include - cp src/lua.h $SYSROOT_PREFIX/usr/include - cp src/luaconf.h $SYSROOT_PREFIX/usr/include - cp src/lualib.h $SYSROOT_PREFIX/usr/include - cp src/lauxlib.h $SYSROOT_PREFIX/usr/include - cp etc/lua.hpp $SYSROOT_PREFIX/usr/include + mkdir -p $ROOT/$TOOLCHAIN/bin + cp -P src.host/lua $ROOT/$TOOLCHAIN/bin + cp -P src.host/luac $ROOT/$TOOLCHAIN/bin + +# build and install target packages + setup_toolchain target + + make -C src \ + INSTALL_TOP=/usr \ + PLAT=linux \ + CC="$TARGET_CC" \ + CFLAGS="$TARGET_CFLAGS" \ + AR="$TARGET_AR rcu" \ + RANLIB="$TARGET_RANLIB" \ + liblua.a + + mkdir -p $SYSROOT_PREFIX/usr/lib + cp src/liblua.a $SYSROOT_PREFIX/usr/lib + + mkdir -p $SYSROOT_PREFIX/usr/include + cp src/lua.h $SYSROOT_PREFIX/usr/include + cp src/luaconf.h $SYSROOT_PREFIX/usr/include + cp src/lualib.h $SYSROOT_PREFIX/usr/include + cp src/lauxlib.h $SYSROOT_PREFIX/usr/include + cp src/lua.hpp $SYSROOT_PREFIX/usr/include diff --git a/packages/lang/lua/meta b/packages/lang/lua/meta index 7e4f942e54..a234892bfe 100644 --- a/packages/lang/lua/meta +++ b/packages/lang/lua/meta @@ -26,7 +26,7 @@ PKG_LICENSE="MIT" PKG_SITE="http://www.lua.org/" PKG_URL="http://www.lua.org/ftp/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS="toolchain readline-host" PKG_PRIORITY="optional" PKG_SECTION="lang" PKG_SHORTDESC="lua: A lightweight, extensible programming language"