diff options
author | Richard Purdie <richard@openedhand.com> | 2006-03-31 09:21:51 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-03-31 09:21:51 +0000 |
commit | dbc24a883d61c5bc2b7cfaaac1831be40ee7d7fd (patch) | |
tree | ea920240b278390945858e18aaa88ddac2c78a18 | |
parent | 24b8210a43c7e558aa8480200ce7e8d373dc5a1a (diff) | |
download | poky-dbc24a883d61c5bc2b7cfaaac1831be40ee7d7fd.tar.gz |
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.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@343 311d38ba-8fff-0310-9ca6-ca027cbcb966
3 files changed, 38 insertions, 6 deletions
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch b/openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch new file mode 100644 index 0000000000..fb5b1dbe65 --- /dev/null +++ b/openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- libxsettings-client-0.16/Makefile.am.orig 2006-01-17 16:01:21.000000000 +0000 | ||
2 | +++ libxsettings-client-0.16/Makefile.am 2006-01-17 16:01:30.000000000 +0000 | ||
3 | @@ -3,7 +3,7 @@ | ||
4 | source_h = xsettings-client.h xsettings-common.h | ||
5 | source_c = xsettings-client.c xsettings-common.c | ||
6 | |||
7 | -INCLUDES = -I $(includedir) $(X_CFLAGS) | ||
8 | +INCLUDES = $(X_CFLAGS) | ||
9 | |||
10 | libxsincludedir = $(includedir) | ||
11 | |||
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb index 7e1b4df2c4..f2e77735f9 100644 --- a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb | |||
@@ -1,17 +1,15 @@ | |||
1 | SECTION = "gpe/libs" | 1 | SECTION = "gpe/libs" |
2 | LICENSE = "BSD-X" | 2 | LICENSE = "BSD-X" |
3 | PRIORITY = "optional" | 3 | PRIORITY = "optional" |
4 | DEPENDS = "libxsettings libx11" | 4 | DEPENDS = "libxsettings libx11 libxt" |
5 | PR = "r1" | 5 | # libxt is required to stop configure breaking builds by |
6 | # including system paths to find it if it isn't present. | ||
6 | 7 | ||
7 | inherit autotools pkgconfig gpe | 8 | inherit autotools pkgconfig gpe |
8 | 9 | ||
9 | SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" | 10 | SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" |
10 | S = ${WORKDIR}/xsettings-client-${PV} | 11 | S = ${WORKDIR}/xsettings-client-${PV} |
11 | 12 | ||
12 | do_configure () { | ||
13 | X_LIBS=" -L${STAGING_LIBDIR}" oe_runconf | ||
14 | } | ||
15 | 13 | ||
16 | headers = "xsettings-client.h xsettings-common.h" | 14 | headers = "xsettings-client.h xsettings-common.h" |
17 | do_stage () { | 15 | do_stage () { |
@@ -21,4 +19,3 @@ do_stage () { | |||
21 | install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h | 19 | install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h |
22 | done | 20 | done |
23 | } | 21 | } |
24 | |||
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb new file mode 100644 index 0000000000..45d9b1c307 --- /dev/null +++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SECTION = "gpe/libs" | ||
2 | LICENSE = "BSD-X" | ||
3 | PRIORITY = "optional" | ||
4 | DEPENDS = "libxsettings libx11 libxt" | ||
5 | # libxt is required to stop configure breaking builds by | ||
6 | # including system paths to find it if it isn't present. | ||
7 | MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" | ||
8 | PR="r1" | ||
9 | |||
10 | inherit autotools pkgconfig gpe | ||
11 | |||
12 | SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ | ||
13 | file://Makefile-am.patch;patch=1" | ||
14 | |||
15 | |||
16 | headers = "xsettings-client.h xsettings-common.h" | ||
17 | do_stage () { | ||
18 | oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} | ||
19 | mkdir -p ${STAGING_INCDIR} | ||
20 | for h in ${headers}; do | ||
21 | install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h | ||
22 | done | ||
23 | } | ||
24 | |||