All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/2] package/matchbox: fixes
@ 2017-10-01  9:58 Yann E. MORIN
  2017-10-01  9:58 ` [Buildroot] [PATCH 1/2] matchbox-lib: select dependency Yann E. MORIN
  2017-10-01  9:58 ` [Buildroot] [PATCH 2/2] package/matchbox-lib: correctly fix the .pc file Yann E. MORIN
  0 siblings, 2 replies; 6+ messages in thread
From: Yann E. MORIN @ 2017-10-01  9:58 UTC (permalink / raw)
  To: buildroot

Hello All!

This small series brings in two fixes to the matchbox packages:
  - ensure correct dependency selection
  - fix the libmb.pc file


Regards,
Yann E. MORIN.


The following changes since commit f04df2d65dcdbff18cdc4a173aeef574de97f2ed

  package/opencore-amr: fix license, add license hash (2017-09-29 09:05:18 +0200)


are available in the git repository at:

  git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 73a014e628bcbf58c220a91a54d8637b792186f6

  package/matchbox-lib: correctly fix the .pc file (2017-10-01 11:53:07 +0200)


----------------------------------------------------------------
Yann E. MORIN (2):
      matchbox-lib: select dependency
      package/matchbox-lib: correctly fix the .pc file

 DEVELOPERS                                   | 1 +
 package/matchbox-fakekey/matchbox-fakekey.mk | 4 ++--
 package/matchbox-lib/Config.in               | 1 +
 package/matchbox-lib/matchbox-lib.mk         | 7 +++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] matchbox-lib: select dependency
  2017-10-01  9:58 [Buildroot] [PATCH 0/2] package/matchbox: fixes Yann E. MORIN
@ 2017-10-01  9:58 ` Yann E. MORIN
  2017-10-02 13:35   ` Arnout Vandecappelle
  2017-10-01  9:58 ` [Buildroot] [PATCH 2/2] package/matchbox-lib: correctly fix the .pc file Yann E. MORIN
  1 sibling, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2017-10-01  9:58 UTC (permalink / raw)
  To: buildroot

Select the library we build-depend on.

Add myself to developpers for matchbos packages.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 DEVELOPERS                     | 1 +
 package/matchbox-lib/Config.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/DEVELOPERS b/DEVELOPERS
index cedf5a6f84..5a1ca877de 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1819,6 +1819,7 @@ F:	package/libinput/
 F:	package/libiscsi/
 F:	package/libseccomp/
 F:	package/linux-tools/
+F:	package/matchbox*
 F:	package/mesa3d-headers/
 F:	package/nbd/
 F:	package/nut/
diff --git a/package/matchbox-lib/Config.in b/package/matchbox-lib/Config.in
index e50a5436c1..d758ab35a8 100644
--- a/package/matchbox-lib/Config.in
+++ b/package/matchbox-lib/Config.in
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_MATCHBOX_LIB
 	bool "matchbox-lib"
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  Matchbox common functionality library.
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/matchbox-lib: correctly fix the .pc file
  2017-10-01  9:58 [Buildroot] [PATCH 0/2] package/matchbox: fixes Yann E. MORIN
  2017-10-01  9:58 ` [Buildroot] [PATCH 1/2] matchbox-lib: select dependency Yann E. MORIN
@ 2017-10-01  9:58 ` Yann E. MORIN
  2017-10-02 17:26   ` Yann E. MORIN
  1 sibling, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2017-10-01  9:58 UTC (permalink / raw)
  To: buildroot

First, the .pc file was so far fixed as a post-configure hook of the
matchbox-fakekey package, by directly tweaking the installed .pc file in
staging. That's uterly wrong and bad.

Second, it was incorreclty tweaking the .pc file when xlib_libXft was
not enabled, because then only a path to staging was present.

Third, even when xlib_libXft was enabled, the tweaking was still wrong,
because unnecessary.

Fix all that.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/matchbox-fakekey/matchbox-fakekey.mk | 4 ++--
 package/matchbox-lib/matchbox-lib.mk         | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk
index 996206e266..e607c48c15 100644
--- a/package/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox-fakekey/matchbox-fakekey.mk
@@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
 MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
 
 define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
-	$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
-	$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
+	$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' \
+		$(@D)/Makefile
 endef
 
 MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk
index ee206b6d82..627e1c7417 100644
--- a/package/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox-lib/matchbox-lib.mk
@@ -55,4 +55,11 @@ else
 MATCHBOX_LIB_CONF_OPTS += --disable-xft
 endif
 
+define MATCHBOX_LIB_FIX_PC
+	$(SED) 's:-I$(STAGING_DIR)/:-I/:g' \
+		-e 's:-I/usr/include\( \|$$\)::g' \
+		$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
+endef
+MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_FIX_PC
+
 $(eval $(autotools-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] matchbox-lib: select dependency
  2017-10-01  9:58 ` [Buildroot] [PATCH 1/2] matchbox-lib: select dependency Yann E. MORIN
@ 2017-10-02 13:35   ` Arnout Vandecappelle
  2017-10-02 17:14     ` Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-10-02 13:35 UTC (permalink / raw)
  To: buildroot



On 01-10-17 11:58, Yann E. MORIN wrote:
> Select the library we build-depend on.
> 
> Add myself to developpers for matchbos packages.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  DEVELOPERS                     | 1 +
>  package/matchbox-lib/Config.in | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index cedf5a6f84..5a1ca877de 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1819,6 +1819,7 @@ F:	package/libinput/
>  F:	package/libiscsi/
>  F:	package/libseccomp/
>  F:	package/linux-tools/
> +F:	package/matchbox*
>  F:	package/mesa3d-headers/
>  F:	package/nbd/
>  F:	package/nut/
> diff --git a/package/matchbox-lib/Config.in b/package/matchbox-lib/Config.in
> index e50a5436c1..d758ab35a8 100644
> --- a/package/matchbox-lib/Config.in
> +++ b/package/matchbox-lib/Config.in
> @@ -1,4 +1,5 @@
>  config BR2_PACKAGE_MATCHBOX_LIB
>  	bool "matchbox-lib"
> +	select BR2_PACKAGE_XLIB_LIBXEXT

 matchbox-lib also has a DEPENDENCIES on expat. expat is indeed selected by the
top-level matchbox package, but that package doesn't actually have it in its
DEPENDENCIES. So perhaps move expat as well?

 Otherwise:

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

>  	help
>  	  Matchbox common functionality library.
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] matchbox-lib: select dependency
  2017-10-02 13:35   ` Arnout Vandecappelle
@ 2017-10-02 17:14     ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2017-10-02 17:14 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2017-10-02 15:35 +0200, Arnout Vandecappelle spake thusly:
> On 01-10-17 11:58, Yann E. MORIN wrote:
> > Select the library we build-depend on.
> > 
> > Add myself to developpers for matchbos packages.
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> >  DEVELOPERS                     | 1 +
> >  package/matchbox-lib/Config.in | 1 +
> >  2 files changed, 2 insertions(+)
> > 
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index cedf5a6f84..5a1ca877de 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -1819,6 +1819,7 @@ F:	package/libinput/
> >  F:	package/libiscsi/
> >  F:	package/libseccomp/
> >  F:	package/linux-tools/
> > +F:	package/matchbox*
> >  F:	package/mesa3d-headers/
> >  F:	package/nbd/
> >  F:	package/nut/
> > diff --git a/package/matchbox-lib/Config.in b/package/matchbox-lib/Config.in
> > index e50a5436c1..d758ab35a8 100644
> > --- a/package/matchbox-lib/Config.in
> > +++ b/package/matchbox-lib/Config.in
> > @@ -1,4 +1,5 @@
> >  config BR2_PACKAGE_MATCHBOX_LIB
> >  	bool "matchbox-lib"
> > +	select BR2_PACKAGE_XLIB_LIBXEXT
> 
>  matchbox-lib also has a DEPENDENCIES on expat. expat is indeed selected by the
> top-level matchbox package, but that package doesn't actually have it in its
> DEPENDENCIES. So perhaps move expat as well?

Hmm... I did not see the expat issue, because as you said, matchbox does
select it.

I'll check whether it is needed in matchbox-lib or not, and will send an
appropriate patch.

>  Otherwise:
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Thanks! :-)

Regards,
Yann E. MORIN.

>  Regards,
>  Arnout
> 
> >  	help
> >  	  Matchbox common functionality library.
> > 
> 
> -- 
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/matchbox-lib: correctly fix the .pc file
  2017-10-01  9:58 ` [Buildroot] [PATCH 2/2] package/matchbox-lib: correctly fix the .pc file Yann E. MORIN
@ 2017-10-02 17:26   ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2017-10-02 17:26 UTC (permalink / raw)
  To: buildroot

All,

Replying to myself here...

On 2017-10-01 11:58 +0200, Yann E. MORIN spake thusly:
> First, the .pc file was so far fixed as a post-configure hook of the
> matchbox-fakekey package, by directly tweaking the installed .pc file in
> staging. That's uterly wrong and bad.
> 
> Second, it was incorreclty tweaking the .pc file when xlib_libXft was
> not enabled, because then only a path to staging was present.
> 
> Third, even when xlib_libXft was enabled, the tweaking was still wrong,
> because unnecessary.
> 
> Fix all that.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  package/matchbox-fakekey/matchbox-fakekey.mk | 4 ++--
>  package/matchbox-lib/matchbox-lib.mk         | 7 +++++++
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk
> index 996206e266..e607c48c15 100644
> --- a/package/matchbox-fakekey/matchbox-fakekey.mk
> +++ b/package/matchbox-fakekey/matchbox-fakekey.mk
> @@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
>  MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
>  
>  define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
> -	$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
> -	$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
> +	$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' \
> +		$(@D)/Makefile
>  endef
>  
>  MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
> diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk
> index ee206b6d82..627e1c7417 100644
> --- a/package/matchbox-lib/matchbox-lib.mk
> +++ b/package/matchbox-lib/matchbox-lib.mk
> @@ -55,4 +55,11 @@ else
>  MATCHBOX_LIB_CONF_OPTS += --disable-xft
>  endif
>  
> +define MATCHBOX_LIB_FIX_PC
> +	$(SED) 's:-I$(STAGING_DIR)/:-I/:g' \
> +		-e 's:-I/usr/include\( \|$$\)::g' \
> +		$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
> +endef
> +MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_FIX_PC

Certainly not. There is already a similar hook at the top of the file.

But it is also incorrect anyway.

Damned.

I'll fix.

Regards,
Yann E. MORIN.

>  $(eval $(autotools-package))
> -- 
> 2.11.0
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-02 17:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-01  9:58 [Buildroot] [PATCH 0/2] package/matchbox: fixes Yann E. MORIN
2017-10-01  9:58 ` [Buildroot] [PATCH 1/2] matchbox-lib: select dependency Yann E. MORIN
2017-10-02 13:35   ` Arnout Vandecappelle
2017-10-02 17:14     ` Yann E. MORIN
2017-10-01  9:58 ` [Buildroot] [PATCH 2/2] package/matchbox-lib: correctly fix the .pc file Yann E. MORIN
2017-10-02 17:26   ` Yann E. MORIN

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.