Skip to contentSkip to conversation

package/matchbox: fixes

PATCH New Yann E. MORIN 3 participants 7 messages Dec 23, 2017 – Jan 29, 2018

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

v2 cover package/matchbox: fixes

Hello All!

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

Changes v1 -> v2:
- more dependency fix (Arnout)
- more fix on the post-staging hook

Regards,
Yann E. MORIN.

The following changes since commit 2a604ddcd8d8bf093cdedaefc074a8c61933a4b6

luksmeta: enabled build with musl (2017-12-22 15:39:19 +0100)

are available in the git repository at:

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

for you to fetch changes up to 92f0878e530274e8e883f96c4eee06f4dce7241e

package/matchbox-lib: correctly fix the .pc file (2017-12-23 17:11:53 +0100)

----------------------------------------------------------------
Yann E. MORIN (2):
matchbox-lib: fix dependencies 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, 8 insertions(+), 5 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH v2 1/2 matchbox-lib: fix dependencies

matchbox-lib build-depends on xlib_libXext, but forgets to select it. It also build-depends on expat without selecting it, but it does need it.

Fix that: select xlib_libXext, remove expat.

Add myself to developpers for matchbox packages.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>

---
Changes v1 -> v2:
- drop the expat dependency (Arnout)

---
 DEVELOPERS                           | 1 +
 package/matchbox-lib/Config.in       | 1 +
 package/matchbox-lib/matchbox-lib.mk | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)
DEVELOPERS +1 -0
index 9f4f282203..61c26b0f53 100644
@@ -1843,6 +1843,7 @@ F:	package/libpri/
 F:	package/libseccomp/
 F:	package/libss7/
 F:	package/linux-tools/
+F:	package/matchbox*
 F:	package/mesa3d-headers/
 F:	package/nbd/
 F:	package/nut/
package/matchbox-lib/Config.in +1 -0
index e50a5436c1..d758ab35a8 100644
@@ -1,4 +1,5 @@
 config BR2_PACKAGE_MATCHBOX_LIB
 	bool "matchbox-lib"
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	help
 	  Matchbox common functionality library.
package/matchbox-lib/matchbox-lib.mk +2 -2
index ee206b6d82..18204d2d0b 100644
@@ -10,8 +10,8 @@ MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatch
 MATCHBOX_LIB_LICENSE = LGPL-2.1+
 MATCHBOX_LIB_LICENSE_FILES = COPYING
 MATCHBOX_LIB_INSTALL_STAGING = YES
-MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
-MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
+MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext
+MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs
 MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
 
 define MATCHBOX_LIB_POST_INSTALL_FIXES
Signature · 1 line
2.11.0
#2 lore raw

PATCH v2 1/2 matchbox-lib: fix dependencies

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

matchbox-lib build-depends on xlib_libXext, but forgets to select it. It also build-depends on expat without selecting it, but it does need it.

Fix that: select xlib_libXext, remove expat.

Quoted 8 lines

Add myself to developpers for matchbox packages.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>

---
Changes v1 -> v2:
- drop the expat dependency (Arnout)

Committed to 2017.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH v2 2/2 package/matchbox-lib: correctly fix the .pc file

In reply to Yann E. MORIN

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

So, we move the fix to matchbox-lib.

Second, it was incorreclty tweaking the .pc file when xlib_libXft was not enabled, because only then 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" <[email protected]>

---
Changes v1 -> v2:
- fix existing hook, rather than adding a new one

---
 package/matchbox-fakekey/matchbox-fakekey.mk | 4 ++--
 package/matchbox-lib/matchbox-lib.mk         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
package/matchbox-fakekey/matchbox-fakekey.mk +2 -2
index 996206e266..e607c48c15 100644
@@ -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
package/matchbox-lib/matchbox-lib.mk +2 -1
index 18204d2d0b..5541867699 100644
@@ -15,7 +15,8 @@ MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs
 MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
 
 define MATCHBOX_LIB_POST_INSTALL_FIXES
-	$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \
+	$(SED) 's:-I$(STAGING_DIR)/:-I/:g' \
+		-e 's:-I/usr/include\( \|$$\)::g' \
 		$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
 endef
Signature · 1 line
2.11.0
#4 lore raw

PATCH v2 2/2 package/matchbox-lib: correctly fix the .pc file

Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

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

So, we move the fix to matchbox-lib.

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

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

Quoted 7 lines

Fix all that.

Signed-off-by "Yann E. MORIN" <[email protected]>

---
Changes v1 -> v2:
- fix existing hook, rather than adding a new one

Committed to 2017.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
Applied
#5 lore raw

v2 cover package/matchbox: fixes

In reply to Yann E. MORIN

Hello,

Quoted 3 lines · Yann E. MORIN

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

Applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#6 lore raw

v2 cover package/matchbox: fixes

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 3 lines · Yann E. MORIN

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

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard