[Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL

[Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL

[Fabrice Fontaine]

Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit
b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e9897e90862656416e8b67fdace15488d7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/apache/apache.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package/apache/apache.mk b/package/apache/apache.mk
index 5fcb887fbc..b280d4dc3a 100644
--- a/package/apache/apache.mk
+++ b/package/apache/apache.mk
@@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES
 APACHE_AUTORECONF = YES
 APACHE_DEPENDENCIES = apr apr-util pcre
 
-ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
-define APACHE_FIXUP_APR_LIBTOOL
-	$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \
-		$(STAGING_DIR)/usr/build-1/libtool
-endef
-APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL
-endif
-
 APACHE_CONF_ENV= \
 	ap_cv_void_ptr_lt_long=no \
 	PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/apache: drop APACHE_FIXUP_APR_LIBTOOL

[Yann E. MORIN]

Fabrice, All,

On 2022-02-19 15:20 +0100, Fabrice Fontaine spake thusly:
> Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit
> b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d but is not needed since the
> addition of PPD_FIXUP_PATHS in commit
> b06294e9897e90862656416e8b67fdace15488d7
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/apache/apache.mk | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/package/apache/apache.mk b/package/apache/apache.mk
> index 5fcb887fbc..b280d4dc3a 100644
> --- a/package/apache/apache.mk
> +++ b/package/apache/apache.mk
> @@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES
>  APACHE_AUTORECONF = YES
>  APACHE_DEPENDENCIES = apr apr-util pcre
>  
> -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
> -define APACHE_FIXUP_APR_LIBTOOL
> -	$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \
> -		$(STAGING_DIR)/usr/build-1/libtool
> -endef
> -APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL
> -endif
> -
>  APACHE_CONF_ENV= \
>  	ap_cv_void_ptr_lt_long=no \
>  	PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot