bundled gcc's unwind-generic.h for BSD because unwind.h is missing at least on FreeBSD. released ngx_openresty 1.0.4.2rc12.

This commit is contained in:
agentzh (章亦春)
2011-08-08 13:27:17 +08:00
parent 5aa4947cb1
commit 1276fbdf48
5 changed files with 331 additions and 8 deletions

32
util/configure vendored
View File

@ -201,6 +201,8 @@ print "platform: $platform ($OS)\n";
my $ngx_prefix = "$prefix/nginx";
my $postamble = '';
my $resty_opts = build_resty_opts(\%resty_opts);
if (@ngx_rpaths) {
@ -231,6 +233,10 @@ cd '../..'; # to the root
gen_makefile();
if ($postamble) {
print $postamble;
}
sub env ($$) {
my ($name, $val) = @_;
print "export $name='$val'\n";
@ -281,14 +287,28 @@ sub build_resty_opts {
if (can_run("gmake")) {
$make = 'gmake';
} elsif (can_run("make")) {
$make = "make";
} else {
die "No gmake nor make found in PATH.\n";
# no gmake found
if ($platform =~ /bsd/i && $opts->{luajit}) {
die "you need to install gmake to build LuaJIT.\n";
}
if (can_run("make")) {
$make = "make";
} else {
die "No gmake nor make found in PATH.\n";
}
}
}
$postamble .= <<"_END_";
Type the following commands to build and install:
$make
$make install
_END_
if ($opts->{no_ndk}) {
for my $name (qw(lua set_misc iconv lz_session form_input array_var)) {
if (! $opts->{"no_http_$name"}) {
@ -422,6 +442,10 @@ sub build_resty_opts {
$extra_opts = ' CCDEBUG=-g Q=';
}
if ($platform =~ /bsd/i) {
$extra_opts .= ' CFLAGS=-I..';
}
if (defined $cc) {
$extra_opts .= " CC=$cc";
}

View File

@ -198,6 +198,7 @@ cd LuaJIT-$ver || exit 1;
$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch
patch -p1 < beta8_hotfix1.patch || exit 1
rm beta8_hotfix1.patch || exit 1
cp $root/misc/unwind-generic.h ./unwind.h || exit 1
cd ..
#################################

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.0.4
minor_ver=2rc11
minor_ver=2rc12
version=$main_ver.$minor_ver
echo $version