diff options
| -rw-r--r-- | meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch | 35 | ||||
| -rw-r--r-- | meta/packages/gnome/orbit2-native_2.10.2.bb | 21 | ||||
| -rw-r--r-- | meta/packages/gnome/orbit2_2.10.2.bb | 46 |
3 files changed, 0 insertions, 102 deletions
diff --git a/meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch b/meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch deleted file mode 100644 index 7485a0ce0c..0000000000 --- a/meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | --- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100 | ||
| 2 | +++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100 | ||
| 3 | @@ -193,19 +193,19 @@ | ||
| 4 | dnl So many people with broken linking setups asked about this | ||
| 5 | dnl it turned out to be necessary to check for this. | ||
| 6 | dnl | ||
| 7 | -dofus_save_libs="$LIBS" | ||
| 8 | -LIBS="$ORBIT_LIBS $LIBS" | ||
| 9 | -AC_TRY_RUN([ #include <stdio.h> | ||
| 10 | - main () | ||
| 11 | - { | ||
| 12 | - return 0; | ||
| 13 | - } ],, | ||
| 14 | - AC_MSG_ERROR([ | ||
| 15 | -Linking is badly borked on your system. Please ensure your library path is correct | ||
| 16 | -Check config.log for details - check near the end of the log above 'failed program was' | ||
| 17 | -Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the | ||
| 18 | -prefix you're compiling on: '${prefix}' ])) | ||
| 19 | -LIBS="$dofus_save_libs" | ||
| 20 | +dnl dofus_save_libs="$LIBS" | ||
| 21 | +dnl LIBS="$ORBIT_LIBS $LIBS" | ||
| 22 | +dnl AC_TRY_RUN([ #include <stdio.h> | ||
| 23 | +dnl main () | ||
| 24 | +dnl { | ||
| 25 | +dnl return 0; | ||
| 26 | +dnl } ],, | ||
| 27 | +dnl AC_MSG_ERROR([ | ||
| 28 | +dnl Linking is badly borked on your system. Please ensure your library path is correct | ||
| 29 | +dnl Check config.log for details - check near the end of the log above 'failed program was' | ||
| 30 | +dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the | ||
| 31 | +dnl prefix you're compiling on: '${prefix}' ])) | ||
| 32 | +dnl LIBS="$dofus_save_libs" | ||
| 33 | |||
| 34 | orig_CPPFLAGS=$CPPFLAGS | ||
| 35 | CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" | ||
diff --git a/meta/packages/gnome/orbit2-native_2.10.2.bb b/meta/packages/gnome/orbit2-native_2.10.2.bb deleted file mode 100644 index 69fb3ded32..0000000000 --- a/meta/packages/gnome/orbit2-native_2.10.2.bb +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | DESCRIPTION = "CORBA ORB" | ||
| 2 | LICENSE = "LGPL GPL" | ||
| 3 | SECTION = "x11/gnome/libs" | ||
| 4 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \ | ||
| 5 | file://configure-lossage.patch;patch=1;pnum=1 \ | ||
| 6 | file://gtk-doc.m4 \ | ||
| 7 | file://gtk-doc.make" | ||
| 8 | DEPENDS = "libidl-native popt-native gtk-doc" | ||
| 9 | |||
| 10 | S = "${WORKDIR}/ORBit2-${PV}" | ||
| 11 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orbit2-${PV}" | ||
| 12 | |||
| 13 | inherit autotools native pkgconfig | ||
| 14 | |||
| 15 | EXTRA_OECONF = "--disable-gtk-doc" | ||
| 16 | |||
| 17 | do_configure_prepend() { | ||
| 18 | mkdir -p m4 | ||
| 19 | install ${WORKDIR}/gtk-doc.m4 ./m4/ | ||
| 20 | install ${WORKDIR}/gtk-doc.make ./ | ||
| 21 | } | ||
diff --git a/meta/packages/gnome/orbit2_2.10.2.bb b/meta/packages/gnome/orbit2_2.10.2.bb deleted file mode 100644 index 4ac4129414..0000000000 --- a/meta/packages/gnome/orbit2_2.10.2.bb +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | LICENSE = "GPL" | ||
| 2 | PR = "r2" | ||
| 3 | DESCRIPTION = "CORBA ORB" | ||
| 4 | SECTION = "x11/gnome/libs" | ||
| 5 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \ | ||
| 6 | file://configure-lossage.patch;patch=1;pnum=1 \ | ||
| 7 | file://gtk-doc.m4 \ | ||
| 8 | file://gtk-doc.make" | ||
| 9 | DEPENDS = "libidl popt orbit2-native gtk-doc" | ||
| 10 | |||
| 11 | FILES_${PN} += "${libdir}/orbit-2.0/*.so" | ||
| 12 | |||
| 13 | S = "${WORKDIR}/ORBit2-${PV}" | ||
| 14 | |||
| 15 | inherit autotools pkgconfig | ||
| 16 | |||
| 17 | EXTRA_OECONF = "--disable-gtk-doc" | ||
| 18 | EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" | ||
| 19 | |||
| 20 | do_configure_prepend() { | ||
| 21 | mkdir -p m4 | ||
| 22 | install ${WORKDIR}/gtk-doc.m4 ./m4/ | ||
| 23 | install ${WORKDIR}/gtk-doc.make ./ | ||
| 24 | } | ||
| 25 | |||
| 26 | do_compile_append () { | ||
| 27 | sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new | ||
| 28 | mv ORBit-2.0.pc.new ORBit-2.0.pc | ||
| 29 | } | ||
| 30 | |||
| 31 | do_stage() { | ||
| 32 | oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} | ||
| 33 | oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} | ||
| 34 | oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} | ||
| 35 | install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ | ||
| 36 | |||
| 37 | for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do | ||
| 38 | install -d ${STAGING_INCDIR}/orbit-2.0/$dir | ||
| 39 | ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done ) | ||
| 40 | done | ||
| 41 | |||
| 42 | install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices | ||
| 43 | install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ | ||
| 44 | install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ | ||
| 45 | install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ | ||
| 46 | } | ||
