mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
updates versions for gmp, lua, tcl, mercurial
This commit is contained in:
Jerome Duval
66
dev-lang/lua/lua-5.2.3.recipe
Normal file
66
dev-lang/lua/lua-5.2.3.recipe
Normal file
@@ -0,0 +1,66 @@
|
||||
SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
|
||||
HOMEPAGE="http://www.lua.org"
|
||||
SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d"
|
||||
REVISION="1"
|
||||
ARCHITECTURES="x86 x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
PROVIDES="
|
||||
lua$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
cmd:lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
|
||||
devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2
|
||||
"
|
||||
|
||||
REQUIRES_devel="
|
||||
lua$secondaryArchSuffix == $portVersion
|
||||
"
|
||||
|
||||
PATCHES="lua-$portVersion.patchset"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
make haiku MYCFLAGS="-DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/5.2/\"'"
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \
|
||||
INSTALL_INC="$includeDir/lua52" INSTALL_LMOD="$dataDir/lua/5.2" \
|
||||
INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
|
||||
|
||||
ln -s liblua.so $libDir/liblua.so.5.2
|
||||
ln -s liblua.a $libDir/liblua52.a
|
||||
|
||||
mv $binDir/lua $binDir/lua5.2
|
||||
ln -s $binDir/lua5.2 $binDir/lua
|
||||
|
||||
prepareInstalledDevelLib liblua
|
||||
prepareInstalledDevelLib liblua52
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
LICENSE="MIT"
|
||||
COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
|
||||
DESCRIPTION="
|
||||
Lua combines simple procedural syntax with powerful data description \
|
||||
constructs based on associative arrays and extensible semantics. Lua is \
|
||||
dynamically typed, runs by interpreting bytecode for a register-based virtual \
|
||||
machine, and has automatic memory management with incremental garbage \
|
||||
collection, making it ideal for configuration, scripting, and rapid prototyping.
|
||||
"
|
||||
113
dev-lang/lua/patches/lua-5.2.3.patchset
Normal file
113
dev-lang/lua/patches/lua-5.2.3.patchset
Normal file
@@ -0,0 +1,113 @@
|
||||
From 95be65d7676d75b778defff51dd110e31644d499 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 5 May 2014 15:59:15 +0000
|
||||
Subject: import patch from 5.2.1
|
||||
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d2c7db4..baa4521 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -36,12 +36,12 @@ RM= rm -f
|
||||
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
|
||||
|
||||
# Convenience platforms targets.
|
||||
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
||||
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
|
||||
|
||||
# What to install.
|
||||
TO_BIN= lua luac
|
||||
TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
|
||||
-TO_LIB= liblua.a
|
||||
+TO_LIB= liblua.a liblua.so
|
||||
TO_MAN= lua.1 luac.1
|
||||
|
||||
# Lua version and release.
|
||||
@@ -52,7 +52,7 @@ R= $V.3
|
||||
all: $(PLAT)
|
||||
|
||||
$(PLATS) clean:
|
||||
- cd src && $(MAKE) $@
|
||||
+ cd src && $(MAKE) V=$(V) $@
|
||||
|
||||
test: dummy
|
||||
src/lua -v
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 7b4b2b7..8edc5d6 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -26,9 +26,10 @@ MYOBJS=
|
||||
|
||||
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
|
||||
|
||||
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
||||
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
|
||||
|
||||
LUA_A= liblua.a
|
||||
+LUA_SO= liblua.so
|
||||
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
|
||||
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
|
||||
ltm.o lundump.o lvm.o lzio.o
|
||||
@@ -43,7 +44,7 @@ LUAC_T= luac
|
||||
LUAC_O= luac.o
|
||||
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
|
||||
ALL_A= $(LUA_A)
|
||||
|
||||
# Targets start here.
|
||||
@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
|
||||
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
||||
|
||||
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||
+ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS)
|
||||
+
|
||||
clean:
|
||||
$(RM) $(ALL_T) $(ALL_O)
|
||||
|
||||
@@ -102,6 +106,9 @@ freebsd:
|
||||
|
||||
generic: $(ALL)
|
||||
|
||||
+haiku:
|
||||
+ $(MAKE) all SYSCFLAGS="-DLUA_USE_HAIKU" LIBS=
|
||||
+
|
||||
linux:
|
||||
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
|
||||
|
||||
diff --git a/src/luaconf.h b/src/luaconf.h
|
||||
index 18be9a9..1cce188 100644
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -38,7 +38,12 @@
|
||||
#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */
|
||||
#endif
|
||||
|
||||
-
|
||||
+#if defined(LUA_USE_HAIKU)
|
||||
+#define LUA_USE_MKSTEMP
|
||||
+#define LUA_USE_ISATTY
|
||||
+#define LUA_USE_POPEN
|
||||
+#define LUA_USE_DLOPEN
|
||||
+#endif
|
||||
|
||||
#if defined(LUA_USE_LINUX)
|
||||
#define LUA_USE_POSIX
|
||||
@@ -100,8 +105,12 @@
|
||||
#else /* }{ */
|
||||
|
||||
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
|
||||
+#ifndef LUA_ROOT
|
||||
#define LUA_ROOT "/usr/local/"
|
||||
+#endif
|
||||
+#ifndef LUA_LDIR
|
||||
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
|
||||
+#endif
|
||||
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
|
||||
#define LUA_PATH_DEFAULT \
|
||||
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user