summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmikmod/libmikmod_3.2.0-beta2.oe17
-rw-r--r--openobex/openobex_1.0.1.oe10
2 files changed, 12 insertions, 15 deletions
diff --git a/libmikmod/libmikmod_3.2.0-beta2.oe b/libmikmod/libmikmod_3.2.0-beta2.oe
index 24616ed652..66912e1151 100644
--- a/libmikmod/libmikmod_3.2.0-beta2.oe
+++ b/libmikmod/libmikmod_3.2.0-beta2.oe
@@ -4,11 +4,16 @@ PRIORITY = "optional"
SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz"
-inherit autotools
+inherit autotools binconfig
-EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \
---enable-oss --disable-sam9407 --disable-ultra \
---disable-esdtest --enable-threads"
+EXTRA_OECONF = "--disable-af \
+ --disable-alsa \
+ --disable-esd \
+ --enable-oss \
+ --disable-sam9407 \
+ --disable-ultra \
+ --disable-esdtest \
+ --enable-threads"
do_configure() {
gnu-configize
@@ -18,10 +23,6 @@ do_configure() {
do_stage() {
oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
-
- cat libmikmod-config | sed 's,$libdir , ,' \
- | sed 's,$includes , ,' > ${STAGING_BINDIR}/libmikmod-config
- chmod a+rx ${STAGING_BINDIR}/libmikmod-config
install -d ${STAGING_DATADIR}/aclocal/
install -m 0644 libmikmod.m4 ${STAGING_DATADIR}/aclocal/
}
diff --git a/openobex/openobex_1.0.1.oe b/openobex/openobex_1.0.1.oe
index ec6aee05a1..713cc36d96 100644
--- a/openobex/openobex_1.0.1.oe
+++ b/openobex/openobex_1.0.1.oe
@@ -1,7 +1,8 @@
-PR = "r1"
DESCRIPTION = "The Openobex project aims to make an \
open source implementation of the Object Exchange \
(OBEX) protocol."
+SECTION = "libs"
+PR = "r1"
# put openobex-config into -dev package
FILES_${PN} = "${libdir}/lib*.so.*"
@@ -10,16 +11,11 @@ FILES_${PN}-dev += "${bindir}"
SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
file://syms.patch;patch=1"
-inherit autotools
+inherit autotools binconfig
do_stage () {
oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR}
ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so
install -d ${STAGING_INCDIR}/openobex
install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/
- cat openobex-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}/openobex-config
- chmod a+rx ${STAGING_BINDIR}/openobex-config
}