summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-07-28 12:04:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-28 12:04:37 +0000
commita4fbaed8478be92b67649d81c2893b7a379c78df (patch)
tree82a44e40eca8050ab4adefa0b560a42039f389fd
parent8b28debedac76922183ab7d9c6cb21db46907732 (diff)
add curl 7.14.0 and remove 7.12.2
-rw-r--r--packages/curl/curl-7.12.2/.mtn2git_empty0
-rw-r--r--packages/curl/curl-7.12.2/m4.patch53
-rw-r--r--packages/curl/curl-7.12.2/pkgconfig.patch47
-rw-r--r--packages/curl/curl_7.14.0.bb (renamed from packages/curl/curl_7.12.2.bb)26
-rw-r--r--packages/curl/files/.mtn2git_empty0
-rw-r--r--packages/curl/files/uclibc.patch15
6 files changed, 13 insertions, 128 deletions
diff --git a/packages/curl/curl-7.12.2/.mtn2git_empty b/packages/curl/curl-7.12.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/curl/curl-7.12.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/curl/curl-7.12.2/m4.patch b/packages/curl/curl-7.12.2/m4.patch
deleted file mode 100644
index c9a9eec28d..0000000000
--- a/packages/curl/curl-7.12.2/m4.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- curl-7.12.0/acinclude.m4~m4 2004-05-07 20:29:02.000000000 +0200
-+++ curl-7.12.0/acinclude.m4 2004-06-07 19:03:47.000000000 +0200
-@@ -409,45 +409,7 @@
-
- dnl determine if this strerror_r() is glibc or POSIX
- AC_MSG_CHECKING([for a glibc strerror_r API])
-- AC_TRY_RUN([
--#include <string.h>
--#include <errno.h>
--int
--main () {
-- char buffer[1024]; /* big enough to play with */
-- char *string =
-- strerror_r(EACCES, buffer, sizeof(buffer));
-- /* this should've returned a string */
-- if(!string || !string[0])
-- return 99;
-- return 0;
--}
--],
-- AC_DEFINE(HAVE_GLIBC_STRERROR_R, 1, [we have a glibc-style strerror_r()])
-- AC_MSG_RESULT([yes]),
-- AC_MSG_RESULT([no])
-- )
--
- AC_MSG_CHECKING([for a POSIX strerror_r API])
-- AC_TRY_RUN([
--#include <string.h>
--#include <errno.h>
--int
--main () {
-- char buffer[1024]; /* big enough to play with */
-- int error =
-- strerror_r(EACCES, buffer, sizeof(buffer));
-- /* This should've returned zero, and written an error string in the
-- buffer.*/
-- if(!buffer[0] || error)
-- return 99;
-- return 0;
--}
--],
-- AC_DEFINE(HAVE_POSIX_STRERROR_R, 1, [we have a POSIX-style strerror_r()])
-- AC_MSG_RESULT([yes]),
-- AC_MSG_RESULT([no])
-- )
-
- fi
-
diff --git a/packages/curl/curl-7.12.2/pkgconfig.patch b/packages/curl/curl-7.12.2/pkgconfig.patch
deleted file mode 100644
index da62b4e44d..0000000000
--- a/packages/curl/curl-7.12.2/pkgconfig.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/configure.ac 2004-05-25 16:43:39.000000000 -0500
-+++ curl-7.12.0/configure.ac 2004-07-15 18:13:18.000000000 -0500
-@@ -1389,7 +1389,8 @@
- packages/EPM/curl.list \
- packages/EPM/Makefile \
- packages/vms/Makefile \
-- curl-config
-+ curl-config \
-+ curl.pc
- ])
- AC_OUTPUT
-
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/Makefile.am 2004-05-17 16:41:02.000000000 -0500
-+++ curl-7.12.0/Makefile.am 2004-07-15 18:10:32.000000000 -0500
-@@ -24,10 +24,16 @@
- AUTOMAKE_OPTIONS = foreign
-
- EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist \
-- curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
-+ curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES \
-+ curl.pc.in
-
- bin_SCRIPTS = curl-config
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = curl.pc
-+
-+$(pkgconfig_DATA): config.status
-+
- SUBDIRS = lib src
- DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
-
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/curl.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ curl-7.12.0/curl.pc.in 2004-07-15 18:09:14.000000000 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+versionnum=@VERSIONNUM@
-+features=@FEATURES@
-+
-+Name: curl
-+Description: a library that groks URLs
-+Version: @VERSION@
-+Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
-+Cflags: -I${includedir}
diff --git a/packages/curl/curl_7.12.2.bb b/packages/curl/curl_7.14.0.bb
index a483c1275e..1b8a88df84 100644
--- a/packages/curl/curl_7.12.2.bb
+++ b/packages/curl/curl_7.14.0.bb
@@ -4,21 +4,30 @@
# curl's build should be fixed to manipulate LIBS where appropriate and
# use that. -CL
-DEPENDS = "zlib"
DESCRIPTION = "Command line tool and library for \
client-side URL transfers."
LICENSE = "MIT"
+DEPENDS = "zlib"
SECTION = "console/network"
-PR = "r2"
+PR = "r0"
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
- file://uclibc.patch;patch=1"
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
inherit autotools pkgconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
--without-ssl --with-random=/dev/urandom"
+do_stage () {
+ install -d ${STAGING_INCDIR}/curl
+ install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+ oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+
+ cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
+ | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
+ chmod a+rx ${STAGING_BINDIR}/curl-config
+}
+
PACKAGES = "curl curl-doc libcurl libcurl-dev libcurl-doc"
FILES_${PN} = "${bindir}/curl"
FILES_${PN}-doc = "${mandir}/man1/curl.1"
@@ -33,12 +42,3 @@ FILES_lib${PN}-dev = "${includedir} \
FILES_lib${PN}-doc = "${mandir}/man3 \
${mandir}/man1/curl-config.1"
-do_stage () {
- install -d ${STAGING_INCDIR}/curl
- install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
- oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-
- cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
- | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
- chmod a+rx ${STAGING_BINDIR}/curl-config
-}
diff --git a/packages/curl/files/.mtn2git_empty b/packages/curl/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/curl/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/curl/files/uclibc.patch b/packages/curl/files/uclibc.patch
deleted file mode 100644
index 15a9012705..0000000000
--- a/packages/curl/files/uclibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: curl-7.12.2/lib/mprintf.c
-===================================================================
---- curl-7.12.2.orig/lib/mprintf.c 2004-06-24 07:54:11.000000000 -0400
-+++ curl-7.12.2/lib/mprintf.c 2005-02-02 17:15:45.435748600 -0500
-@@ -1134,8 +1134,10 @@
- }
-
- #ifndef WIN32 /* not needed on win32 */
-+#ifndef __UCLIBC__ /* not needed for uclibc, and breaks the build */
- extern int fputc(int, FILE *);
- #endif
-+#endif
-
- int curl_mprintf(const char *format, ...)
- {