diff options
| author | ral@home <ral@home> | 2004-04-15 17:51:47 +0000 |
|---|---|---|
| committer | ral@home <ral@home> | 2004-04-15 17:51:47 +0000 |
| commit | ffe7579257a19b5cf199a5caf7e1c183fe6257aa (patch) | |
| tree | 3d636c3e030e82ecb9bb50599e92d7f9f5519674 | |
| parent | 5e01e5a9f5f0e3600231a8f3356d7e87c32fd459 (diff) | |
resolved conflicts
2004/04/15 19:37:18+02:00 home!ral
applied an extra patch for avoiding ICONV check
BKrev: 407ecbb3ok671JCPK3wt1_UEqnO2yQ
| -rw-r--r-- | libetpan/libetpan-0.33pre/config_iconv.patch | 0 | ||||
| -rw-r--r-- | libetpan/libetpan_0.33pre.oe | 14 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libetpan/libetpan-0.33pre/config_iconv.patch b/libetpan/libetpan-0.33pre/config_iconv.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libetpan/libetpan-0.33pre/config_iconv.patch diff --git a/libetpan/libetpan_0.33pre.oe b/libetpan/libetpan_0.33pre.oe index 1b62ce33be..ea99afe276 100644 --- a/libetpan/libetpan_0.33pre.oe +++ b/libetpan/libetpan_0.33pre.oe @@ -6,14 +6,15 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a" -SRC_URI = "http://www.alwins-world.de/oe/libetpan-${PV}.tar.bz2 \ - file://${FILESDIR}/mailstream_socket.patch;patch=1 \ - file://${FILESDIR}/smtptls.patch;patch=1 \ - file://${FILESDIR}/includedir.patch;patch=1;pnum=0" +SRC_URI = "http://www.alwins-world.de/oe/libetpan-${PV}.tar.bz2 \ + file://${FILESDIR}/mailstream_socket.patch;patch=1 \ + file://${FILESDIR}/smtptls.patch;patch=1" \ + file://${FILESDIR}/config_iconv.patch;patch=1" \ + file://${FILESDIR}/includedir.patch;patch=1;pnum=0" inherit autotools libtool -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db" +EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db --prefix=${TARGET_DIR}" do_stage() { oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} @@ -21,4 +22,5 @@ do_stage() { do_install() { oe_runmake install includedir=${D}/${includedir} libdir=${D}/${libdir} bindir=${D}/${bindir} -}
\ No newline at end of file +} + |