[oe-commits] Steve Sakoman : orbit2: restructure recipes to use orbit2.inc, add 2.14.17
git version control
git at git.openembedded.org
Thu Sep 3 08:34:19 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2882710987e2c12df407f52797cd728ed04e9cf3
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2882710987e2c12df407f52797cd728ed04e9cf3
Author: Steve Sakoman <steve at sakoman.com>
Date: Wed Sep 2 21:35:12 2009 -0700
orbit2: restructure recipes to use orbit2.inc, add 2.14.17
---
conf/checksums.ini | 4 ++
.../gnome/orbit2-2.14.17/configure-lossage.patch | 37 +++++++++++++++
recipes/gnome/orbit2.inc | 46 +++++++++++++++++++
recipes/gnome/orbit2_2.14.12.bb | 47 +-------------------
recipes/gnome/orbit2_2.14.16.bb | 46 +-------------------
recipes/gnome/orbit2_2.14.17.bb | 2 +
6 files changed, 92 insertions(+), 90 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d4fd7fd..72ad40d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -678,6 +678,10 @@ sha256=d60027a4a36e64d02723d00b76c08e8d92850cab6269b2edcda4a1bb30cc7723
md5=f4898b999f39c79d55c13c0e0f597c71
sha256=e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1
+[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2]
+md5=10bfb957fa4a8935a0b4afaee7d71df7
+sha256=62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c
+
[http://downloads.sourceforge.net/openipmi/OpenIPMI-2.0.14.tar.gz]
md5=f766680bb237ca2f837c005efba54efa
sha256=fbd907dde45054227568f3117df0418a7819cfee02875d3723779432e8a66dc9
diff --git a/recipes/gnome/orbit2-2.14.17/configure-lossage.patch b/recipes/gnome/orbit2-2.14.17/configure-lossage.patch
new file mode 100644
index 0000000..5fc1de5
--- /dev/null
+++ b/recipes/gnome/orbit2-2.14.17/configure-lossage.patch
@@ -0,0 +1,37 @@
+--- ORBit2-2.14.17/configure.in-orig 2009-01-10 09:36:18.000000000 -0800
++++ ORBit2-2.14.17/configure.in 2009-06-17 15:10:59.000000000 -0700
+@@ -217,20 +217,20 @@ dnl
+ 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}' ]),
+-AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
+-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 AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
++dnl LIBS="$dofus_save_libs"
+
+ orig_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
diff --git a/recipes/gnome/orbit2.inc b/recipes/gnome/orbit2.inc
new file mode 100644
index 0000000..5f6e6f6
--- /dev/null
+++ b/recipes/gnome/orbit2.inc
@@ -0,0 +1,46 @@
+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;patch=1;pnum=1 \
+ file://pkgconfig-fix.patch;patch=1 \
+ file://gtk-doc.m4 \
+ file://gtk-doc.make"
+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"
+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 ./
+}
+
+do_stage() {
+ oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR}
+ oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR}
+ oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR}
+ install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/
+
+ for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do
+ install -d ${STAGING_INCDIR}/orbit-2.0/$dir
+ ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done )
+ done
+
+ install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices
+ install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
+ install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
+ install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
+}
diff --git a/recipes/gnome/orbit2_2.14.12.bb b/recipes/gnome/orbit2_2.14.12.bb
index 1407761..7afc824 100644
--- a/recipes/gnome/orbit2_2.14.12.bb
+++ b/recipes/gnome/orbit2_2.14.12.bb
@@ -1,47 +1,4 @@
-LICENSE = "GPL"
-PR = "r1"
-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;patch=1;pnum=1 \
- file://pkgconfig-fix.patch;patch=1 \
- file://gtk-doc.m4 \
- file://gtk-doc.make"
-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
+require orbit2.inc
-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 ./
-}
-
-do_stage() {
- oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR}
- install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/
-
- for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do
- install -d ${STAGING_INCDIR}/orbit-2.0/$dir
- ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done )
- done
+PR = "r1"
- install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices
- install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
- install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
- install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
-}
diff --git a/recipes/gnome/orbit2_2.14.16.bb b/recipes/gnome/orbit2_2.14.16.bb
index 5f6e6f6..a5d5cd0 100644
--- a/recipes/gnome/orbit2_2.14.16.bb
+++ b/recipes/gnome/orbit2_2.14.16.bb
@@ -1,46 +1,2 @@
-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;patch=1;pnum=1 \
- file://pkgconfig-fix.patch;patch=1 \
- file://gtk-doc.m4 \
- file://gtk-doc.make"
-DEPENDS = "libidl popt orbit2-native gtk-doc"
-PARALLEL_MAKE = ""
+require orbit2.inc
-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 ./
-}
-
-do_stage() {
- oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR}
- install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/
-
- for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do
- install -d ${STAGING_INCDIR}/orbit-2.0/$dir
- ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done )
- done
-
- install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices
- install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
- install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
- install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
-}
diff --git a/recipes/gnome/orbit2_2.14.17.bb b/recipes/gnome/orbit2_2.14.17.bb
new file mode 100644
index 0000000..a5d5cd0
--- /dev/null
+++ b/recipes/gnome/orbit2_2.14.17.bb
@@ -0,0 +1,2 @@
+require orbit2.inc
+
More information about the Openembedded-commits
mailing list