mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-15 18:03:30 +00:00
5a8163e07b
* package: sync with upstream Removed: package/libs/libselinux/bcm27xx-userland (Already in package/utils/bcm27xx-userland) Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * uclibc++: remove No package here depends on it. Furthermore, uClibc++ is a fairly buggy C++ library and seems to be relatively inactive upstream. It also lacks proper support for modern C++11 features. The main benefit of it is size: 66.6 KB vs 287.3 KB on mips24kc. Static linking and LTO can help bring the size down of packages that need it. Added warning message to uclibc++.mk Signed-off-by: Rosen Penev <rosenp@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> * target: sync with upstream Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * toolchain: gcc: Remove gcc 10.x support This compiler is old and was never used by default in OpenWrt. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * ucode: update to latest Git HEAD 46d93c9 tests: fixup testcases 4c654df types: adjust double printing format eac2add compiler: fix bytecode for logical assignments of properties 3903b18 fs: add `realpath()` function 8366102 math: add isnan() function eef83d3 tests: relax sleep() test 394e901 lib: uc_json(): accept trailing whitespace when parsing strings 1867c8b uloop: terminate parent uloop in task child processes d2cc003 uci: auto-load package in `ctx.foreach()` and `ctx.get_first()` 6c5ee53 compiler: ensure that arrow functions with block bodies return no value fdc9b6a compiler: fix `??=`, `||=` and `&&=` logical assignment semantics 88dcca7 add cmake to install requires for debian Signed-off-by: Jo-Philipp Wich <jo@mein.io> * firewall4: update to latest Git HEAD 700a925 fw4: prevent null access when no ipsets are defined 6443ec7 config: drop input traffic by default 119ee1a ruleset: drop ctstate invalid traffic for masq-enabled zones Signed-off-by: Jo-Philipp Wich <jo@mein.io> * ustream-ssl: update to Git version 2022-12-07 9217ab4 ustream-openssl: Disable renegotiation in TLSv1.2 and earlier 2ce1d48 ci: fix building with i.MX6 SDK 584f1f6 ustream-openssl: wolfSSL: provide detailed information in debug builds aa8c48e cmake: add a possibility to set library version Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tools/mpfr: import patch fixing macro bug Co-authored-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Rosen Penev <rosenp@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Jo-Philipp Wich <jo@mein.io> Co-authored-by: Rosen Penev <rosenp@gmail.com> Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de> Co-authored-by: Jo-Philipp Wich <jo@mein.io> Co-authored-by: Nick Hainke <vincent@systemli.org>
89 lines
2.8 KiB
Diff
89 lines
2.8 KiB
Diff
From 9af8ee5baceab59d46154c96da62b52935f363fe Mon Sep 17 00:00:00 2001
|
|
From: Nick Hainke <vincent@systemli.org>
|
|
Date: Mon, 27 Jun 2022 20:43:11 +0200
|
|
Subject: [PATCH] configure.ac: fix AC_ARG_WITH
|
|
|
|
In the new version the configuration no longer respects the
|
|
--without/--with blkid/selinux parameters. Add the tests for
|
|
"with_blkid" and "with_selinux" back to configure.ac as described
|
|
in the manual.
|
|
|
|
Link: https://www.gnu.org/software/autoconf/manual/autoconf-2.60/html_node/External-Software.html
|
|
|
|
Fixes: c48335416a09 ("configure.ac: Enable cross-compilation")
|
|
|
|
Signed-off-by: Nick Hainke <vincent@systemli.org>
|
|
---
|
|
configure.ac | 44 ++++++++++++++++++++++++++++++--------------
|
|
1 file changed, 30 insertions(+), 14 deletions(-)
|
|
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -39,12 +39,16 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign
|
|
|
|
# Test configure options.
|
|
AC_ARG_WITH([selinux],
|
|
- AS_HELP_STRING([--without-selinux],
|
|
- [Ignore presence of libselinux and disable selinux support]))
|
|
+ [AS_HELP_STRING([--without-selinux],
|
|
+ [Ignore presence of libselinux and disable selinux support])],
|
|
+ [],
|
|
+ [with_selinux=check])
|
|
|
|
AC_ARG_WITH([blkid],
|
|
- AS_HELP_STRING([--without-blkid],
|
|
- [Ignore presence of libblkid and disable blkid support]))
|
|
+ [AS_HELP_STRING([--without-blkid],
|
|
+ [Ignore presence of libblkid and disable blkid support])],
|
|
+ [],
|
|
+ [with_blkid=check])
|
|
|
|
# Checks for programs.
|
|
AC_PROG_CC
|
|
@@ -55,11 +59,17 @@ AC_PATH_PROG([LDCONFIG], [ldconfig],
|
|
[$PATH:/sbin])
|
|
|
|
# Checks for libraries.
|
|
-AC_CHECK_LIB([blkid], [blkid_probe_all],
|
|
- [AC_SUBST([libblkid_LIBS], ["-lblkid"])
|
|
- AC_DEFINE([HAVE_LIBBLKID], [1],
|
|
- [Define if you have libblkid])
|
|
- ], [], [])
|
|
+AS_IF([test "x$with_blkid" != xno],
|
|
+ [AC_CHECK_LIB([blkid], [blkid_probe_all],
|
|
+ [AC_SUBST([libblkid_LIBS], ["-lblkid"])
|
|
+ AC_DEFINE([HAVE_LIBBLKID], [1],
|
|
+ [Define if you have libblkid])
|
|
+ ],
|
|
+ [if test "x$with_blkid" != xcheck; then
|
|
+ AC_MSG_FAILURE(
|
|
+ [--with-blkid was given, but test for blkid failed])
|
|
+ fi
|
|
+ ], -lblkid)])
|
|
|
|
AC_CHECK_LIB([lzo2], [main],
|
|
[AC_SUBST([liblzo2_LIBS], ["-llzo2"])
|
|
@@ -73,11 +83,17 @@ AC_CHECK_LIB([lz4], [main],
|
|
[Define if you have liblz4])
|
|
], [], [])
|
|
|
|
-AC_CHECK_LIB([selinux], [getcon],
|
|
- [AC_SUBST([libselinux_LIBS], ["-lselinux"])
|
|
- AC_DEFINE([HAVE_LIBSELINUX], [1],
|
|
- [Define if you have libselinux])
|
|
- ], [], [])
|
|
+AS_IF([test "x$with_selinux" != xno],
|
|
+ [AC_CHECK_LIB([selinux], [getcon],
|
|
+ [AC_SUBST([libselinux_LIBS], ["-lselinux"])
|
|
+ AC_DEFINE([HAVE_LIBSELINUX], [1],
|
|
+ [Define if you have libselinux])
|
|
+ ],
|
|
+ [if test "x$with_selinux" != xcheck; then
|
|
+ AC_MSG_FAILURE(
|
|
+ [--with-selinux was given, but test for selinux failed])
|
|
+ fi
|
|
+ ], -lselinux)])
|
|
|
|
AC_CHECK_LIB([uuid], [uuid_clear],
|
|
[AC_SUBST([libuuid_LIBS], ["-luuid"])
|