summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/libetpan/files/configure-pthreads.patch11
-rw-r--r--packages/libetpan/files/etpan_suffix.patch16
-rw-r--r--packages/libetpan/files/mailstream.patch21
-rw-r--r--packages/libetpan/libetpan_0.38.bb19
-rw-r--r--packages/libetpan/libetpan_0.43.bb21
-rw-r--r--packages/libetpan/libetpan_0.46.bb (renamed from packages/libetpan/libetpan_0.45.bb)7
6 files changed, 3 insertions, 92 deletions
diff --git a/packages/libetpan/files/configure-pthreads.patch b/packages/libetpan/files/configure-pthreads.patch
deleted file mode 100644
index c8f9566bd9..0000000000
--- a/packages/libetpan/files/configure-pthreads.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libetpan-0.45/configure.in.orig 2006-05-09 09:48:36.000000000 +0100
-+++ libetpan-0.45/configure.in 2006-05-09 09:48:55.000000000 +0100
-@@ -350,7 +350,7 @@
- LDFLAGS="-$flag $LDFLAGS"
- AC_TRY_LINK([], [pthread_create();],
- [pthflag=yes; checkpthread=no],
-- [pthflag=no; LDFLAGS="$OLDCFLAGS"])
-+ [pthflag=no; LDFLAGS="$OLDFLAGS"])
- AC_MSG_RESULT($pthflag)
- fi
- done
diff --git a/packages/libetpan/files/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch
deleted file mode 100644
index 901615c416..0000000000
--- a/packages/libetpan/files/etpan_suffix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libetpan/configure.in~etpan_suffix
-+++ libetpan/configure.in
-@@ -371,7 +371,7 @@
- REENTRANT=1
- else
- REENTRANT=0
-- LIBSUFFIX=-no-mt
-+ LIBSUFFIX=
- fi
- AC_SUBST(LIBSUFFIX)
- AC_SUBST(REENTRANT)
diff --git a/packages/libetpan/files/mailstream.patch b/packages/libetpan/files/mailstream.patch
deleted file mode 100644
index 2d0dad06fd..0000000000
--- a/packages/libetpan/files/mailstream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNad libetpan-0.45~/src/data-types/mailstream_ssl.c libetpan-0.45/src/data-types/mailstream_ssl.c
---- libetpan-0.45~/src/data-types/mailstream_ssl.c 2006-02-17 23:45:14.000000000 +0300
-+++ libetpan-0.45/src/data-types/mailstream_ssl.c 2006-04-17 19:11:48.609551256 +0400
-@@ -448,7 +448,7 @@
- break;
-
- default:
-- return r;
-+ return -1;
- }
- }
- }
-@@ -486,7 +486,7 @@
- break;
-
- default:
-- return r;
-+ return -1;
- }
- }
- }
diff --git a/packages/libetpan/libetpan_0.38.bb b/packages/libetpan/libetpan_0.38.bb
deleted file mode 100644
index 9dcb318b0c..0000000000
--- a/packages/libetpan/libetpan_0.38.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \
-SMTP, POP, IMAP and NNTP"
-SECTION = "libs"
-DEPENDS = "gnutls"
-LICENSE = "BSD"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
- file://etpan_suffix.patch;patch=1 "
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads"
-
-do_stage () {
- oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb
deleted file mode 100644
index 51757a7265..0000000000
--- a/packages/libetpan/libetpan_0.43.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
-It supports the protocols SMTP, POP3, IMAP and NNTP."
-HOMEPAGE = "http://www.etpan.org"
-SECTION = "libs"
-DEPENDS = "gnutls"
-LICENSE = "BSD"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
- file://etpan_suffix.patch;patch=1 "
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads"
-
-do_stage() {
- oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/packages/libetpan/libetpan_0.45.bb b/packages/libetpan/libetpan_0.46.bb
index 4b7abede50..b9d7836aea 100644
--- a/packages/libetpan/libetpan_0.45.bb
+++ b/packages/libetpan/libetpan_0.46.bb
@@ -7,17 +7,16 @@ LICENSE = "BSD"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
- file://etpan_suffix.patch;patch=1 \
- file://mailstream.patch;patch=1 \
- file://configure-pthreads.patch;patch=1 "
+ file://honor-oe-lflags.patch;patch=1"
inherit autotools pkgconfig gettext
EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
+
PARALLEL_MAKE = ""
do_stage() {
- oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
+ autotools_stage_all
}
FILES_${PN} = "${libdir}/lib*.so.*"