diff options
| author | Andrej Valek <andrej.valek@siemens.com> | 2019-04-09 10:46:21 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-04-09 21:31:36 -0700 |
| commit | d219ba7a28e0f906df7ff5de20d8185fce31ed67 (patch) | |
| tree | 1e3dfe045273a1da88dbb5f48c3a9be75966a298 /meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch | |
| parent | 4bc2badedb34da3bb5d1fda2c513c0a04ee83ffa (diff) | |
| download | meta-openembedded-d219ba7a28e0f906df7ff5de20d8185fce31ed67.tar.gz | |
squid: upgrade squid 3.5.28 -> 4.6
- refresh and remove obsolete patches
- add openssl and esi as package options
- add missing header for std::bind implementation
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch index 25f68aff8f..1516bb014b 100644 --- a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch +++ b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From b4943594654cd340b95aabdc2f3750a4705cc0de Mon Sep 17 00:00:00 2001 | 1 | From b73b802282bf95d214c86ba943c5765ba6930bc1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jim Somerville <Jim.Somerville@windriver.com> | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
| 3 | Date: Mon, 21 Oct 2013 12:50:44 -0400 | 3 | Date: Mon, 21 Oct 2013 12:50:44 -0400 |
| 4 | Subject: [PATCH] Fix flawed dynamic -ldb link test in configure | 4 | Subject: [PATCH] Fix flawed dynamic -ldb link test in configure |
| @@ -12,19 +12,17 @@ about why and setting the need for -ldb incorrectly. | |||
| 12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | 12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
| 13 | 13 | ||
| 14 | --- | 14 | --- |
| 15 | configure.ac | 12 ++++++++++-- | 15 | configure.ac | 10 ++++++++++ |
| 16 | 1 file changed, 10 insertions(+), 2 deletions(-) | 16 | 1 file changed, 10 insertions(+) |
| 17 | 17 | ||
| 18 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
| 19 | index 57cd1ac..3827222 100644 | 19 | index d2f7feb..c7ae568 100644 |
| 20 | --- a/configure.ac | 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac | 21 | +++ b/configure.ac |
| 22 | @@ -3229,8 +3229,16 @@ AC_CHECK_DECL(dbopen,,,[ | 22 | @@ -3235,6 +3235,16 @@ case "$host" in |
| 23 | #include <db.h> | 23 | ;; |
| 24 | #endif]) | 24 | esac |
| 25 | 25 | ||
| 26 | -dnl 1.85 | ||
| 27 | -SQUID_CHECK_DBOPEN_NEEDS_LIBDB | ||
| 28 | +if test "x$ac_cv_have_decl_dbopen" = "xyes"; then | 26 | +if test "x$ac_cv_have_decl_dbopen" = "xyes"; then |
| 29 | + dnl 1.85 | 27 | + dnl 1.85 |
| 30 | + SQUID_CHECK_DBOPEN_NEEDS_LIBDB | 28 | + SQUID_CHECK_DBOPEN_NEEDS_LIBDB |
| @@ -35,6 +33,6 @@ index 57cd1ac..3827222 100644 | |||
| 35 | + # dynamic compile/link test. | 33 | + # dynamic compile/link test. |
| 36 | + ac_cv_dbopen_libdb="yes" | 34 | + ac_cv_dbopen_libdb="yes" |
| 37 | +fi | 35 | +fi |
| 38 | if test "x$ac_cv_dbopen_libdb" = "xyes"; then | 36 | dnl System-specific library modifications |
| 39 | LIB_DB="-ldb" | 37 | dnl |
| 40 | fi | 38 | case "$host" in |
