diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
| commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
| tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/libxsettings-client | |
| parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
| download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz | |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libxsettings-client')
| -rw-r--r-- | meta/packages/libxsettings-client/libxsettings-client_0.14.bb | 21 | ||||
| -rw-r--r-- | meta/packages/libxsettings-client/make_pkgconfig_x11.patch | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.14.bb b/meta/packages/libxsettings-client/libxsettings-client_0.14.bb new file mode 100644 index 0000000000..f2e77735f9 --- /dev/null +++ b/meta/packages/libxsettings-client/libxsettings-client_0.14.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 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 | |||
| 8 | inherit autotools pkgconfig gpe | ||
| 9 | |||
| 10 | SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" | ||
| 11 | S = ${WORKDIR}/xsettings-client-${PV} | ||
| 12 | |||
| 13 | |||
| 14 | headers = "xsettings-client.h xsettings-common.h" | ||
| 15 | do_stage () { | ||
| 16 | oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} | ||
| 17 | mkdir -p ${STAGING_INCDIR} | ||
| 18 | for h in ${headers}; do | ||
| 19 | install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h | ||
| 20 | done | ||
| 21 | } | ||
diff --git a/meta/packages/libxsettings-client/make_pkgconfig_x11.patch b/meta/packages/libxsettings-client/make_pkgconfig_x11.patch new file mode 100644 index 0000000000..3a386672d2 --- /dev/null +++ b/meta/packages/libxsettings-client/make_pkgconfig_x11.patch | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | --- libxsettings-client0-0.12/Makefile.old 2004-04-20 16:48:18.000000000 +1000 | ||
| 2 | +++ libxsettings-client0-0.12/Makefile 2004-04-20 16:58:07.000000000 +1000 | ||
| 3 | @@ -20,6 +20,9 @@ | ||
| 4 | CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" | ||
| 5 | CPPFLAGS += -I../libxsettings | ||
| 6 | |||
| 7 | +CFLAGS += `pkg-config --cflags x11` | ||
| 8 | +LDFLAGS += `pkg-config --ldflags x11` | ||
| 9 | + | ||
| 10 | XSETTINGS_OBJS = $(patsubst %,%.os,$(XSETTINGS_MEMBERS)) | ||
| 11 | DEPS = $(patsubst %,%.d,$(MEMBERS) $(XSETTINGS_MEMBERS)) | ||
| 12 | SOURCES = $(patsubst %,%.c,$(MEMBERS) $(XSETTINGS_MEMBERS)) | ||
| 13 | @@ -39,7 +42,7 @@ | ||
| 14 | ln -sf $^ $@ | ||
| 15 | |||
| 16 | $(LIBXSETTINGS_SO): $(XSETTINGS_OBJS) | ||
| 17 | - $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles -L/usr/X11R6/lib -lX11 -L../libxsettings -lXsettings | ||
| 18 | + $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles $(LDFLAGS) -L../libxsettings -lXsettings | ||
| 19 | |||
| 20 | install-program: $(LIBXSETTINGS_SO) | ||
| 21 | install -d $(DESTDIR)$(PREFIX)/lib | ||
