diff options
| -rw-r--r-- | classes/autotools.bbclass | 12 | ||||
| -rw-r--r-- | classes/efl.bbclass | 5 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rw-r--r-- | packages/efl1/ecore-native_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/efl1/eet-native_cvs.bb | 3 |
5 files changed, 21 insertions, 5 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 1f03825b92..53480e5a15 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -214,6 +214,18 @@ autotools_stage_all() { echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} fi + + fi + # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files, + # however some packages rely on the presence of .pc files to enable/disable + # their configurataions in which case we better should not install everything + # unconditionally, but rather depend on the actual results of make install. + # The good news though: a) there are not many packages doing this and + # b) packaged staging will fix that anyways. :M: + if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] + then + echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" + cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true diff --git a/classes/efl.bbclass b/classes/efl.bbclass index eee28ddc75..cbbe6cad39 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -4,8 +4,11 @@ LICENSE = "MIT BSD" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}" S = "${WORKDIR}/${SRCNAME}" +DEPENDS += "pkgconfig-native" -inherit autotools pkgconfig +AUTOTOOLS_STAGE_PKGCONFIG = "1" +# do NOT inherit pkgconfig here, see note in autotools_stage_all +inherit autotools do_stage() { autotools_stage_all diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 13498ac7bc..9c14f9a018 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080321" +EFL_SRCDATE = "20080129" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb index b7d16b54ba..0ef5dec32f 100644 --- a/packages/efl1/ecore-native_cvs.bb +++ b/packages/efl1/ecore-native_cvs.bb @@ -4,9 +4,6 @@ DEPENDS = "eet-native evas-native" PR = "r3" EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - \ --enable-ecore-txt \ --disable-ecore-config \ --disable-ecore-x-xcb \ @@ -16,6 +13,7 @@ EXTRA_OECONF = "\ --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ + --enable-ecore-evas-fb \ --disable-ecore-evas-x11-gl \ --disable-ecore-evas-xrender \ --disable-ecore-evas-dfb \ diff --git a/packages/efl1/eet-native_cvs.bb b/packages/efl1/eet-native_cvs.bb index de162df5d5..096fd02524 100644 --- a/packages/efl1/eet-native_cvs.bb +++ b/packages/efl1/eet-native_cvs.bb @@ -1,3 +1,6 @@ require eet_cvs.bb inherit native DEPENDS = "zlib-native jpeg-native" +# we no longer inherit pkgconfig, so we need to state this explicitly +# (see explanation in efl.bbclass and autotools.bbclass) +DEPENDS += "pkgconfig-native" |