From af3c74f890d37d6ec17f704d6b8907971ea0b4ae Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Sun, 19 Nov 2023 11:34:29 +0100
Subject: [PATCH] c_icap: rebuild to drop dependency on gcc-10-compat-links
---
components/sysutils/c_icap/Makefile | 8 ++++----
components/sysutils/c_icap/pkg5 | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/components/sysutils/c_icap/Makefile b/components/sysutils/c_icap/Makefile
index c818773..39c6afe 100644
--- a/components/sysutils/c_icap/Makefile
+++ b/components/sysutils/c_icap/Makefile
@@ -11,8 +11,6 @@
# Copyright 2022,2023 Friedrich Kink. All rights reserved.
#
-BUILD_BITS= 64
-BUILD_STYLE= configure
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= c_icap
@@ -33,10 +31,13 @@
COMPONENT_LICENSE= GPLv2
COMPONENT_LICENSE_FILE= COPYING
+# Build fails with GCC 11 or newer
+GCC_VERSION = 10
+
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
-COMPONENT_PREP_ACTION=( cd $(@D) && autoreconf -f -i -v -W all )
+COMPONENT_PREP_ACTION=( cd $(@D) && PATH="$(PATH)" autoreconf -f -i -v -W all )
CONFIGURE_OPTIONS += CPPFLAGS=-I/usr/include/openldap
CONFIGURE_OPTIONS += --sysconfdir=/etc
@@ -54,4 +55,3 @@
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/gcc-10-compat-links
diff --git a/components/sysutils/c_icap/pkg5 b/components/sysutils/c_icap/pkg5
index 1307242..fcda603 100644
--- a/components/sysutils/c_icap/pkg5
+++ b/components/sysutils/c_icap/pkg5
@@ -10,7 +10,6 @@
"library/zlib",
"shell/ksh93",
"system/library",
- "system/library/gcc-10-compat-links",
"system/library/gcc-10-runtime"
],
"fmris": [
--
Gitblit v1.9.3