NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sconeserver: re-add dependency to pcre

Browse Source 
While pcre was an optional dependency with autoconf [1] upstream removed
the HAVE_LIBPCRE defines with the introduction of cmake [2] breaking the
build without pcre after buildroot switched to cmake with commit
8b42bbf30a.

Fixes:
http://autobuild.buildroot.net/results/a15/a15db87c8cec195905b6bcc2cbd3da59ad8aa3b9/

[1] 98ec61436c
[2] 0cb655721d

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 8539a2075c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2023-07-02 17:02:32 +02:00 committed by Peter Korsgaard
parent cb18e7e6f0
commit 3dfd81986e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/sconeserver/Config.in
View File

@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS # dlopen() depends on !BR2_STATIC_LIBS # dlopen()
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
Sconeserver is a modular, object-orientated and extremely Sconeserver is a modular, object-orientated and extremely

2
package/sconeserver/sconeserver.mk
View File

@ -10,7 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+
SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_LICENSE_FILES = COPYING
SCONESERVER_DEPENDENCIES = \ SCONESERVER_DEPENDENCIES = \
host-pkgconf \ host-pkgconf \
$(if $(BR2_PACKAGE_PCRE),pcre) \ pcre \
zlib zlib
# disable image as it fails to build with ImageMagick # disable image as it fails to build with ImageMagick
# disable markdown module because its git submodule cmark # disable markdown module because its git submodule cmark