diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-03-06 20:28:51 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-03-06 20:28:51 +0000 |
| commit | 22bc50f8752ecbe69683cafe5683f98615f6d626 (patch) | |
| tree | fe7d2931cab6765a6e2cb860950de0f9b3b448e2 | |
| parent | df228fa324f5d6bdad4db893a3b76e6b14501ced (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into zelda.tuxnami.org:/home/kergoth/code/packages
2004/03/06 05:29:55-05:00 local!kergoth
Properly mangle openobex-config, clean up the openobex-apps .oe, and add obexftp 0.10.3.
BKrev: 404a3483n7DVzfL3ApNApKNLl7FA1A
| -rw-r--r-- | obexftp/obexftp-0.10.3/m4.patch | 0 | ||||
| -rw-r--r-- | obexftp/obexftp_0.10.3.oe | 0 | ||||
| -rw-r--r-- | openobex-apps/openobex-apps_1.0.0.oe | 9 | ||||
| -rw-r--r-- | openobex/openobex_1.0.1.oe | 18 |
4 files changed, 19 insertions, 8 deletions
diff --git a/obexftp/obexftp-0.10.3/m4.patch b/obexftp/obexftp-0.10.3/m4.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/obexftp/obexftp-0.10.3/m4.patch diff --git a/obexftp/obexftp_0.10.3.oe b/obexftp/obexftp_0.10.3.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/obexftp/obexftp_0.10.3.oe diff --git a/openobex-apps/openobex-apps_1.0.0.oe b/openobex-apps/openobex-apps_1.0.0.oe index cb83f19c4b..dbc7ca4842 100644 --- a/openobex-apps/openobex-apps_1.0.0.oe +++ b/openobex-apps/openobex-apps_1.0.0.oe @@ -10,11 +10,4 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/openobex-apps-${PV}.tar.gz \ inherit autotools libtool EXTRA_OECONF = --disable-glibtest --with-glib-prefix=${STAGING_DIR}/target -export OPENOBEX_CFLAGS=-I${STAGING_DIR}/target/include -export OPENOBEX_CONFIG = ${STAGING_BINDIR}/openobex-config \ - --prefix=${STAGING_DIR}/target \ - --exec-prefix=${STAGING_DIR}/target - -do_compile () { - oe_runmake 'INCLUDES=' -} +EXTRA_OEMAKE = "'INCLUDES='" diff --git a/openobex/openobex_1.0.1.oe b/openobex/openobex_1.0.1.oe index e69de29bb2..bc997d51ba 100644 --- a/openobex/openobex_1.0.1.oe +++ b/openobex/openobex_1.0.1.oe @@ -0,0 +1,18 @@ +DEPENDS = virtual/libc +RDEPENDS = libc6 + +SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz + +inherit autotools libtool + +do_stage () { + oe_soinstall src/.libs/libopenobex-1.0.so.1.0.0 ${STAGING_LIBDIR}/ + ln -sf libopenobex-1.0.so.1.0.0 ${STAGING_LIBDIR}/libopenobex.so + install -m 0755 src/.libs/libopenobex.a ${STAGING_LIBDIR}/libopenobex.a + install -m 0755 src/.libs/libopenobex.lai ${STAGING_LIBDIR}/libopenobex.la + install -d ${STAGING_DIR}/target/include/openobex + install -m 0644 src/obex_const.h src/obex.h ${STAGING_DIR}/target/include/openobex/ + cat openobex-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \ + s,/usr,${STAGING_LIBDIR}/..,g;' > ${STAGING_BINDIR}/openobex-config + chmod a+rx ${STAGING_BINDIR}/openobex-config +} |