diff options
author | Adrian <adrian.freihofer@gmail.com> | 2018-05-21 22:44:31 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-05-26 21:10:55 -0700 |
commit | d194fe97242dede5dd7b1963a677797d913e75c3 (patch) | |
tree | a88e89f4b479659c0b028213c94e6f533df7b24c /meta-webserver/recipes-support | |
parent | 4e19b562b229ec8bde624a786792249b6270c2ea (diff) | |
download | meta-openembedded-d194fe97242dede5dd7b1963a677797d913e75c3.tar.gz |
fcgi: Update to 2.4.1+
Update to latest from upstream. This adds pkg-config support.
Fix_EOF_not_declared_issue.patch is obsolete, fix is upstream.
Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-support')
-rw-r--r-- | meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch | 17 | ||||
-rw-r--r-- | meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch | 4 | ||||
-rw-r--r-- | meta-webserver/recipes-support/fcgi/fcgi_git.bb (renamed from meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb) | 10 |
3 files changed, 8 insertions, 23 deletions
diff --git a/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch deleted file mode 100644 index 51ddeaac2..000000000 --- a/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix EOF not declared issue, following is the error log. | ||
4 | fcgio.cpp:70:72: error: 'EOF' was not declared in this scope | ||
5 | if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; | ||
6 | |||
7 | Signed-off-by: Yang Haibo <b40869@freescale.com> | ||
8 | --- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.000000000 +0800 | ||
9 | +++ fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.000000000 +0800 | ||
10 | @@ -22,6 +22,7 @@ | ||
11 | #define DLLAPI __declspec(dllexport) | ||
12 | #endif | ||
13 | |||
14 | +#include <stdio.h> | ||
15 | #include <limits.h> | ||
16 | #include "fcgio.h" | ||
17 | |||
diff --git a/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch index eca694adc..eec9dd7ce 100644 --- a/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch +++ b/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch | |||
@@ -10,8 +10,8 @@ Signed-off-by: Yang Haibo <b40869@freescale.com> | |||
10 | dnl to configure the system for the local environment. | 10 | dnl to configure the system for the local environment. |
11 | 11 | ||
12 | -AC_INIT | 12 | -AC_INIT |
13 | -AM_INIT_AUTOMAKE(fcgi, 2.4.0) | 13 | -AM_INIT_AUTOMAKE(fcgi, 2.4.1-SNAP-0910052249) |
14 | +AC_INIT([fcgi], [2.4.0]) | 14 | +AC_INIT([fcgi], [2.4.1-SNAP-0910052249]) |
15 | +AM_INIT_AUTOMAKE([foreign]) | 15 | +AM_INIT_AUTOMAKE([foreign]) |
16 | 16 | ||
17 | AM_CONFIG_HEADER(fcgi_config.h) | 17 | AM_CONFIG_HEADER(fcgi_config.h) |
diff --git a/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-support/fcgi/fcgi_git.bb index 48c594483..a17e70f09 100644 --- a/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb +++ b/meta-webserver/recipes-support/fcgi/fcgi_git.bb | |||
@@ -3,12 +3,14 @@ HOMEPAGE = "http://www.fastcgi.com" | |||
3 | LICENSE = "OML" | 3 | LICENSE = "OML" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" |
5 | 5 | ||
6 | SRC_URI = "http://fossies.org/linux/www/old/${BP}.tar.gz \ | 6 | SRCREV = "68100b5b8cb26f04b784778ed19ccef4fe389f57" |
7 | file://Fix_EOF_not_declared_issue.patch \ | 7 | PV = "2.4.1+git${SRCPV}" |
8 | |||
9 | SRC_URI = "git://github.com/FastCGI-Archives/fcgi2.git;protocol=https \ | ||
8 | file://add_foreign_to_AM_INIT_AUTOMAKE.patch \ | 10 | file://add_foreign_to_AM_INIT_AUTOMAKE.patch \ |
9 | " | 11 | " |
10 | SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" | 12 | |
11 | SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" | 13 | S = "${WORKDIR}/git" |
12 | 14 | ||
13 | inherit autotools | 15 | inherit autotools |
14 | 16 | ||