* [Buildroot] [PATCH 1/1] Point libxslt to the correct location of libxml2
@ 2018-09-21 10:19 Ferdinand van Aartsen
2018-09-21 11:43 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Ferdinand van Aartsen @ 2018-09-21 10:19 UTC (permalink / raw)
To: buildroot
Currently libxslt configure finds native /usr/bin/xml2-config.
Signed-off-by: Ferdinand van Aartsen <ferdinand@ombud.nl>
---
package/libxslt/libxslt.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 972d5b80d5..fb5d03ab44 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -13,7 +13,8 @@ LIBXSLT_LICENSE_FILES = COPYING
LIBXSLT_CONF_OPTS = \
--with-gnu-ld \
--without-debug \
- --without-python
+ --without-python \
+ --with-libxml-prefix=$(STAGING_DIR)/usr
LIBXSLT_CONFIG_SCRIPTS = xslt-config
LIBXSLT_DEPENDENCIES = host-pkgconf libxml2
@@ -25,7 +26,11 @@ else
LIBXSLT_CONF_OPTS += --without-crypto
endif
-HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python --without-crypto
+HOST_LIBXSLT_CONF_OPTS = \
+ --without-debug \
+ --without-python \
+ --without-crypto \
+ --with-libxml-prefix=$(HOST_DIR)/usr
HOST_LIBXSLT_DEPENDENCIES = host-pkgconf host-libxml2
--
2.19.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] Point libxslt to the correct location of libxml2
2018-09-21 10:19 [Buildroot] [PATCH 1/1] Point libxslt to the correct location of libxml2 Ferdinand van Aartsen
@ 2018-09-21 11:43 ` Thomas Petazzoni
2018-09-21 12:53 ` Ferdinand van Aartsen
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2018-09-21 11:43 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 21 Sep 2018 12:19:14 +0200, Ferdinand van Aartsen wrote:
> Currently libxslt configure finds native /usr/bin/xml2-config.
>
> Signed-off-by: Ferdinand van Aartsen <ferdinand@ombud.nl>
Thanks for this contribution! The commit title should always follow the
format:
<package>: <description>
so, something like:
libxslt: point to the correct location of xml2-config
> diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
> index 972d5b80d5..fb5d03ab44 100644
> --- a/package/libxslt/libxslt.mk
> +++ b/package/libxslt/libxslt.mk
> @@ -13,7 +13,8 @@ LIBXSLT_LICENSE_FILES = COPYING
> LIBXSLT_CONF_OPTS = \
> --with-gnu-ld \
> --without-debug \
> - --without-python
> + --without-python \
> + --with-libxml-prefix=$(STAGING_DIR)/usr
> LIBXSLT_CONFIG_SCRIPTS = xslt-config
> LIBXSLT_DEPENDENCIES = host-pkgconf libxml2
>
> @@ -25,7 +26,11 @@ else
> LIBXSLT_CONF_OPTS += --without-crypto
> endif
>
> -HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python --without-crypto
> +HOST_LIBXSLT_CONF_OPTS = \
> + --without-debug \
> + --without-python \
> + --without-crypto \
> + --with-libxml-prefix=$(HOST_DIR)/usr
This should be just $(HOST_DIR), and not $(HOST_DIR)/usr.
Those two minor comments can be fixed when applying the patch, no need
to resend just for that.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] Point libxslt to the correct location of libxml2
2018-09-21 11:43 ` Thomas Petazzoni
@ 2018-09-21 12:53 ` Ferdinand van Aartsen
2018-09-21 13:41 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Ferdinand van Aartsen @ 2018-09-21 12:53 UTC (permalink / raw)
To: buildroot
Thomas Petazzoni schreef op 2018-09-21 13:43:
> Hello,
>
> On Fri, 21 Sep 2018 12:19:14 +0200, Ferdinand van Aartsen wrote:
>
>> Currently libxslt configure finds native /usr/bin/xml2-config.
>>
>> Signed-off-by: Ferdinand van Aartsen <ferdinand@ombud.nl>
>
> Thanks for this contribution! The commit title should always follow the
> format:
>
> <package>: <description>
>
> so, something like:
>
> libxslt: point to the correct location of xml2-config
>
Yes, got it right for my second patch, where I then proceeded to forget
to add a deleted file to the commit. Ah, some days... But, I'll get
there.
>> diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
>> index 972d5b80d5..fb5d03ab44 100644
>> --- a/package/libxslt/libxslt.mk
>> +++ b/package/libxslt/libxslt.mk
>> @@ -13,7 +13,8 @@ LIBXSLT_LICENSE_FILES = COPYING
>> LIBXSLT_CONF_OPTS = \
>> --with-gnu-ld \
>> --without-debug \
>> - --without-python
>> + --without-python \
>> + --with-libxml-prefix=$(STAGING_DIR)/usr
>> LIBXSLT_CONFIG_SCRIPTS = xslt-config
>> LIBXSLT_DEPENDENCIES = host-pkgconf libxml2
>>
>> @@ -25,7 +26,11 @@ else
>> LIBXSLT_CONF_OPTS += --without-crypto
>> endif
>>
>> -HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python
>> --without-crypto
>> +HOST_LIBXSLT_CONF_OPTS = \
>> + --without-debug \
>> + --without-python \
>> + --without-crypto \
>> + --with-libxml-prefix=$(HOST_DIR)/usr
>
> This should be just $(HOST_DIR), and not $(HOST_DIR)/usr.
>
> Those two minor comments can be fixed when applying the patch, no need
> to resend just for that.
>
> Thanks!
>
> Thomas
I copied behaviour I saw in other .mk files. But I double-checked and
saw that host-libxslt configure detects the right xml2-config without
--with-libxml-prefix anyway. So the host part can be left as it was.
Ferdinand
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] Point libxslt to the correct location of libxml2
2018-09-21 12:53 ` Ferdinand van Aartsen
@ 2018-09-21 13:41 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2018-09-21 13:41 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 21 Sep 2018 14:53:52 +0200, Ferdinand van Aartsen wrote:
> > Those two minor comments can be fixed when applying the patch, no need
> > to resend just for that.
>
> I copied behaviour I saw in other .mk files.
If you see other places with $(HOST_DIR)/usr, they should be fixed.
> But I double-checked and saw that host-libxslt configure detects the
> right xml2-config without --with-libxml-prefix anyway. So the host
> part can be left as it was.
Indeed, for host packages, $(HOST_DIR)/bin is in the PATH before /bin
and /usr/bin, so it's going to pickup the xml2-config from Buildroot
prior to the system-installed one.
With those two things to fix, perhaps you could send an updated version
of your patch ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-21 13:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-21 10:19 [Buildroot] [PATCH 1/1] Point libxslt to the correct location of libxml2 Ferdinand van Aartsen
2018-09-21 11:43 ` Thomas Petazzoni
2018-09-21 12:53 ` Ferdinand van Aartsen
2018-09-21 13:41 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.