Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
NADAL Jean-Baptiste
@@ -0,0 +1,42 @@
|
||||
From 5dbaf8eebc5b66230e0131b09651c7e40bf0e9de Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 20 Aug 2019 21:41:16 +0200
|
||||
Subject: [PATCH] acinclude/os-deps.m4: fix cross-compilation
|
||||
|
||||
Do not check check file descriptor maximum value through AC_RUN_IFELSE
|
||||
when cross-compiling as this will raise an error
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/squid-cache/squid/pull/464]
|
||||
---
|
||||
acinclude/os-deps.m4 | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
|
||||
index b50717517..ec10a54c6 100644
|
||||
--- a/acinclude/os-deps.m4
|
||||
+++ b/acinclude/os-deps.m4
|
||||
@@ -169,7 +169,9 @@ AC_MSG_CHECKING(Maximum number of filedescriptors we can open)
|
||||
SQUID_STATE_SAVE(maxfd)
|
||||
dnl FreeBSD pthreads break dup2().
|
||||
AS_CASE([$host_os],[freebsd],[ LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"` ])
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
+ dnl AC_RUN_IFELSE can't be run when cross-compiling
|
||||
+ AS_CASE([$cross_compiling],[no],[
|
||||
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
@@ -231,7 +233,8 @@ int main(int argc, char **argv) {
|
||||
fprintf (fp, "%d\n", i & ~0x3F);
|
||||
return 0;
|
||||
}
|
||||
- ]])],[squid_filedescriptors_limit=`cat conftestval`],[],[])
|
||||
+ ]])],[squid_filedescriptors_limit=`cat conftestval`],[],[])
|
||||
+ ])
|
||||
dnl Microsoft MSVCRT.DLL supports 2048 maximum FDs
|
||||
AS_CASE(["$host_os"],[mingw|mingw32],[squid_filedescriptors_limit="2048"])
|
||||
AC_MSG_RESULT($squid_filedescriptors_limit)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
From 39edb8ef08f51ea6a454d286091d78a4514c89e0 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 1 Dec 2018 18:21:55 +0100
|
||||
Subject: [PATCH] configure.ac: use pkg-config to find libxml2
|
||||
|
||||
Fix static build of squid with libxml2 by using pkg-config to find
|
||||
libxml2 dependencies like -lz or -liconv
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/7f23eb98c311b294c7f0e165279fa26909a5ff93
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/squid-cache/squid/pull/338]
|
||||
---
|
||||
configure.ac | 43 +++++++++++++++++++++++++------------------
|
||||
1 file changed, 25 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f30d824aa..47553db46 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -900,29 +900,36 @@ fi
|
||||
|
||||
AC_ARG_WITH(libxml2, AS_HELP_STRING([--without-libxml2],[Do not use libxml2 for ESI. Default: auto-detect]))
|
||||
if test "x$squid_opt_use_esi" != "xno" -a "x$with_libxml2" != "xno" ; then
|
||||
- AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1])
|
||||
- dnl Find the main header and include path...
|
||||
- AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [
|
||||
- AC_CHECK_HEADERS([libxml/parser.h], [], [
|
||||
- AC_MSG_NOTICE([Testing in /usr/include/libxml2])
|
||||
- SAVED_CPPFLAGS="$CPPFLAGS"
|
||||
- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
|
||||
- unset ac_cv_header_libxml_parser_h
|
||||
- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [
|
||||
- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2])
|
||||
- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS"
|
||||
+ PKG_CHECK_MODULES([LIBXML2],[libxml-2.0],[
|
||||
+ CPPFLAGS="$CPPFLAGS $LIBXML2_CFLAGS";
|
||||
+ SQUID_CXXFLAGS="$SQUID_CXXFLAGS $LIBXML2_CFLAGS";
|
||||
+ XMLLIB="$LIBXML2_LIBS";
|
||||
+ HAVE_LIBXML2=1
|
||||
+ ],[
|
||||
+ AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1])
|
||||
+ dnl Find the main header and include path...
|
||||
+ AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [
|
||||
+ AC_CHECK_HEADERS([libxml/parser.h], [], [
|
||||
+ AC_MSG_NOTICE([Testing in /usr/include/libxml2])
|
||||
+ SAVED_CPPFLAGS="$CPPFLAGS"
|
||||
+ CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
|
||||
unset ac_cv_header_libxml_parser_h
|
||||
- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [
|
||||
- AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h])
|
||||
+ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [
|
||||
+ AC_MSG_NOTICE([Testing in /usr/local/include/libxml2])
|
||||
+ CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS"
|
||||
+ unset ac_cv_header_libxml_parser_h
|
||||
+ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [
|
||||
+ AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h])
|
||||
+ ])
|
||||
])
|
||||
+ CPPFLAGS="$SAVED_CPPFLAGS"
|
||||
])
|
||||
- CPPFLAGS="$SAVED_CPPFLAGS"
|
||||
])
|
||||
+ if test "x$ac_cv_libxml2_include" != "x"; then
|
||||
+ SQUID_CXXFLAGS="$ac_cv_libxml2_include $SQUID_CXXFLAGS"
|
||||
+ CPPFLAGS="$ac_cv_libxml2_include $CPPFLAGS"
|
||||
+ fi
|
||||
])
|
||||
- if test "x$ac_cv_libxml2_include" != "x"; then
|
||||
- SQUID_CXXFLAGS="$ac_cv_libxml2_include $SQUID_CXXFLAGS"
|
||||
- CPPFLAGS="$ac_cv_libxml2_include $CPPFLAGS"
|
||||
- fi
|
||||
dnl Now that we know where to look find the headers...
|
||||
AC_CHECK_HEADERS(libxml/parser.h libxml/HTMLparser.h libxml/HTMLtree.h)
|
||||
AC_DEFINE_UNQUOTED(HAVE_LIBXML2, $HAVE_LIBXML2, [Define to 1 if you have the libxml2 library])
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From http://www.squid-cache.org/Versions/v4/squid-4.4.tar.xz.asc
|
||||
md5 892504ca9700e1f139a53f84098613bd squid-4.4.tar.xz
|
||||
sha1 0ab6b133f65866d825bf72cbbe8cef209768b2fa squid-4.4.tar.xz
|
||||
# From http://www.squid-cache.org/Versions/v4/squid-4.8.tar.xz.asc
|
||||
md5 08e018f2d8db4911ee90591284fa1ca5 squid-4.8.tar.xz
|
||||
sha1 4ff1390eee3ec20cefa5565cbb56e1a89a12bfc1 squid-4.8.tar.xz
|
||||
# Locally calculated
|
||||
sha256 4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82 squid-4.4.tar.xz
|
||||
sha256 78cdb324d93341d36d09d5f791060f6e8aaa5ff3179f7c949cd910d023a86210 squid-4.8.tar.xz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SQUID_VERSION = 4.4
|
||||
SQUID_VERSION = 4.8
|
||||
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
|
||||
SQUID_SITE = http://www.squid-cache.org/Versions/v4
|
||||
SQUID_LICENSE = GPL-2.0+
|
||||
SQUID_LICENSE_FILES = COPYING
|
||||
# We're patching configure.ac
|
||||
SQUID_AUTORECONF = YES
|
||||
SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \
|
||||
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
|
||||
# We're patching acinclude/os-deps.m4
|
||||
SQUID_AUTORECONF = YES
|
||||
SQUID_CONF_ENV = \
|
||||
ac_cv_epoll_works=yes \
|
||||
ac_cv_func_setresuid=yes \
|
||||
|
||||
Reference in New Issue
Block a user