From 430ab5f9b3f1e439e1990dcf3405309fd03a9979 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 30 Jan 2020 21:49:53 +0100 Subject: [PATCH 1/4] apr: don't install la files to staging They're deleted by OpenWrt build system anyway. No rev bump as meaningless for apr package. Signed-off-by: Sebastian Kemper --- libs/apr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 31b55d679..b85384402 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -70,7 +70,7 @@ define Build/InstallDev $(1)/usr/bin $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ $(1)/usr/include/apr-1 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{a,so*} $(1)/usr/lib $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1 From a16b29480567d89dedc5775d03391e3203d4e644 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 30 Jan 2020 21:53:07 +0100 Subject: [PATCH 2/4] apr-util: clean up InstallDev This removes the ifneq in InstallDev, because the maintainers are likely to forget to extend it when new plugins are added (this has already occurred). Also, this removes the la files, because OpenWrt won't allow them into staging anyway. No rev bump because meaningless for the apr-util packages. Signed-off-by: Sebastian Kemper --- libs/apr-util/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index 2b4f25b55..bd9ba1c98 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -131,12 +131,10 @@ define Build/InstallDev $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* $(1)/usr/include/apr-1 -ifneq ($(CONFIG_PACKAGE_libaprutil-crypto-openssl)$(CONFIG_PACKAGE_libaprutil-dbd-pgsql)$(CONFIG_PACKAGE_libaprutil-dbd-sqlite3)$(CONFIG_PACKAGE_libaprutil-ldap),) $(INSTALL_DIR) $(1)/usr/lib/apr-util-1 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*{la,a,so*} \ - $(1)/usr/lib/apr-util-1 -endif - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*.{a,so} \ + $(1)/usr/lib/apr-util-1 2>/dev/null || : + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{a,so*} \ $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ $(1)/usr/lib/pkgconfig From c24f5d258bb6600546ac513efb9e304de68930bd Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 30 Jan 2020 21:56:40 +0100 Subject: [PATCH 3/4] apr-util: workaround reconfigure issue PKG_CONFIG_DEPENDS causes a rebuild when needed. Alas the apr-util build system doesn't always work out the way OpenWrt intends it to. This was found by pure chance. apr-util was in build directory without any plugins selected. Then apache got selected, causing plugins to be selected. So PKG_CONFIG_DEPENDS caused a reconfigure and another make in apr-util. But afterward apache couldn't find symbols related to LDAP. To workaround this add "clean" to make targets. No rev bump because no change for the apr-util packages. Signed-off-by: Sebastian Kemper --- libs/apr-util/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index bd9ba1c98..cab11a585 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -126,6 +126,13 @@ endef $$(eval $$(call BuildPackage,libaprutil-$(subst _,-,$(1)))) endef +# PKG_CONFIG_DEPENDS trigger configure, but the compile afterward may be +# incomplete if the build directory is not cleaned before. This is not a +# general observation, yet it is valid for apr-util :/ +define Build/Compile + $(call Build/Compile/Default,clean all) +endef + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \ $(1)/usr/lib/pkgconfig From 66bb68a7b6413acba07fd22f7c71203e760145eb Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 30 Jan 2020 22:03:08 +0100 Subject: [PATCH 4/4] apache: don't install exp file This file is meant for AIX, OpenWrt doesn't need it. Signed-off-by: Sebastian Kemper --- net/apache/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/apache/Makefile b/net/apache/Makefile index ad83aa716..107669c79 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apache PKG_VERSION:=2.4.41 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_NAME:=httpd PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 @@ -282,8 +282,6 @@ define Build/InstallDev $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/apache2/* \ $(1)/usr/include/apache2 $(INSTALL_DIR) $(1)/usr/lib/apache2 - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/apache2/httpd.exp \ - $(1)/usr/lib/apache2 $(INSTALL_DIR) $(1)/usr/share/apache2/build $(CP) $(PKG_INSTALL_DIR)/usr/share/apache2/build/* \ $(1)/usr/share/apache2/build @@ -308,8 +306,6 @@ define Package/apache/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/apache2/*.so \ $(1)/usr/lib/apache2 rm -f $(1)/usr/lib/apache2/mod_{*ldap,dav*,deflate,http2,lbmethod_*,lua,md,proxy*,proxy_html,session_crypto,ssl,suexec,xml2enc}.so - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/apache2/httpd.exp \ - $(1)/usr/lib/apache2 $(INSTALL_DIR) $(1)/usr/share/apache2/{cgi-bin,htdocs} $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/apache2/cgi-bin/* \ $(1)/usr/share/apache2/cgi-bin