From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Thu, 15 Nov 2018 21:13:55 +0100
Subject: [Buildroot] [PATCH next 1/2] package/apr-util: fix build with
 per-package folders
In-Reply-To: <20181115152107.5834-2-thomas.petazzoni@bootlin.com>
References: <20181115152107.5834-1-thomas.petazzoni@bootlin.com>
 <20181115152107.5834-2-thomas.petazzoni@bootlin.com>
Message-ID: <20181115201355.GN10271@scaer>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Thomas, All,

On 2018-11-15 16:21 +0100, Thomas Petazzoni spake thusly:
> With per-package folder support enable, the build of apr-util fails,
> for two reasons:
> 
>  - The rules.mk file is generated by the 'apr' package, and then
>    copied into the 'apr-util' source directory. This is done by the
>    'apr-util' build process. Unfortunately, this rules.mk file has a
>    number of hardcoded paths: to the compiler and to the libtool
>    script.
> 
>    Due to this, the compiler from the 'apr' per-package folder gets
>    used. But this compiler uses the 'apr' package sysroot, which does
>    not have all the dependencies of the 'apr-util' package, causing
>    the build to fail because <expat.h> is not found.
> 
>  - Similarly, the libtool script itself has some hardcoded paths,
>    which make it use the compiler/linker from the 'apr' per-package
>    folder, so it does not find the expat library.
> 
> We fix both issues by doing the necessary replacement in both rules.mk
> and libtool. For rules.mk, since it's in the source directoryt, we can
> do the replacement in-place. For libtool, since it's hard-linked
> between the 'apr' copy and the 'apr-util' copy, we need to make a
> temporary copy to break the hard link and do the replacement.

I don't know what sed version you are using, but mine breaks the
hardlink when doing in-place replacement:

    $ echo OK >foo
    $ ln foo bar
    $ sed -i -e 's/OK/in-bar/' bar
    $ cat foo
    OK
    $ cat bar
    in-bar

Regards,
Yann E. MORIN.

> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/apr-util/apr-util.mk | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
> index b006964ccb..e685f76838 100644
> --- a/package/apr-util/apr-util.mk
> +++ b/package/apr-util/apr-util.mk
> @@ -15,6 +15,15 @@ APR_UTIL_CONF_OPTS = \
>  	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
>  APR_UTIL_CONFIG_SCRIPTS = apu-1-config
>  
> +define APR_UTIL_FIX_RULES_MK_LIBTOOL
> +	$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' $(@D)/build/rules.mk
> +	cp $(STAGING_DIR)/usr/build-1/libtool $(STAGING_DIR)/usr/build-1/libtool.fixed
> +	$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
> +		$(STAGING_DIR)/usr/build-1/libtool.fixed
> +	mv $(STAGING_DIR)/usr/build-1/libtool.fixed $(STAGING_DIR)/usr/build-1/libtool
> +endef
> +APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK_LIBTOOL
> +
>  # When iconv is available, then use it to provide charset conversion
>  # features.
>  APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
> -- 
> 2.19.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'