Patchwork [12/26] libxft: use default bitbake.conf FILES Packaging to handle staticdev

login
register
mail settings
Submitter Saul Wold
Date July 11, 2011, 11:13 p.m.
Message ID <febb9488289e43ac06b9383dfffa2d584f49aa16.1310425837.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7395/
State New, archived
Headers show

Comments

Saul Wold - July 11, 2011, 11:13 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
Koen Kooi - July 12, 2011, 7:10 a.m.
Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven:

> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb |    7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
> index 1a56702..997db3e 100644
> --- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
> +++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
> @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
> DEPENDS += "libxrender freetype fontconfig"
> PROVIDES = "xft"
> 
> -PR = "r0"
> +PR = "r1"
> PE = "1"
> 
> XORG_PN = "libXft"
> @@ -28,10 +28,7 @@ python () {
>             bb.data.setVar('PKG_${PN}', 'libxft2', d)
> }
> 
> -FILES_${PN} = "${libdir}/lib*${SOLIBS}"
> -FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
> -		${libdir}/*.a ${libdir}/pkgconfig \
> -		${datadir}/aclocal ${bindir} ${sbindir}"
> +FILES_${PN}-dev += "${bindir} ${sbindir}"


$ dpkg-deb -c ipk/armv7a/libxft-dev_2.2.0-r0_armv7a.ipk 
drwxr-xr-x root/root         0 2011-07-11 09:28 ./
drwxr-xr-x root/root         0 2011-07-11 09:28 ./usr/
drwxr-xr-x root/root         0 2011-07-11 09:28 ./usr/include/
drwxr-xr-x root/root         0 2011-07-11 09:28 ./usr/include/X11/
drwxr-xr-x root/root         0 2011-07-11 09:28 ./usr/include/X11/Xft/
-rw-r--r-- root/root      5223 2011-07-11 09:28 ./usr/include/X11/Xft/XftCompat.h
-rw-r--r-- root/root     12533 2011-07-11 09:28 ./usr/include/X11/Xft/Xft.h
drwxr-xr-x root/root         0 2011-07-11 09:28 ./usr/lib/
-rwxr-xr-x root/root      1228 2011-07-11 09:28 ./usr/lib/libXft.la
drwxr-xr-x root/root         0 2011-07-11 09:28 ./usr/lib/pkgconfig/
-rw-r--r-- root/root       241 2011-07-11 09:28 ./usr/lib/pkgconfig/xft.pc
lrwxrwxrwx root/root         0 2011-07-11 09:28 ./usr/lib/libXft.so -> libXft.so.2.2.0
-rw-r--r-- root/root    847424 2011-07-11 09:28 ./usr/lib/libXft.a

Is there actually something in (s)bindir?

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
index 1a56702..997db3e 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
@@ -18,7 +18,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
 DEPENDS += "libxrender freetype fontconfig"
 PROVIDES = "xft"
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXft"
@@ -28,10 +28,7 @@  python () {
             bb.data.setVar('PKG_${PN}', 'libxft2', d)
 }
 
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}"
+FILES_${PN}-dev += "${bindir} ${sbindir}"
 
 SRC_URI[md5sum] = "cce3c327258116493b753f157e0360c7"
 SRC_URI[sha256sum] = "c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2"