diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
| commit | 71e39ce025e46b17e9634cb8fdeec7af04f2f0fa (patch) | |
| tree | ab6569d59ab7f79ae8cb7c677658f9ba12854069 /main/haserl/lua2c.patch | |
| parent | 01fd4f6611dd2b61cd8ceee01b4a454d74bbbc51 (diff) | |
| parent | 692f71db5a7621fe29b255de3ef9ae973b74eacb (diff) | |
| download | aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.bz2 aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
main/iaxmodem/APKBUILD
Diffstat (limited to 'main/haserl/lua2c.patch')
| -rw-r--r-- | main/haserl/lua2c.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/main/haserl/lua2c.patch b/main/haserl/lua2c.patch new file mode 100644 index 0000000000..9bfba3173e --- /dev/null +++ b/main/haserl/lua2c.patch @@ -0,0 +1,56 @@ +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (revision 176) ++++ src/Makefile.am (working copy) +@@ -19,24 +19,17 @@ + endif + + if USE_LUA ++lua2c_LIBS ?= -llua -ldl -lm ++lua2c_LDFLAGS ?= -Wl,-E ++lua2c: lua2c.c ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(lua2c_LDFLAGS) \ ++ -o $@ $^ $(lua2c_LIBS) + +-haserl_lualib.inc : haserl_lualib.lua +- @echo '-----------------------------------------------------' +- @echo 'Whoops. haserl_lualib.inc is old. You will need' +- @echo 'to compile lua2c by hand, or help the maintainer' +- @echo 'get automake to do it for you.' +- @echo '' +- @echo 'For now, to compile lua2c:' +- @echo '' +- @echo 'gcc -I<luaheaderdir> -Wl,-E -L<lualibdir> -o lua2c lua2c.c -llua -ldl -lm' +- @echo '' +- @echo '' +- @echo 'Then follow the instructions in lua2c.c to create a' +- @echo 'new haserl_lualib.inc' +- @echo '' +- @echo 'Sorry.' +- @echo '-----------------------------------------------------' +- @exit 1 ++haserl_lualib.inc : haserl_lualib.lua lua2c ++ if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \ ++ rm $@; \ ++ exit 1 ;\ ++ fi + + h_lua_common.c : haserl_lualib.inc + +Index: configure.ac +=================================================================== +--- configure.ac (revision 176) ++++ configure.ac (working copy) +@@ -7,6 +7,12 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + ++# allow differnt compiler for build tools in case cross compiling ++if test -z "$CC_FOR_BUILD"; then ++ CC_FOR_BUILD="$CC" ++fi ++AC_SUBST(CC_FOR_BUILD) ++ + # Checks for libraries. + + # Checks for header files. |