From 45b8741f7b138d039e0b1107ba1f1d41f61b5f26 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 Aug 2005 23:08:49 +0000 Subject: Third (and hopefully last) EFL revamp before I hand over maintainership to Justin Patrin. We now have a efl.bbclass that contains common code for the various libraries. This makes it possible to have very clean and concise bb's. --- classes/efl.bbclass | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 classes/efl.bbclass (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass new file mode 100644 index 0000000000..120f26f6ce --- /dev/null +++ b/classes/efl.bbclass @@ -0,0 +1,33 @@ +MAINTAINER = "Justin Patrin " +HOMEPAGE = "http://www.enlightenment.org" +SECTION = "e/libs" + +SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" +SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig binconfig + +INHIBIT_AUTO_STAGE_INCLUDES = "1" +INHIBIT_NATIVE_STAGE_INSTALL = "1" + +libdirectory = "src/lib" +libraries = "lib${SRCNAME}" +headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" + +do_stage_append () { + for i in ${libraries} + do + oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR} + done + for i in ${headers} + do + install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR} + done +} + +PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}" +FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" +FILES_${SRCNAME}-examples = "${bindir} ${datadir}" + -- cgit v1.2.3 From 1556b699992c606401e4bd5aa4153cda8639b9ad Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 10 Aug 2005 14:30:52 +0000 Subject: E: misc cleanups and fixes all over to ensure a clean reproducability --- classes/efl.bbclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 120f26f6ce..2f6838ab13 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -15,6 +15,22 @@ libdirectory = "src/lib" libraries = "lib${SRCNAME}" headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" +def binconfig_suffix(d): + import bb + return ["","-native"][bb.data.inherits_class('native', d)] + +export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" +export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" +export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" +export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" +export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" +export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" + do_stage_append () { for i in ${libraries} do -- cgit v1.2.3 From 049c02152682c0bd92b31bab58561c407fdd4265 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 10 Aug 2005 16:39:05 +0000 Subject: more EFL fixes + add the enlightenment library from the E window manager as dedicated library --- classes/efl.bbclass | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 2f6838ab13..b7bb87360d 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -19,17 +19,19 @@ def binconfig_suffix(d): import bb return ["","-native"][bb.data.inherits_class('native', d)] -export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" -export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" -export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" -export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" -export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" -export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" +export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" +export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" +export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" +export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}" +export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" +export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" +export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" do_stage_append () { for i in ${libraries} -- cgit v1.2.3 From 7c4772d193f1a499f51cbfb6e25055b016a68eb9 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 11 Aug 2005 20:37:06 +0000 Subject: themes dir should be included in the main package --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index b7bb87360d..119f527860 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -45,7 +45,7 @@ do_stage_append () { } PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}" -FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME} = "${libdir} ${datadir}/${SRCNAME}/themes" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From f9a4e52ae8a4490d77270052077b935860b15ef2 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 11 Aug 2005 20:51:23 +0000 Subject: Switch to creating a -theme package instead of including themes in the main package --- classes/efl.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 119f527860..2fe8a6ad8e 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -44,8 +44,9 @@ do_stage_append () { done } -PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}" -FILES_${SRCNAME} = "${libdir} ${datadir}/${SRCNAME}/themes" +PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME} ${SRCNAME}-theme" +FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 216826630f56103c2d75c0c512c1978fa65079a3 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 11 Aug 2005 22:55:21 +0000 Subject: Change theme package to themes instead --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 2fe8a6ad8e..f160ee8a90 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -44,7 +44,7 @@ do_stage_append () { done } -PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME} ${SRCNAME}-theme" +PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}" FILES_${SRCNAME} = "${libdir}" FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" -- cgit v1.2.3 From 571a4fc239ca4358c47664c26683370354ce4f6f Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 13 Aug 2005 00:41:45 +0000 Subject: Make clean and distclean for EFL Automatically install named binaries when compiling native Add more files/directories to theme and dev packages --- classes/efl.bbclass | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index f160ee8a90..752881314d 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -8,6 +8,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools pkgconfig binconfig +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + INHIBIT_AUTO_STAGE_INCLUDES = "1" INHIBIT_NATIVE_STAGE_INSTALL = "1" @@ -42,11 +47,30 @@ do_stage_append () { do install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR} done + + # Install binaries automatically for native builds + if [ "${@binconfig_suffix(d)}" = "-native" ] + then + + # Most EFL binaries start with the package name + for i in src/bin/${SRCNAME}* + do + if [ -x $i -a -f $i ] + then + + # Don't install anything with an extension (.so, etc) + if echo $i | grep -v \\. + then + ${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR} + fi + fi + done + fi } PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}" FILES_${SRCNAME} = "${libdir}" -FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" +FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From a38fc2c782c70bc2c19ddeed8d8abceaf07efcf6 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 17 Aug 2005 17:26:23 +0000 Subject: Alter ordering of PACKAGES to allow themes package to get its files (still not working for ewl, however) --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 752881314d..ad77358213 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -68,7 +68,7 @@ do_stage_append () { fi } -PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}" +PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" FILES_${SRCNAME} = "${libdir}" FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" -- cgit v1.2.3 From c355755e38003a906085114be463792fd9de4ff8 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 17 Aug 2005 17:33:04 +0000 Subject: Add missing s on FILES for themes package --- classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index ad77358213..ff6929d757 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -70,7 +70,7 @@ do_stage_append () { PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" FILES_${SRCNAME} = "${libdir}" -FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" +FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 1433ea1f97ed4a9b7d0b8a0945e3c7530154a0fb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 25 Aug 2005 23:49:45 +0000 Subject: efl.bbclass: move libfoo.la and libfoo.a into ${PN}-dev --- classes/efl.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index ff6929d757..16c2dba0b8 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -69,8 +69,8 @@ do_stage_append () { } PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" -FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME} = "${libdir}/lib*.so*" FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From a9e4f9da6ecb564965ec017ccc764a9d4a44f047 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 5 Oct 2005 23:25:49 +0000 Subject: efl, e-wm: add a quick sed fix for e builds using system include paths - This is not likely to affect anyone except 64-bit linux users who have multiple files files -- This definately affects Gentoo linux on amd64. It has a stub header which includes a 386 or x86_64 depending on defines. However, since OE normally compiles for non-x86 this header actually includes nothing and stops the compile altogether due to missing typedefs and prototypes. --- classes/efl.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 16c2dba0b8..964748e85c 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -38,6 +38,10 @@ export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + do_stage_append () { for i in ${libraries} do -- cgit v1.2.3 From 62ad45c05d779ecebc96d385bd3f80dd39efb439 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Mon, 10 Oct 2005 18:05:42 +0000 Subject: efl, e-wm: Add a sed fix for X11 system headers --- classes/efl.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/efl.bbclass') diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 964748e85c..b438ca61b4 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -40,6 +40,7 @@ export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' } do_stage_append () { -- cgit v1.2.3