* remove do_stage and do_install those do not needed. ' fix the missing headerfiles in the dev package. * fix QA: non dev contains .so. * install.patch: adjust the patch a bit so that DESTDIR is used.
Signed-off-by: Michael Kurz <[email protected]> --- recipes/ode/files/install.patch | 23 ++++++++++++----------- recipes/ode/ode_0.9.bb | 25 +++++-------------------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/recipes/ode/files/install.patch b/recipes/ode/files/install.patch index d63229f..2f6cdb0 100644 --- a/recipes/ode/files/install.patch +++ b/recipes/ode/files/install.patch @@ -1,21 +1,22 @@ -Index: ode-0.9/Makefile.am -=================================================================== ---- ode-0.9.orig/Makefile.am -+++ ode-0.9/Makefile.am -@@ -25,13 +25,13 @@ dist-zip: ${PACKAGE}-${VERSION}.tar.gz +--- ode-0.9.orig/Makefile.am 2007-02-21 15:54:54.000000000 +0100 ++++ ode-0.9/Makefile.am 2010-08-21 16:15:55.000000000 +0200 +@@ -25,13 +25,13 @@ if USE_SONAME install-exec-hook: - ln -s $(libdir)/@ode_son...@.@ode_revis...@.@ODE_AGE@ \ -+ ln -sf ./@ode_son...@.@ode_revis...@.@ODE_AGE@ \ - $(libdir)/libode.so +- $(libdir)/libode.so - ln -s $(libdir)/@ode_son...@.@ode_revis...@.@ODE_AGE@ \ -+ ln -sf ./@ode_son...@.@ode_revis...@.@ODE_AGE@ \ - $(libdir)/@ODE_SONAME@ +- $(libdir)/@ODE_SONAME@ - ln -s $(libdir)/@ode_son...@.@ode_revis...@.@ODE_AGE@ \ -+ ln -sf ./@ode_son...@.@ode_revis...@.@ODE_AGE@ \ - $(libdir)/@ode_son...@.@ODE_REVISION@ +- $(libdir)/@ode_son...@.@ODE_REVISION@ - /sbin/ldconfig ++ ln -s @ode_son...@.@ode_revis...@.@ODE_AGE@ \ ++ $(DESTDIR)/$(libdir)/libode.so ++ ln -s @ode_son...@.@ode_revis...@.@ODE_AGE@ \ ++ $(DESTDIR)/$(libdir)/@ODE_SONAME@ ++ ln -s @ode_son...@.@ode_revis...@.@ODE_AGE@ \ ++ $(DESTDIR)/$(libdir)/@ode_son...@.@ODE_REVISION@ + echo /sbin/ldconfig else install-exec-hook: diff --git a/recipes/ode/ode_0.9.bb b/recipes/ode/ode_0.9.bb index 1383329..a7a8257 100644 --- a/recipes/ode/ode_0.9.bb +++ b/recipes/ode/ode_0.9.bb @@ -2,11 +2,14 @@ DESCRIPTION = "ODE is an Open Source Physics Engine." SECTION = "libs" HOMEPAGE = "http://www.ode.org"; LICENSE = "LGPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \ file://install.patch" +SRC_URI[md5sum] = "4c03759b76a0649a6d5108c8e172e1e4" +SRC_URI[sha256sum] = "460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb" + inherit autotools binconfig EXTRA_OECONF = "--disable-demos --enable-soname" @@ -15,23 +18,5 @@ do_configure_append() { echo "#define dInfinity DBL_MAX" >>include/ode/config.h } -do_stage() { - oe_runmake install \ - bindir=${STAGING_BINDIR_CROSS} \ - libdir=${STAGING_LIBDIR} \ - includedir=${STAGING_INCDIR} \ - datadir=${STAGING_DATADIR} -} +FILES_${PN} = "${libdir}/lib*${SOLIBS}" -do_install() { - oe_runmake install \ - bindir=${D}${bindir} \ - libdir=${D}${libdir} \ - includedir=${D}${incdir} \ - datadir=${D}${datadir} -} - -FILES_${PN} = "${libdir}/lib*.so*" - -SRC_URI[md5sum] = "4c03759b76a0649a6d5108c8e172e1e4" -SRC_URI[sha256sum] = "460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb" -- 1.7.1 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
