Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

freeradius3: Fix build when pcre is present

Browse source 
If pcre is built before freeradius, then freeradius' configure will
detect pcre and freeradius will be built with pcre functionality
enabled. This causes a "missing dependencies" error at the end of
package build.

This passes --without-pcre to configure to disable this autodetection.

This also removes the dependency on libpcre2 as freeradius v3 does not
have support for pcre2.

Fixes: 19ec30255f ("freeradius3: switch to pcre2")
Fixes: https://github.com/openwrt/packages/issues/22574

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2023-11-15 17:32:22 +08:00 committed by Rosen Penev
parent 72b0da3d03
commit 92aadf7e4a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/freeradius3/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=freeradius3 PKG_NAME:=freeradius3
PKG_VERSION:=3.0.26 PKG_VERSION:=3.0.26
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_$(subst .,_,$(PKG_VERSION))/ PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_$(subst .,_,$(PKG_VERSION))/
@ -63,7 +63,7 @@ endef
define Package/freeradius3-common define Package/freeradius3-common
$(call Package/freeradius3/Default) $(call Package/freeradius3/Default)
TITLE:=common files TITLE:=common files
DEPENDS:=+USE_GLIBC:libpthread +USE_GLIBC:libbsd +FREERADIUS3_OPENSSL:libopenssl +libcap +libpcap +libncurses +libpcre2 +libreadline +libtalloc +libatomic DEPENDS:=+USE_GLIBC:libpthread +USE_GLIBC:libbsd +FREERADIUS3_OPENSSL:libopenssl +libcap +libpcap +libncurses +libreadline +libtalloc +libatomic
endef endef
define Package/freeradius3-default define Package/freeradius3-default
@ -499,6 +499,7 @@ CONFIGURE_ARGS+= \
--with-radacctdir=/var/db/radacct \ --with-radacctdir=/var/db/radacct \
--with-logdir=/var/log \ --with-logdir=/var/log \
--without-edir \ --without-edir \
--without-pcre \
--without-snmp \ --without-snmp \
--without-rlm_cache \ --without-rlm_cache \
--without-rlm_cache_memcached \ --without-rlm_cache_memcached \