diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-01-30 16:31:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-30 16:31:29 -0800 |
| commit | d56c71b1b3dbf640b7d77d94b27da6314ec50331 (patch) | |
| tree | a7c44d8242e30d7e104faf2c562c29463dafa709 | |
| parent | affa53fc5113ab4f41feef7b1dd9f2274327def2 (diff) | |
| parent | 66bb68a7b6413acba07fd22f7c71203e760145eb (diff) | |
Merge pull request #11185 from micmac1/apache-1-up
apache/apr/apr-util: fix some nitpicks
| -rw-r--r-- | libs/apr-util/Makefile | 15 | ||||
| -rw-r--r-- | libs/apr/Makefile | 2 | ||||
| -rw-r--r-- | net/apache/Makefile | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index 2b4f25b55..cab11a585 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -126,17 +126,22 @@ 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 $(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 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 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 |