Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
646
Issues
646
List
Boards
Labels
Service Desk
Milestones
Merge Requests
175
Merge Requests
175
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
4703bb89
Commit
4703bb89
authored
Jan 10, 2011
by
Natanael Copa
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/haserl: fix for x86_64
Force rebuild of haserl_lualib.inc fixes
#513
parent
d511fa45
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
8 deletions
+77
-8
main/haserl/APKBUILD
main/haserl/APKBUILD
+21
-8
main/haserl/lua2c.patch
main/haserl/lua2c.patch
+56
-0
No files found.
main/haserl/APKBUILD
View file @
4703bb89
# 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
-
$pkgve
r
"
sed
-i
-e
's/^ /\t/'
src/Makefile.in
||
return
1
./configure
--prefix
=
/usr
--with-lua
||
return
1
cd
"
$
_builddi
r
"
./configure
--prefix
=
/usr
\
--with-lua
||
return
1
make
||
return
1
}
package
()
{
cd
"
$
srcdir
/
$pkgname
-
$pkgve
r
"
cd
"
$
_builddi
r
"
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"
main/haserl/lua2c.patch
0 → 100644
View file @
4703bb89
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.
Carlo Landmeter
@clandmeter
mentioned in issue
#513 (closed)
·
Jul 12, 2019
mentioned in issue
#513 (closed)
mentioned in issue #513
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment