diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-03-18 19:17:07 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-03-18 19:17:07 +0000 |
| commit | edeb6195704d0d22b5f7fefd0d72f3a7dc4ea0e7 (patch) | |
| tree | 30375c8ca03c5b89568f07ea1fd97520a4c8ae48 | |
| parent | 5afa2461314e70cb2561d98297b389f3e9586910 (diff) | |
orbit2: upgrade to 2.14.12 to cope with glib >= 2.15
* restore sanity of .pc after do_install
* fix packaing
| -rw-r--r-- | packages/gnome/orbit2-native_2.14.12.bb (renamed from packages/gnome/orbit2-native_2.14.0.bb) | 1 | ||||
| -rw-r--r-- | packages/gnome/orbit2_2.14.12.bb (renamed from packages/gnome/orbit2_2.14.0.bb) | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/packages/gnome/orbit2-native_2.14.0.bb b/packages/gnome/orbit2-native_2.14.12.bb index 2d52ab7eee..009974ade3 100644 --- a/packages/gnome/orbit2-native_2.14.0.bb +++ b/packages/gnome/orbit2-native_2.14.12.bb @@ -1,4 +1,5 @@ DESCRIPTION = "CORBA ORB" +PR = "r0" LICENSE = "LGPL GPL" SECTION = "x11/gnome/libs" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ diff --git a/packages/gnome/orbit2_2.14.0.bb b/packages/gnome/orbit2_2.14.12.bb index 5ce381f0ad..1ac0136e10 100644 --- a/packages/gnome/orbit2_2.14.0.bb +++ b/packages/gnome/orbit2_2.14.12.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r2" +PR = "r0" DESCRIPTION = "CORBA ORB" SECTION = "x11/gnome/libs" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ @@ -10,9 +10,13 @@ DEPENDS = "libidl popt orbit2-native gtk-doc" PARALLEL_MAKE = "" FILES_${PN} += "${libdir}/orbit-2.0/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la" +FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" S = "${WORKDIR}/ORBit2-${PV}" +LEAD_SONAME = "libORBit-2.so" + inherit autotools pkgconfig EXTRA_OECONF = "--disable-gtk-doc" @@ -25,8 +29,13 @@ do_configure_prepend() { } do_compile_append () { - sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new - mv ORBit-2.0.pc.new ORBit-2.0.pc + cp ORBit-2.0.pc ORBit-2.0.pc.old + sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new + mv ORBit-2.0.pc.new ORBit-2.0.pc +} + +do_install_append () { + mv ORBit-2.0.pc.old ORBit-2.0.pc } do_stage() { |