cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gcc2 build; from Brad, tested by Sevan who submitted a different

Browse Source 
diff to fix the same problem.
This commit is contained in:
sthen 2010-07-06 17:17:50 +00:00
parent 436b053f42
commit 2fe5ee4af4
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/lighttpd/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.68 2010/04/18 08:24:31 sthen Exp $
# $OpenBSD: Makefile,v 1.69 2010/07/06 17:17:50 sthen Exp $
SHARED_ONLY= Yes
COMMENT= secure, fast, compliant, and very flexible web-server
DISTNAME= lighttpd-1.4.26
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= www net
MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/
@ -26,7 +26,9 @@ RUN_DEPENDS+= :spawn-fcgi-*:www/spawn-fcgi
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
# Should be 2.65
AUTOCONF_VERSION= 2.64
CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
--with-lua \
--with-openssl \

22
www/lighttpd/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-configure_ac,v 1.1 2010/07/06 17:17:50 sthen Exp $
--- configure.ac.orig Tue Jul 6 08:56:41 2010
+++ configure.ac Tue Jul 6 08:57:51 2010
@@ -548,7 +548,17 @@ AM_CONDITIONAL(CHECK_WITH_FASTCGI, test "x$fastcgi_fou
dnl check for extra compiler options (warning options)
if test "${GCC}" = "yes"; then
- CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic -std=gnu99"
+ CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic"
+
+ # Use std=gnu99 if we have new enough GCC
+ old_cflags=${CFLAGS}
+ CFLAGS="-std=gnu99"
+ AC_TRY_COMPILE([
+ ],, [
+ CFLAGS="${CFLAGS} $old_cflags"
+ ], [
+ CFLAGS="${old_cflags}"
+ ])
fi
AC_ARG_ENABLE(extra-warnings,

19
www/lighttpd/patches/patch-src_mod_accesslog_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_mod_accesslog_c,v 1.1 2010/07/06 17:17:50 sthen Exp $
--- src/mod_accesslog.c.orig Tue Jul 6 08:59:22 2010
+++ src/mod_accesslog.c Tue Jul 6 09:01:04 2010
@@ -157,12 +157,14 @@ INIT_FUNC(mod_accesslog_init) {
}
static void accesslog_append_escaped(buffer *dest, buffer *str) {
+ unsigned int i;
+
/* replaces non-printable chars with \xHH where HH is the hex representation of the byte */
/* exceptions: " => \", \ => \\, whitespace chars => \n \t etc. */
if (str->used == 0) return;
buffer_prepare_append(dest, str->used - 1);
- for (unsigned int i = 0; i < str->used - 1; i++) {
+ for (i = 0; i < str->used - 1; i++) {
if (str->ptr[i] >= ' ' && str->ptr[i] <= '~') {
/* printable chars */
buffer_append_string_len(dest, &str->ptr[i], 1);