summaryrefslogtreecommitdiff
path: root/packages/lua
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2004-12-28 20:40:06 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2004-12-28 20:40:06 +0000
commitf91749f66496a291e4f6f610d58ec0ed90e2adf5 (patch)
treee6e2b336ca124e46b433858fb3259ad4871e5414 /packages/lua
parent42ef6052de33e911df212fee206aa93c6c06fdc1 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/28 21:36:39+01:00 handhelds.org!zecke Kaffe CVS: make it use OEs' version of libtool 2004/12/28 21:13:21+01:00 handhelds.org!zecke Introduce Kaffe a Java like Virtual Machine with a Qt backend 2004/12/28 12:05:03-08:00 (none)!emte updated imlib2 and imlib2-native 2004/12/28 20:26:48+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/12/28 14:08:35-06:00 ti.com!kergoth Add ion (version 3, development snapshot), a tiling tabbed window manager designed with keyboard users in mind. Currently flagged as BROKEN, as it seems to require the X input method bits, which aren't in diet-x11. 2004/12/28 14:07:18-06:00 ti.com!kergoth Make lua inherit binconfig, stage & install lauxlib.h, and add lua-native. 2004/12/28 14:06:13-06:00 ti.com!kergoth Add readline-native, which is needed by lua-native. 2004/12/28 20:26:27+01:00 uni-frankfurt.de!mickeyl zlib: fix compile choking on //ZEXTERN BKrev: 41d1c4a6IDf8-4b8w7C-40li4fF87w
Diffstat (limited to 'packages/lua')
-rw-r--r--packages/lua/lua-build.inc2
-rw-r--r--packages/lua/lua-native_5.0.2.bb0
-rw-r--r--packages/lua/lua.inc3
-rw-r--r--packages/lua/lua_5.0.2.bb4
4 files changed, 5 insertions, 4 deletions
diff --git a/packages/lua/lua-build.inc b/packages/lua/lua-build.inc
index fed15f1841..0758e611cf 100644
--- a/packages/lua/lua-build.inc
+++ b/packages/lua/lua-build.inc
@@ -25,7 +25,7 @@ do_compile () {
do_stage () {
oe_libinstall -C lib liblua ${STAGING_LIBDIR}/
oe_libinstall -C lib liblualib ${STAGING_LIBDIR}/
- install -m 0644 include/lua.h include/lualib.h ${STAGING_INCDIR}/
+ install -m 0644 include/lua.h include/lualib.h include/lauxlib.h ${STAGING_INCDIR}/
}
do_install () {
diff --git a/packages/lua/lua-native_5.0.2.bb b/packages/lua/lua-native_5.0.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lua/lua-native_5.0.2.bb
diff --git a/packages/lua/lua.inc b/packages/lua/lua.inc
index 652491d522..e93fef44b2 100644
--- a/packages/lua/lua.inc
+++ b/packages/lua/lua.inc
@@ -3,7 +3,6 @@ for extending applications."
LICENSE = "MIT"
HOMEPAGE = "http://www.lua.org/"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS += "readline"
PACKAGES = "${PN} liblua ${PN}-doc liblua-dev \
liblualib liblualib-dev"
@@ -14,7 +13,7 @@ FILES_liblua-dev = "${libdir}/liblua.so ${libdir}/liblua.a \
${includedir}/lua.h"
FILES_liblualib = "${libdir}/liblualib.so.*"
FILES_liblualib-dev = "${libdir}/liblualib.so ${libdir}/liblualib.a \
- ${includedir}/lualib.h"
+ ${includedir}/lualib.h ${includedir}/lauxlib.h"
SECTION_${PN} = "interpreters"
SECTION_${PN}-doc = "doc"
SECTION_liblua = "libs"
diff --git a/packages/lua/lua_5.0.2.bb b/packages/lua/lua_5.0.2.bb
index 05266eba0a..570659af97 100644
--- a/packages/lua/lua_5.0.2.bb
+++ b/packages/lua/lua_5.0.2.bb
@@ -1,6 +1,7 @@
include lua.inc
-PR = "r1"
+DEPENDS += "readline"
+PR = "r3"
SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
file://debian.patch;patch=1 \
file://make.patch;patch=1 \
@@ -10,3 +11,4 @@ S = "${WORKDIR}/lua-${PV}"
FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files"
include lua-build.inc
+inherit binconfig