diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/haserl/APKBUILD | 29 | ||||
| -rw-r--r-- | main/haserl/lua2c.patch | 56 |
2 files changed, 77 insertions, 8 deletions
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD index 23e97a2767..a4b4ec530f 100644 --- a/main/haserl/APKBUILD +++ b/main/haserl/APKBUILD @@ -1,27 +1,40 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=haserl pkgver=0.9.27 -pkgrel=0 +pkgrel=1 pkgdesc="Html And Shell Embedded Report Language" url="http://haserl.sourceforge.net/" arch="x86 x86_64" license="GPL-2" depends= -makedepends="lua-dev" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +makedepends="lua-dev automake autoconf" subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + lua2c.patch + " + +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + patch -p0 -i "$srcdir"/lua2c.patch || return 1 + sed -i -e 's/^ /\t/' src/Makefile.am || return 1 + rm -f src/haserl_lualib.inc + + aclocal && autoconf && automake --add-missing || return 1 +} build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i -e 's/^ /\t/' src/Makefile.in || return 1 - ./configure --prefix=/usr --with-lua || return 1 + cd "$_builddir" + ./configure --prefix=/usr \ + --with-lua || return 1 make || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir/" install chmod 4111 "$pkgdir"/usr/bin/haserl } -md5sums="1f692db8939858338a44e25d0190aa9e haserl-0.9.27.tar.gz" +md5sums="1f692db8939858338a44e25d0190aa9e haserl-0.9.27.tar.gz +00a612705c8a75e0d991749bf9f11e24 lua2c.patch" 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. |