summaryrefslogtreecommitdiff
path: root/edb
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-07-31 15:51:15 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-07-31 15:51:15 +0000
commit61ab96a9c42457d982168c1ddd1621cab8694e72 (patch)
treec826c2c62a20d1fbf6a9fb8f72b6d01d59945186 /edb
parent72dd8bd4262e58a39a0304d12562436f088f3a8e (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/07/31 17:47:35+02:00 uni-frankfurt.de!mickey fix meta-e 2004/07/31 14:10:13+02:00 uni-frankfurt.de!mickey the E Widget Library now builds 2004/07/31 13:52:36+02:00 uni-frankfurt.de!mickey edje now builds (insert applause.wav here) 2004/07/31 04:15:52+02:00 uni-frankfurt.de!mickey fix prefix and exec-prefix bug 2004/07/31 04:15:16+02:00 uni-frankfurt.de!mickey migrate enlightenment (and friends) to binconfig.oeclass 2004/07/31 04:12:47+02:00 uni-frankfurt.de!mickey add binconfig.oeclass. This class cleans up the situation with packages utilizing foo-config scripts to gather cflags and libs etc. This class does a) eliminate the need for boiler plate code in the .oe files and b) differentiates between native and non-native packages which previously stepped on each other's toe because both kinds of packages wanted to install their foo-configs into STAGING_DIR. native packages now use foo-config-native. this class has been tested w/ the enlightenment stuff (evas,eet,edb,etox,imlib2,freetype,edje). please migrate .oe packages to it when you have a chance. 2004/07/31 02:43:44+02:00 uni-frankfurt.de!mickey Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/07/31 01:27:45+02:00 uni-frankfurt.de!mickey Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/07/30 17:44:51+02:00 uni-frankfurt.de!mickey on the way to edje-native: complete edb-native and add ecore-native BKrev: 410bbff3H9FfStU2Nxq1H1ECuGhU-Q
Diffstat (limited to 'edb')
-rw-r--r--edb/edb-native_cvs.oe5
-rw-r--r--edb/edb_cvs.oe7
2 files changed, 4 insertions, 8 deletions
diff --git a/edb/edb-native_cvs.oe b/edb/edb-native_cvs.oe
index e5899d41b1..bf6dde0ca5 100644
--- a/edb/edb-native_cvs.oe
+++ b/edb/edb-native_cvs.oe
@@ -3,6 +3,7 @@ inherit native
DEPENDS = "zlib-native"
do_stage () {
- oe_libinstall -C src libedb ${libdir}/
- install -m 0755 tools/.libs/edb_ed ${bindir}/
+ install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
+ oe_libinstall -C src libedb ${STAGING_LIBDIR}/
+ install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
}
diff --git a/edb/edb_cvs.oe b/edb/edb_cvs.oe
index b75218db78..4a6adaa9bb 100644
--- a/edb/edb_cvs.oe
+++ b/edb/edb_cvs.oe
@@ -8,7 +8,7 @@ PV = "${CVSDATE}"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edb"
S = "${WORKDIR}/edb"
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--disable-gtk \
--disable-ncurses"
@@ -16,9 +16,4 @@ EXTRA_OECONF = "--disable-gtk \
do_stage () {
oe_libinstall -C src libedb ${STAGING_LIBDIR}/
install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
- cat edb-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \
- s,/usr/lib,${STAGING_LIBDIR},g; \
- s,/usr/bin,${STAGING_BINDIR},g; \
- s,/usr,${STAGING_LIBDIR}/..,g;' > ${STAGING_BINDIR}/edb-config
- chmod u+x ${STAGING_BINDIR}/edb-config
}