diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-05-07 10:03:07 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-05-07 10:03:07 +0000 |
| commit | 676ee8f6c7b2ca741a337d98bf1abf0c668b45ac (patch) | |
| tree | a22295a536deec31985702ab3c8ac8ded840dc24 | |
| parent | 4293a82a6425a2baa39e26d18c1285b092c31254 (diff) | |
libsoup: modify staging funciton to not symlink, we don't want libsoup.pc, but libsoup-2.x.pc
epiphany: depend on libsoup-2.4
| -rw-r--r-- | packages/gnome/epiphany_2.22.1.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/libsoup-2.4_2.4.1.bb (renamed from packages/gnome/libsoup_2.4.1.bb) | 14 | ||||
| -rw-r--r-- | packages/gnome/libsoup_2.2.100.bb | 5 |
3 files changed, 12 insertions, 9 deletions
diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb index 82f158eae2..d2d45475b7 100644 --- a/packages/gnome/epiphany_2.22.1.bb +++ b/packages/gnome/epiphany_2.22.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "GNOME default webbrowser" -DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS = "gnome-vfs-plugin-http" inherit gnome diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup-2.4_2.4.1.bb index 42e5decb05..24de169e6f 100644 --- a/packages/gnome/libsoup_2.4.1.bb +++ b/packages/gnome/libsoup-2.4_2.4.1.bb @@ -1,17 +1,19 @@ -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "An HTTP library implementation in C" SECTION = "x11/gnome/libs" LICENSE = "GPL" DEPENDS = "glib-2.0 gnutls libxml2" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2" +PR = "r1" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2" +S = "${WORKDIR}/libsoup-${PV}" + +inherit autotools -inherit autotools pkgconfig +AUTOTOOLS_STAGE_PKGCONFIG = "1" do_stage() { - autotools_stage_all - cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc + autotools_stage_all } FILES_${PN} = "${libdir}/lib*.so.*" diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index 0193f91521..d69a985627 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -2,11 +2,13 @@ DESCRIPTION = "An HTTP library implementation in C" LICENSE = "GPL" SECTION = "x11/gnome/libs" +PR = "r1" + DEPENDS = "glib-2.0 gnutls libxml2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" -inherit autotools pkgconfig +inherit autotools FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev = "${includedir}/ ${libdir}/" @@ -16,5 +18,4 @@ AUTOTOOLS_STAGE_PKGCONFIG = "1" do_stage() { autotools_stage_all - ln -sf libsoup-2.2.pc ${PKG_CONFIG_DIR}/libsoup.pc } |