openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

apr/subversion: fix subversion build and apache-mod-php8 build regression (fixes #23460)

Browse Source 
The recent upgrade of apr included a change with should fix the subversion build.

Unfortunately, this fix resulted in a build regression of apache-mod-php8.

The new approach is to pass the locations of the apr config helpers
to configure via parameter.

Fixes: 68dd7b7cf6 ("apr: update to 1.7.4")

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold
2024-02-17 00:21:49 +01:00
parent b59db99c53
commit 84ac0263b5
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/apr/Makefile
View File

@@ -88,7 +88,7 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1 $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1
$(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \
$(1)/usr/bin/apr-1-config $(1)/usr/bin/apr-1-config
$(SED) '/^bindir=/s|/usr/bin|$(STAGING_DIR)|' $(1)/usr/bin/apr-1-config $(SED) '/^bindir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
$(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config $(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
$(SED) '/^datarootdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config $(SED) '/^datarootdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \ $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \

2
net/subversion/Makefile
View File

@@ -80,6 +80,8 @@ define Package/subversion-server/conffiles
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \
--with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config \
--without-swig \ --without-swig \
--without-berkeley-db \ --without-berkeley-db \
--without-apxs \ --without-apxs \