summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
l---------335.lua.build (renamed from 335.make.build)0
l---------336.make.build (renamed from 336.mksh.build)0
l---------337.mksh.build (renamed from 337.nano.build)0
-rw-r--r--337.mksh.vars (renamed from 336.mksh.vars)0
l---------338.nano.build (renamed from 338.netcat.build)0
l---------339.netcat.build (renamed from 339.openssh.build)0
-rw-r--r--339.netcat.vars (renamed from 338.netcat.vars)0
l---------340.openssh.build (renamed from 340.pacman.build)0
l---------341.pacman.build (renamed from 341.patch.build)0
l---------342.patch.build (renamed from 342.perl.build)0
l---------343.perl.build (renamed from 343.python3.build)0
-rw-r--r--343.perl.vars (renamed from 342.perl.vars)0
l---------344.python3.build (renamed from 344.rsync.build)0
-rw-r--r--344.python3.vars (renamed from 343.python3.vars)0
l---------345.rsync.build (renamed from 345.sed.build)0
l---------346.sed.build (renamed from 346.tar.build)0
l---------347.tar.build (renamed from 347.tcsh.build)0
l---------348.tcsh.build (renamed from 348.util_linux.build)0
l---------349.util_linux.build (renamed from 349.which.build)0
-rw-r--r--349.util_linux.vars (renamed from 348.util_linux.vars)0
l---------350.which.build (renamed from 350.zsh.build)0
l---------351.zsh.build1
-rw-r--r--build.vars10
-rw-r--r--lua-5.3.3.local.patch114
24 files changed, 124 insertions, 1 deletions
diff --git a/335.make.build b/335.lua.build
index 52bb82e5..52bb82e5 120000
--- a/335.make.build
+++ b/335.lua.build
diff --git a/336.mksh.build b/336.make.build
index 52bb82e5..52bb82e5 120000
--- a/336.mksh.build
+++ b/336.make.build
diff --git a/337.nano.build b/337.mksh.build
index 52bb82e5..52bb82e5 120000
--- a/337.nano.build
+++ b/337.mksh.build
diff --git a/336.mksh.vars b/337.mksh.vars
index b7b4582f..b7b4582f 100644
--- a/336.mksh.vars
+++ b/337.mksh.vars
diff --git a/338.netcat.build b/338.nano.build
index 52bb82e5..52bb82e5 120000
--- a/338.netcat.build
+++ b/338.nano.build
diff --git a/339.openssh.build b/339.netcat.build
index 52bb82e5..52bb82e5 120000
--- a/339.openssh.build
+++ b/339.netcat.build
diff --git a/338.netcat.vars b/339.netcat.vars
index e9bd7e18..e9bd7e18 100644
--- a/338.netcat.vars
+++ b/339.netcat.vars
diff --git a/340.pacman.build b/340.openssh.build
index 52bb82e5..52bb82e5 120000
--- a/340.pacman.build
+++ b/340.openssh.build
diff --git a/341.patch.build b/341.pacman.build
index 52bb82e5..52bb82e5 120000
--- a/341.patch.build
+++ b/341.pacman.build
diff --git a/342.perl.build b/342.patch.build
index 52bb82e5..52bb82e5 120000
--- a/342.perl.build
+++ b/342.patch.build
diff --git a/343.python3.build b/343.perl.build
index 52bb82e5..52bb82e5 120000
--- a/343.python3.build
+++ b/343.perl.build
diff --git a/342.perl.vars b/343.perl.vars
index 23604795..23604795 100644
--- a/342.perl.vars
+++ b/343.perl.vars
diff --git a/344.rsync.build b/344.python3.build
index 52bb82e5..52bb82e5 120000
--- a/344.rsync.build
+++ b/344.python3.build
diff --git a/343.python3.vars b/344.python3.vars
index c987c798..c987c798 100644
--- a/343.python3.vars
+++ b/344.python3.vars
diff --git a/345.sed.build b/345.rsync.build
index 52bb82e5..52bb82e5 120000
--- a/345.sed.build
+++ b/345.rsync.build
diff --git a/346.tar.build b/346.sed.build
index 52bb82e5..52bb82e5 120000
--- a/346.tar.build
+++ b/346.sed.build
diff --git a/347.tcsh.build b/347.tar.build
index 52bb82e5..52bb82e5 120000
--- a/347.tcsh.build
+++ b/347.tar.build
diff --git a/348.util_linux.build b/348.tcsh.build
index 52bb82e5..52bb82e5 120000
--- a/348.util_linux.build
+++ b/348.tcsh.build
diff --git a/349.which.build b/349.util_linux.build
index 52bb82e5..52bb82e5 120000
--- a/349.which.build
+++ b/349.util_linux.build
diff --git a/348.util_linux.vars b/349.util_linux.vars
index 20f843c4..20f843c4 100644
--- a/348.util_linux.vars
+++ b/349.util_linux.vars
diff --git a/350.zsh.build b/350.which.build
index 52bb82e5..52bb82e5 120000
--- a/350.zsh.build
+++ b/350.which.build
diff --git a/351.zsh.build b/351.zsh.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/351.zsh.build
@@ -0,0 +1 @@
+pkg.build \ No newline at end of file
diff --git a/build.vars b/build.vars
index e9cc2410..ef7fee31 100644
--- a/build.vars
+++ b/build.vars
@@ -52,7 +52,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
: ${WGET_ARGS:="--no-check-certificate"};
: ${WORKDIR:=${PREFIX}/tmp};
-: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libfetch libffi libnbcompat libressl libz make mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh util_linux which xz zsh"};
+: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libfetch libffi libnbcompat libressl libz lua make mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh util_linux which xz zsh"};
: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AR_INSTALL AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_BUILD RANLIB_INSTALL SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"};
: ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
: ${PKG_LVL0_CONFIGURE_ARGS:="-C --disable-nls --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
@@ -237,6 +237,14 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
: ${PKG_LIBZ_SHA256SUM:=33e65f22ec3d3e3f87436e53f82eb114054cd3aa373dc0480625dd92806fd9a0};
: ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
: ${PKG_LIBZ_CONFIGURE_ARGS:=--host=${HOST_NATIVE} --prefix= --target=${TARGET}};
+: ${PKG_LUA_VERSION:=5.3.3};
+: ${PKG_LUA_SHA256SUM:=5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2};
+: ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz};
+: ${PKG_LUA_AR_BUILD:=${HOST_NATIVE}-ar};
+: ${PKG_LUA_BUILD_DIR=lua-5.3.3};
+: ${PKG_LUA_CC_BUILD:=${HOST_NATIVE}-gcc};
+: ${PKG_LUA_MAKEFLAGS_BUILD_EXTRA:=midipix};
+: ${PKG_LUA_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_TOP=${PREFIX_LVL3}};
: ${PKG_MAKE_VERSION:=3.81};
: ${PKG_MAKE_SHA256SUM:=f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8};
: ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.bz2};
diff --git a/lua-5.3.3.local.patch b/lua-5.3.3.local.patch
new file mode 100644
index 00000000..fe0e4aa4
--- /dev/null
+++ b/lua-5.3.3.local.patch
@@ -0,0 +1,114 @@
+--- lua-5.3.3/src/luaconf.h.orig 2016-05-01 20:06:09.000000000 +0000
++++ lua-5.3.3/src/luaconf.h 2016-06-23 10:02:23.471604030 +0000
+@@ -72,6 +72,12 @@
+ #endif
+
+
++#if defined(LUA_USE_MIDIPIX)
++#define LUA_USE_POSIX
++#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
++#endif
++
++
+ /*
+ @@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
+ ** C89 ('long' and 'double'); Windows always has '__int64', so it does
+@@ -188,7 +194,7 @@
+
+ #else /* }{ */
+
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "/usr/"
+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
+ #define LUA_PATH_DEFAULT \
+--- lua-5.3.3/src/Makefile.orig 2015-05-27 11:10:11.000000000 +0000
++++ lua-5.3.3/src/Makefile 2016-06-23 10:08:36.751595745 +0000
+@@ -26,9 +26,10 @@
+
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+
+-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
++PLATS= aix bsd c89 freebsd generic linux macosx midipix 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_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.
+@@ -56,9 +57,14 @@
+ a: $(ALL_A)
+
+ $(LUA_A): $(BASE_O)
+- $(AR) $@ $(BASE_O)
++ $(AR) rcs $@ $(BASE_O)
+ $(RANLIB) $@
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+@@ -112,6 +118,9 @@
+ macosx:
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc
+
++midipix:
++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MIDIPIX" SYSLIBS="-Wl,-E -ldl"
++
+ mingw:
+ $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \
+ "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+--- lua-5.3.3/Makefile.orig 2016-01-14 01:13:47.000000000 +0000
++++ lua-5.3.3/Makefile 2016-06-23 10:14:59.643587247 +0000
+@@ -36,23 +36,24 @@
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+
+ # Convenience platforms targets.
+-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
++PLATS= aix bsd c89 freebsd generic linux macosx midipix mingw posix solaris
++
++# Lua version and release.
++V= 5.3
++R= $V.3
+
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+ TO_LIB= liblua.a
++TO_LIBSO= liblua.so liblua.so.$V
+ TO_MAN= lua.1 luac.1
+
+-# Lua version and release.
+-V= 5.3
+-R= $V.3
+-
+ # Targets start here.
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua -v
+@@ -62,6 +63,7 @@
+ cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
++ cd src && $(INSTALL_EXEC) $(TO_LIBSO) $(INSTALL_LIB)
+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+
+ uninstall: