mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

orbit2: cleanup recipe, merge .inc and -native

Browse Source 
* fix LICENSE field
* this also upgrades -native from 2.14.12 to 2.14.17, because 2.14.12 is failing to
  configure:13143: checking alignment of CORBA_octet
  configure:13170: gcc -o conftest -isystem/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -pthread -I/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/glib-2.0 -I/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/glib-2.0/include    -L/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -L/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/lib -Wl,-rpath-link,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -Wl,-rpath-link,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/lib -Wl,-rpath,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -Wl,-rpath,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/lib -Wl,-O1 conftest.c -pthread -Wl,--export-dynamic -L/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lrt -lglib-2.0    >&5
  In file included from ./include/orbit/util/basic_types.h:5:0,
                   from conftest.c:45:
  /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/glib-2.0/glib/gunicode.h:23:2: error: #error 'Only <glib.h> can be included directly.'
* use GNOME_MIRROR and SHRT_VER in SRC_URI

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2012-05-08 09:57:16 +02:00
parent eaafb0b441
commit 7e5b1e477a
7 changed files with 44 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 → meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4
View File
meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make → meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make
View File
meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch → meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch
View File
meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb
-27
View File
@@ -1,27 +0,0 @@
DESCRIPTION = "CORBA ORB"
PR = "r0"
LICENSE = "LGPL GPL"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SECTION = "x11/gnome/libs"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
file://configure-lossage.patch \
file://gtk-doc.m4 \
file://gtk-doc.make"
DEPENDS = "libidl-native popt-native gtk-doc"
S = "${WORKDIR}/ORBit2-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orbit2"
PARALLEL_MAKE = ""
inherit autotools native pkgconfig
EXTRA_OECONF = "--disable-gtk-doc"
do_configure_prepend() {
mkdir -p m4
install ${WORKDIR}/gtk-doc.m4 ./m4/
install ${WORKDIR}/gtk-doc.make ./
}
SRC_URI[md5sum] = "6f4bf7d803d442e9d093a0daa203d506"
SRC_URI[sha256sum] = "d60027a4a36e64d02723d00b76c08e8d92850cab6269b2edcda4a1bb30cc7723"
meta-gnome/recipes-gnome/orbit2/orbit2.inc
-32
View File
@@ -1,32 +0,0 @@
LICENSE = "GPL"
DESCRIPTION = "CORBA ORB"
SECTION = "x11/gnome/libs"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
file://configure-lossage.patch \
file://pkgconfig-fix.patch \
file://gtk-doc.m4 \
file://gtk-doc.make"
DEPENDS = "libidl popt orbit2-native gtk-doc"
PARALLEL_MAKE = ""
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
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"
EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
do_configure_prepend() {
mkdir -p m4
install ${WORKDIR}/gtk-doc.m4 ./m4/
install ${WORKDIR}/gtk-doc.make ./
}
meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch
-35
View File
@@ -1,35 +0,0 @@
--- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100
+++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100
@@ -193,19 +193,19 @@
dnl So many people with broken linking setups asked about this
dnl it turned out to be necessary to check for this.
dnl
-dofus_save_libs="$LIBS"
-LIBS="$ORBIT_LIBS $LIBS"
-AC_TRY_RUN([ #include <stdio.h>
- main ()
- {
- return 0;
- } ],,
- AC_MSG_ERROR([
-Linking is badly borked on your system. Please ensure your library path is correct
-Check config.log for details - check near the end of the log above 'failed program was'
-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
-prefix you're compiling on: '${prefix}' ]))
-LIBS="$dofus_save_libs"
+dnl dofus_save_libs="$LIBS"
+dnl LIBS="$ORBIT_LIBS $LIBS"
+dnl AC_TRY_RUN([ #include <stdio.h>
+dnl main ()
+dnl {
+dnl return 0;
+dnl } ],,
+dnl AC_MSG_ERROR([
+dnl Linking is badly borked on your system. Please ensure your library path is correct
+dnl Check config.log for details - check near the end of the log above 'failed program was'
+dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
+dnl prefix you're compiling on: '${prefix}' ]))
+dnl LIBS="$dofus_save_libs"
orig_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
+44 -4
View File
@@ -1,6 +1,46 @@
require orbit2.inc
PR = "r1"
DESCRIPTION = "CORBA ORB"
SECTION = "x11/gnome/libs"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_NAME = "ORBit2"
SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \
file://configure-lossage.patch \
file://pkgconfig-fix.patch \
file://gtk-doc.m4 \
file://gtk-doc.make"
SRC_URI[md5sum] = "10bfb957fa4a8935a0b4afaee7d71df7"
SRC_URI[sha256sum] = "62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c"
PR = "r2"
BBCLASSEXTEND = "native"
IDL_COMPILER_DEPENDS = "orbit2-native"
IDL_COMPILER_DEPENDS_virtclass-native = " "
DEPENDS = "libidl popt gtk-doc ${IDL_COMPILER_DEPENDS}"
# IDL_COMPILER_DEPENDS_virtclass-native for some reason didn't work and orbit2-native
# was still in orbit2-native DEPENDS causing circular dependency
DEPENDS_virtclass-native = "libidl-native popt-native gtk-doc-native"
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}/${SRC_NAME}-${PV}"
LEAD_SONAME = "libORBit-2.so"
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-gtk-doc"
EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
EXTRA_OEMAKE_virtclass-native = " "
do_configure_prepend() {
mkdir -p m4
install ${WORKDIR}/gtk-doc.m4 ./m4/
install ${WORKDIR}/gtk-doc.make ./
}