[Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK}

[Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK}

[Fabrice Fontaine]

Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit
84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e9897e90862656416e8b67fdace15488d7

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

diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index f6ce7ac064..cf8407ced0 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \
 	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
 APR_UTIL_CONFIG_SCRIPTS = apu-1-config
 
-ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
-define APR_UTIL_FIX_LIBTOOL
-	$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
-		$(STAGING_DIR)/usr/build-1/libtool
-endef
-APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL
-
-define APR_UTIL_FIX_RULES_MK
-	$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
-		$(@D)/build/rules.mk
-endef
-APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK
-endif
-
 # When iconv is available, then use it to provide charset conversion
 # features.
 APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-- 
2.34.1

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

Re: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK}

[Yann E. MORIN]

Fabrice, All,

On 2022-02-19 15:21 +0100, Fabrice Fontaine spake thusly:
> Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit
> 84b4c19e551288911a230c2b73e96bc6e2ed12f9 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.

There is still one occurence of a similar construct in qt5:

   14 # The file "qt.conf" can be used to override the hard-coded paths that are
   15 # compiled into the Qt library. We need it to make "qmake" relocatable and
   16 # tweak the per-package install pathes
   17 define QT5_INSTALL_QT_CONF
   18 »   rm -f $(HOST_DIR)/bin/qt.conf
   19 »   sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \
   20 »   »   $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf
   21 endef
   22
   23 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
   24 define QT5_QT_CONF_FIXUP
   25 »   $(QT5_INSTALL_QT_CONF)
   26 endef
   27 endif

The generic fixup scans $(HOST_DIR), so it should hit this file too, no?

QT5_QT_CONF_FIXUP is used in two locations:

  - pkg-qmake.mk -> as a post-preapare hook, which is exactly where the
    generic fixup runs too, so QT5_QT_CONF_FIXUP should be a no-op
    (well, it does run before the generic one).

  - python-pyqt5.mk -> as a pre-configure hook, which is incorrect
    becaused it will assign that file to that package, and anyway the
    generic fixup hook has already been run anyway, so this should be a
    no-op.

Care tp have a look, please?

Regards,
Yann E. MORIN.

> ---
>  package/apr-util/apr-util.mk | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
> index f6ce7ac064..cf8407ced0 100644
> --- a/package/apr-util/apr-util.mk
> +++ b/package/apr-util/apr-util.mk
> @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \
>  	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
>  APR_UTIL_CONFIG_SCRIPTS = apu-1-config
>  
> -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
> -define APR_UTIL_FIX_LIBTOOL
> -	$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
> -		$(STAGING_DIR)/usr/build-1/libtool
> -endef
> -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL
> -
> -define APR_UTIL_FIX_RULES_MK
> -	$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
> -		$(@D)/build/rules.mk
> -endef
> -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK
> -endif
> -
>  # When iconv is available, then use it to provide charset conversion
>  # features.
>  APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
> -- 
> 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

Re: [Buildroot] [PATCH 1/1] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK}

[Fabrice Fontaine]

Hi Yann,

Le dim. 20 févr. 2022 à 11:08, Yann E. MORIN <yann.morin.1998@free.fr> a écrit :
>
> Fabrice, All,
>
> On 2022-02-19 15:21 +0100, Fabrice Fontaine spake thusly:
> > Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit
> > 84b4c19e551288911a230c2b73e96bc6e2ed12f9 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.
>
> There is still one occurence of a similar construct in qt5:
>
>    14 # The file "qt.conf" can be used to override the hard-coded paths that are
>    15 # compiled into the Qt library. We need it to make "qmake" relocatable and
>    16 # tweak the per-package install pathes
>    17 define QT5_INSTALL_QT_CONF
>    18 »   rm -f $(HOST_DIR)/bin/qt.conf
>    19 »   sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \
>    20 »   »   $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf
>    21 endef
>    22
>    23 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
>    24 define QT5_QT_CONF_FIXUP
>    25 »   $(QT5_INSTALL_QT_CONF)
>    26 endef
>    27 endif
>
> The generic fixup scans $(HOST_DIR), so it should hit this file too, no?
>
> QT5_QT_CONF_FIXUP is used in two locations:
>
>   - pkg-qmake.mk -> as a post-preapare hook, which is exactly where the
>     generic fixup runs too, so QT5_QT_CONF_FIXUP should be a no-op
>     (well, it does run before the generic one).
>
>   - python-pyqt5.mk -> as a pre-configure hook, which is incorrect
>     becaused it will assign that file to that package, and anyway the
>     generic fixup hook has already been run anyway, so this should be a
>     no-op.
>
> Care tp have a look, please?
I don't really master Qt but if I understand well commit
60e3a09693703f0c923322d39ce1210baf154983,
QT5_INSTALL_QT_CONF is also used to make qmake "relocatable" in qt5base.mk.

So, reverting commit 60e3a09693703f0c923322d39ce1210baf154983 is probably ok.
However I assume that we should keep a QT5BASE_INSTALL_QT_CONF that
creates a qt.conf.

Someone with better Qt knowledge could probably confirm this assumption.
>
> Regards,
> Yann E. MORIN.
>
> > ---
> >  package/apr-util/apr-util.mk | 14 --------------
> >  1 file changed, 14 deletions(-)
> >
> > diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
> > index f6ce7ac064..cf8407ced0 100644
> > --- a/package/apr-util/apr-util.mk
> > +++ b/package/apr-util/apr-util.mk
> > @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \
> >       --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
> >  APR_UTIL_CONFIG_SCRIPTS = apu-1-config
> >
> > -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
> > -define APR_UTIL_FIX_LIBTOOL
> > -     $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
> > -             $(STAGING_DIR)/usr/build-1/libtool
> > -endef
> > -APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL
> > -
> > -define APR_UTIL_FIX_RULES_MK
> > -     $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
> > -             $(@D)/build/rules.mk
> > -endef
> > -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK
> > -endif
> > -
> >  # When iconv is available, then use it to provide charset conversion
> >  # features.
> >  APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
> > --
> > 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.  |
> '------------------------------^-------^------------------^--------------------'
Best Regards,

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