mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

libxsettings: Include libxt in DEPENDS as without it, configure pulls in system directories, corrupts its .la files and breaks later packages. Also add version 0.16 from OE.

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@343 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-03-31 09:21:51 +00:00
parent 24b8210a43
commit dbc24a883d
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch
Vendored
+11
View File
@@ -0,0 +1,11 @@
--- libxsettings-client-0.16/Makefile.am.orig 2006-01-17 16:01:21.000000000 +0000
+++ libxsettings-client-0.16/Makefile.am 2006-01-17 16:01:30.000000000 +0000
@@ -3,7 +3,7 @@
source_h = xsettings-client.h xsettings-common.h
source_c = xsettings-client.c xsettings-common.c
-INCLUDES = -I $(includedir) $(X_CFLAGS)
+INCLUDES = $(X_CFLAGS)
libxsincludedir = $(includedir)
openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
+3 -6
View File
@@ -1,17 +1,15 @@
SECTION = "gpe/libs" SECTION = "gpe/libs"
LICENSE = "BSD-X" LICENSE = "BSD-X"
PRIORITY = "optional" PRIORITY = "optional"
DEPENDS = "libxsettings libx11" DEPENDS = "libxsettings libx11 libxt"
PR = "r1" # libxt is required to stop configure breaking builds by
# including system paths to find it if it isn't present.
inherit autotools pkgconfig gpe inherit autotools pkgconfig gpe
SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
S = ${WORKDIR}/xsettings-client-${PV} S = ${WORKDIR}/xsettings-client-${PV}
do_configure () {
X_LIBS=" -L${STAGING_LIBDIR}" oe_runconf
}
headers = "xsettings-client.h xsettings-common.h" headers = "xsettings-client.h xsettings-common.h"
do_stage () { do_stage () {
@@ -21,4 +19,3 @@ do_stage () {
install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
done done
} }
openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb
+24
View File
@@ -0,0 +1,24 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
DEPENDS = "libxsettings libx11 libxt"
# libxt is required to stop configure breaking builds by
# including system paths to find it if it isn't present.
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
PR="r1"
inherit autotools pkgconfig gpe
SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \
file://Makefile-am.patch;patch=1"
headers = "xsettings-client.h xsettings-common.h"
do_stage () {
oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}
for h in ${headers}; do
install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
done
}