diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-27 23:26:02 +0200 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-27 23:26:02 +0200 |
commit | 3c6a0a3164fd0d35a15ac48879edc5153f8df19e (patch) | |
tree | 7c7559018f84a10e5cab6c5a0bee6e9ab6415a6b /patches/fcgi-2.4.0 | |
parent | f2f2c4ff927160cae9b1c326f34d44fe7f6350b0 (diff) | |
download | ptxdist-3c6a0a3164fd0d35a15ac48879edc5153f8df19e.tar.gz ptxdist-3c6a0a3164fd0d35a15ac48879edc5153f8df19e.tar.xz |
fcgi: regenerate patches
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/fcgi-2.4.0')
-rw-r--r-- | patches/fcgi-2.4.0/0001-fix-buildsystem.patch (renamed from patches/fcgi-2.4.0/fix-buildsystem.diff) | 59 | ||||
-rw-r--r-- | patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch (renamed from patches/fcgi-2.4.0/prepare-for-new-autotools.diff) | 15 | ||||
-rw-r--r-- | patches/fcgi-2.4.0/0003-include-stdio.h.patch (renamed from patches/fcgi-2.4.0/stdio.diff) | 1 | ||||
-rw-r--r-- | patches/fcgi-2.4.0/series | 8 |
4 files changed, 46 insertions, 37 deletions
diff --git a/patches/fcgi-2.4.0/fix-buildsystem.diff b/patches/fcgi-2.4.0/0001-fix-buildsystem.patch index 86230364c..4880823f7 100644 --- a/patches/fcgi-2.4.0/fix-buildsystem.diff +++ b/patches/fcgi-2.4.0/0001-fix-buildsystem.patch @@ -1,41 +1,20 @@ -Subject: fix buildsystem From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 27 Oct 2010 23:17:40 +0200 +Subject: [PATCH] fix buildsystem * Use libfcgi.la instead of -lfcgi when linking against a library in the same directory * Use AM_* where appropriate. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> - --- cgi-fcgi/Makefile.am | 2 +- examples/Makefile.am | 4 ++-- libfcgi/Makefile.am | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -1,7 +1,7 @@ - # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -@@ -23,5 +23,6 @@ libfcgi___la_SOURCES = $(INCLUDE_FILES) - $(INCLUDEDIR)/fcgio.h \ - fcgio.cpp - libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ --libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ -+libfcgi___la_LDFLAGS = -rpath @libdir@ -+libfcgi___la_LIBADD = libfcgi.la - -Index: b/cgi-fcgi/Makefile.am -=================================================================== +diff --git a/cgi-fcgi/Makefile.am b/cgi-fcgi/Makefile.am +index 4a5c685..04b4483 100644 --- a/cgi-fcgi/Makefile.am +++ b/cgi-fcgi/Makefile.am @@ -2,7 +2,7 @@ @@ -47,11 +26,11 @@ Index: b/cgi-fcgi/Makefile.am INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ $(INCLUDEDIR)/fcgiapp.h \ -Index: b/examples/Makefile.am -=================================================================== +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 484d3e8..930f203 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am -@@ -11,7 +11,7 @@ noinst_PROGRAMS = authorizer +@@ -11,7 +11,7 @@ noinst_PROGRAMS = authorizer \ EXTRA_PROGRAMS = threaded echo-cpp INCLUDEDIR = ../include @@ -67,3 +46,27 @@ Index: b/examples/Makefile.am -echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la +echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la +diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am +index 0f14615..d7346f5 100644 +--- a/libfcgi/Makefile.am ++++ b/libfcgi/Makefile.am +@@ -1,7 +1,7 @@ + # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ + + INCLUDEDIR = ../include +-CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include ++AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include + + INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ + $(INCLUDEDIR)/fcgiapp.h \ +@@ -23,5 +23,6 @@ libfcgi___la_SOURCES = $(INCLUDE_FILES) \ + $(INCLUDEDIR)/fcgio.h \ + fcgio.cpp + libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ +-libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ ++libfcgi___la_LDFLAGS = -rpath @libdir@ ++libfcgi___la_LIBADD = libfcgi.la + +-- +1.7.2.3 + diff --git a/patches/fcgi-2.4.0/prepare-for-new-autotools.diff b/patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch index 5fd8296d4..fbc6d3131 100644 --- a/patches/fcgi-2.4.0/prepare-for-new-autotools.diff +++ b/patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch @@ -1,19 +1,19 @@ -Subject: prepare for new autotools From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 27 Oct 2010 23:17:40 +0200 +Subject: [PATCH] prepare for new autotools we need AM_INIT_AUTOMAKE([foreign]) or automake fails with missing files Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> - --- configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 1 files changed, 2 insertions(+), 2 deletions(-) -Index: b/configure.in -=================================================================== +diff --git a/configure.in b/configure.in +index e1941d0..1f94dde 100755 --- a/configure.in +++ b/configure.in -@@ -4,8 +4,8 @@ dnl This file is an input file used +@@ -4,8 +4,8 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during the build dnl to configure the system for the local environment. @@ -24,3 +24,6 @@ Index: b/configure.in AM_CONFIG_HEADER(fcgi_config.h) +-- +1.7.2.3 + diff --git a/patches/fcgi-2.4.0/stdio.diff b/patches/fcgi-2.4.0/0003-include-stdio.h.patch index 038b3ead9..a78131d08 100644 --- a/patches/fcgi-2.4.0/stdio.diff +++ b/patches/fcgi-2.4.0/0003-include-stdio.h.patch @@ -1,4 +1,5 @@ From: George McCollister <george.mccollister@gmail.com> +Date: Wed, 27 Oct 2010 23:17:40 +0200 Subject: [PATCH] include stdio.h fcgi failed to compile. EOF wasn't defined because stdio.h wasn't included. diff --git a/patches/fcgi-2.4.0/series b/patches/fcgi-2.4.0/series index 4867b9e37..444776df4 100644 --- a/patches/fcgi-2.4.0/series +++ b/patches/fcgi-2.4.0/series @@ -1,3 +1,5 @@ -fix-buildsystem.diff -prepare-for-new-autotools.diff -stdio.diff +# generated by git-ptx-patches +0001-fix-buildsystem.patch +0002-prepare-for-new-autotools.patch +0003-include-stdio.h.patch +# 36557fb0b64a93d0502c776d964302aa - git-ptx-patches magic |