#!/usr/bin/env perl use FindBin; use lib "$FindBin::Bin"; use strict; use metadata; use Getopt::Long; my %board; sub version_to_num($) { my $str = shift; my $num = 0; if (defined($str) && $str =~ /^\d+(?:\.\d+)+$/) { my @n = (split(/\./, $str), 0, 0, 0, 0); $num = ($n[0] << 24) | ($n[1] << 16) | ($n[2] << 8) | $n[3]; } return $num; } sub version_filter_list(@) { my $cmpver = version_to_num(shift @_); my @items; foreach my $item (@_) { if ($item =~ s/@(lt|le|gt|ge|eq|ne)(\d+(?:\.\d+)+)\b//) { my $op = $1; my $symver = version_to_num($2); if ($symver > 0 && $cmpver > 0) { next unless (($op eq 'lt' && $cmpver < $symver) || ($op eq 'le' && $cmpver <= $symver) || ($op eq 'gt' && $cmpver > $symver) || ($op eq 'ge' && $cmpver >= $symver) || ($op eq 'eq' && $cmpver == $symver) || ($op eq 'ne' && $cmpver != $symver)); } } push @items, $item; } return @items; } sub gen_kconfig_overrides() { my %config; my %kconfig; my $package; my $pkginfo = shift @ARGV; my $cfgfile = shift @ARGV; my $patchver = shift @ARGV; # parameter 2: build system config open FILE, "<$cfgfile" or return; while () { /^(CONFIG_.+?)=(.+)$/ and $config{$1} = 1; } close FILE; # parameter 1: package metadata open FILE, "<$pkginfo" or return; while () { /^Package:\s*(.+?)\s*$/ and $package = $1; /^Kernel-Config:\s*(.+?)\s*$/ and do { my @config = split /\s+/, $1; foreach my $config (version_filter_list($patchver, @config)) { my $val = 'm'; my $override; if ($config =~ /^(.+?)=(.+)$/) { $config = $1; $override = 1; $val = $2; } if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) { next if $kconfig{$config} eq 'y'; $kconfig{$config} = $val; } elsif (!$override) { $kconfig{$config} or $kconfig{$config} = 'n'; } } }; }; close FILE; foreach my $kconfig (sort keys %kconfig) { if ($kconfig{$kconfig} eq 'n') { print "# $kconfig is not set\n"; } else { print "$kconfig=$kconfig{$kconfig}\n"; } } } my %dep_check; sub __find_package_dep($$) { my $pkg = shift; my $name = shift; my $deps = $pkg->{depends}; return 0 unless defined $deps; foreach my $vpkg (@{$deps}) { foreach my $dep (@{$vpackage{$vpkg}}) { next if $dep_check{$dep->{name}}; $dep_check{$dep->{name}} = 1; return 1 if $dep->{name} eq $name; return 1 if (__find_package_dep($dep, $name) == 1); } } return 0; } # wrapper to avoid infinite recursion sub find_package_dep($$) { my $pkg = shift; my $name = shift; %dep_check = (); return __find_package_dep($pkg, $name); } sub package_depends($$) { my $a = shift; my $b = shift; my $ret; return 0 if ($a->{submenu} ne $b->{submenu}); if (find_package_dep($a, $b->{name}) == 1) { $ret = 1; } elsif (find_package_dep($b, $a->{name}) == 1) { $ret = -1; } else { return 0; } return $ret; } sub mconf_depends { my $pkgname = shift; my $depends = shift; my $only_dep = shift; my $res; my $dep = shift; my $seen = shift; my $parent_condition = shift; $dep or $dep = {}; $seen or $seen = {}; my @t_depends; $depends or return; my @depends = @$depends; foreach my $depend (@depends) { my $m = "depends on"; my $flags = ""; $depend =~ s/^([@\+]+)// and $flags = $1; my $condition = $parent_condition; next if $condition eq $depend; next if $seen->{"$parent_condition:$depend"}; next if $seen->{":$depend"}; $seen->{"$parent_condition:$depend"} = 1; if ($depend =~ /^(.+):(.+)$/) { if ($1 ne "PACKAGE_$pkgname") { if ($condition) { $condition = "$condition && $1"; } else { $condition = $1; } } $depend = $2; } if ($flags =~ /\+/) { my $vdep = $vpackage{$depend}; if ($vdep) { my @vdeps; foreach my $v (@$vdep) { next if $v->{buildonly}; if ($v->{variant_default}) { unshift @vdeps, $v->{name}; } else { push @vdeps, $v->{name}; } } $depend = shift @vdeps; if (@vdeps > 1) { $condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')'; } elsif (@vdeps > 0) { $condition = ($condition ? "$condition && " : '') . '!PACKAGE_'.$vdeps[0]; } } # Menuconfig will not treat 'select FOO' as a real dependency # thus if FOO depends on other config options, these dependencies # will not be checked. To fix this, we simply emit all of FOO's # depends here as well. $package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ]; $m = "select"; next if $only_dep; $flags =~ /@/ or $depend = "PACKAGE_$depend"; } else { my $vdep = $vpackage{$depend}; if ($vdep && @$vdep > 0) { $depend = join("||", map { "PACKAGE_".$_->{name} } @$vdep); } else { $flags =~ /@/ or $depend = "PACKAGE_$depend"; } } if ($condition) { if ($m =~ /select/) { next if $depend eq $condition; $depend = "$depend if $condition"; } else { next if $dep->{"$depend if $condition"}; $depend = "!($condition) || $depend" unless $dep->{$condition} eq 'select'; } } $dep->{$depend} =~ /select/ or $dep->{$depend} = $m; } foreach my $tdep (@t_depends) { mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]); } foreach my $depend (keys %$dep) { my $m = $dep->{$depend}; $res .= "\t\t$m $depend\n"; } return $res; } sub mconf_conflicts { my $pkgname = shift; my $depends = shift; my $res = ""; foreach my $depend (@$depends) { next unless $package{$depend}; $res .= "\t\tdepends on m || (PACKAGE_$depend != y)\n"; } return $res; } sub print_package_config_category($) { my $cat = shift; my %menus; my %menu_dep; return unless $category{$cat}; print "menu \"$cat\"\n\n"; my %spkg = %{$category{$cat}}; foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) { foreach my $pkg (@{$spkg{$spkg}}) { next if $pkg->{buildonly}; my $menu = $pkg->{submenu}; if ($menu) { $menu_dep{$menu} or $menu_dep{$menu} = $pkg->{submenudep}; } else { $menu = 'undef'; } $menus{$menu} or $menus{$menu} = []; push @{$menus{$menu}}, $pkg; } } my @menus = sort { ($a eq 'undef' ? 1 : 0) or ($b eq 'undef' ? -1 : 0) or ($a cmp $b) } keys %menus; foreach my $menu (@menus) { my @pkgs = sort { package_depends($a, $b) or ($a->{name} cmp $b->{name}) } @{$menus{$menu}}; if ($menu ne 'undef') { $menu_dep{$menu} and print "if $menu_dep{$menu}\n"; print "menu \"$menu\"\n"; } foreach my $pkg (@pkgs) { next if $pkg->{src}{ignore}; my $title = $pkg->{name}; my $c = (72 - length($pkg->{name}) - length($pkg->{title})); if ($c > 0) { $title .= ("." x $c). " ". $pkg->{title}; } $title = "\"$title\""; print "\t"; $pkg->{menu} and print "menu"; print "config PACKAGE_".$pkg->{name}."\n"; $pkg->{hidden} and $title = ""; print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n"; print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n"; unless ($pkg->{hidden}) { my @def = ("ALL"); if (!exists($pkg->{repository})) { push @def, "ALL_NONSHARED"; } if ($pkg->{name} =~ /^kmod-/) { push @def, "ALL_KMODS"; } $pkg->{default} ||= "m if " . join("||", @def); } if ($pkg->{default}) { foreach my $default (split /\s*,\s*/, $pkg->{default}) { print "\t\tdefault $default\n"; } } print mconf_depends($pkg->{name}, $pkg->{depends}, 0); print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0); print mconf_conflicts($pkg->{name}, $pkg->{conflicts}); print "\t\thelp\n"; print $pkg->{description}; print "\n"; $pkg->{config} and print $pkg->{config}."\n"; } if ($menu ne 'undef') { print "endmenu\n"; $menu_dep{$menu} and print "endif\n"; } } print "endmenu\n\n"; undef $category{$cat}; } sub print_package_overrides() { keys %overrides > 0 or return; print "\tconfig OVERRIDE_PKGS\n"; print "\t\tstring\n"; print "\t\tdefault \"".join(" ", sort keys %overrides)."\"\n\n"; } sub gen_package_config() { parse_package_metadata($ARGV[0]) or exit 1; print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n"; print "source \"package/*/image-config.in\"\n"; if (scalar glob "package/feeds/*/*/image-config.in") { print "source \"package/feeds/*/*/image-config.in\"\n"; } print_pack
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,8 @@ PLATS= aix ansi bsd freebsd generic linu
 
 # What to install.
 TO_BIN= lua luac
-TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
+TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp lnum_config.h
+TO_LIB= liblua.a liblua.so.$R
 TO_MAN= lua.1 luac.1
 
 # Lua version and release.
@@ -63,6 +63,7 @@ install: dummy
 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+	ln -s liblua.so.$R $(INSTALL_LIB)/liblua.so
 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
 
 ranlib:
--- a/src/ldo.h
+++ b/src/ldo.h
@@ -46,7 +46,7 @@ LUAI_FUNC int luaD_pcall (lua_State *L, 
 LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
 LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
 LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
-LUAI_FUNC void luaD_growstack (lua_State *L, int n);
+LUA_API void luaD_growstack (lua_State *L, int n);
 
 LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
 LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
--- a/src/lfunc.h
+++ b/src/lfunc.h
@@ -18,7 +18,7 @@
                          cast(int, sizeof(TValue *)*((n)-1)))
 
 
-LUAI_FUNC Proto *luaF_newproto (lua_State *L);
+LUA_API Proto *luaF_newproto (lua_State *L);
 LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
 LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
 LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
--- a/src/lmem.h
+++ b/src/lmem.h
@@ -38,9 +38,9 @@
    ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
 
 
-LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
+LUA_API void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
                                                           size_t size);
-LUAI_FUNC void *luaM_toobig (lua_State *L);
+LUA_API void *luaM_toobig (lua_State *L);
 LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
                                size_t size_elem, int limit,
                                const char *errormsg);
--- a/src/lstring.h
+++ b/src/lstring.h
@@ -25,7 +25,7 @@
 
 LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
 LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
-LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+LUA_API TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
 
 
 #endif
--- a/src/lundump.h
+++ b/src/lundump.h
@@ -17,7 +17,7 @@ LUAI_FUNC Proto* luaU_undump (lua_State*
 LUAI_FUNC void luaU_header (char* h);
 
 /* dump one chunk; from ldump.c */
-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
+LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
 
 #ifdef luac_c
 /* print one chunk; from print.c */
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,6 +23,7 @@ MYLIBS=
 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 
 LUA_A=	liblua.a
+LUA_SO= liblua.so
 CORE_O=	lapi.o lcode.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 lnum.o
@@ -33,11 +34,12 @@ LUA_T=	lua
 LUA_O=	lua.o
 
 LUAC_T=	luac
-LUAC_O=	luac.o print.o
+LUAC_O=	luac.o print.o lopcodes.o
 
 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
 ALL_A= $(LUA_A)
+ALL_SO= $(LUA_SO)
 
 default: $(PLAT)
 
@@ -47,14 +49,23 @@ o:	$(ALL_O)
 
 a:	$(ALL_A)
 
+so:	$(ALL_SO)
+
 $(LUA_A): $(CORE_O) $(LIB_O)
 	$(AR) $@ $?
 	$(RANLIB) $@
 
-$(LUA_T): $(LUA_O) $(LUA_A)
-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+$(LUA_SO): $(CORE_O) $(LIB_O)
+	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
+	ln -fs $@.$(PKG_VERSION) $@
+
+$(LUA_T): $(LUA_O) $(LUA_SO)
+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
+
+$(LUAC_T): $(LUAC_O) $(LUA_SO)
+	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
 
-$(LUAC_T): $(LUAC_O) $(LUA_A)
+$(LUAC_T)-host: $(LUAC_O) $(LUA_A)
 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 
 clean:
@@ -96,7 +107,7 @@ generic:
 	$(MAKE) all MYCFLAGS=
 
 linux:
-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+	$(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
 
 macosx:
 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"