Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/curl
@ 2007-11-27  8:22 ulf at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2007-11-27  8:22 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-11-27 00:21:58 -0800 (Tue, 27 Nov 2007)
New Revision: 20548

Log:
Bump curl version to 1.17.1

Modified:
   trunk/buildroot/package/curl/curl.mk


Changeset:
Modified: trunk/buildroot/package/curl/curl.mk
===================================================================
--- trunk/buildroot/package/curl/curl.mk	2007-11-26 18:29:52 UTC (rev 20547)
+++ trunk/buildroot/package/curl/curl.mk	2007-11-27 08:21:58 UTC (rev 20548)
@@ -3,7 +3,8 @@
 # curl
 #
 #############################################################
-CURL_VERSION:=7.13.1
+CURL_VERSION:=7.17.1
+LIBCURL_VERSION:=4.0.1
 CURL_SOURCE:=curl-$(CURL_VERSION).tar.bz2
 CURL_SITE:=http://curl.haxx.se/download/
 CURL_CAT:=$(BZCAT)
@@ -17,7 +18,7 @@
 
 $(CURL_DIR)/.unpacked: $(DL_DIR)/$(CURL_SOURCE)
 	$(CURL_CAT) $(DL_DIR)/$(CURL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(CURL_DIR) package/curl/ \*.patch*
+	toolchain/patch-kernel.sh $(CURL_DIR) package/curl/ curl-$(CURL_VERSION)-\*.patch*
 	touch $(CURL_DIR)/.unpacked
 
 $(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked
@@ -44,13 +45,13 @@
 	-rm -rf $(STAGING_DIR)/man
 	touch $(STAGING_DIR)/bin/$(CURL_BINARY)
 
-$(TARGET_DIR)/usr/lib/libcurl.so.3.0.0: $(STAGING_DIR)/bin/$(CURL_BINARY)
+$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(STAGING_DIR)/bin/$(CURL_BINARY)
 	-mkdir $(TARGET_DIR)/usr/lib
 	-mkdir $(TARGET_DIR)/usr/bin
 	cp -a $(STAGING_DIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
 
-$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.3.0.0
+$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
 	cp -a $(STAGING_DIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/curl
@ 2007-11-28  8:57 ulf at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2007-11-28  8:57 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-11-28 00:57:26 -0800 (Wed, 28 Nov 2007)
New Revision: 20561

Log:
Move curl from lib to usr/lib, update curl.la

Modified:
   trunk/buildroot/package/curl/curl.mk


Changeset:
Modified: trunk/buildroot/package/curl/curl.mk
===================================================================
--- trunk/buildroot/package/curl/curl.mk	2007-11-28 08:57:00 UTC (rev 20560)
+++ trunk/buildroot/package/curl/curl.mk	2007-11-28 08:57:26 UTC (rev 20561)
@@ -10,6 +10,7 @@
 CURL_CAT:=$(BZCAT)
 CURL_DIR:=$(BUILD_DIR)/curl-$(CURL_VERSION)
 CURL_BINARY:=curl
+CURL_DESTDIR:=$(STAGING_DIR)/usr
 
 $(DL_DIR)/$(CURL_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(CURL_SITE)/$(CURL_SOURCE)
@@ -32,39 +33,50 @@
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=$(STAGING_DIR) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--includedir=/usr/include \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
 	)
 	touch $(CURL_DIR)/.configured
 
 $(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured
 	$(MAKE) -C $(CURL_DIR)
 
-$(STAGING_DIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
-	-mkdir $(STAGING_DIR)/bin
-	$(MAKE) prefix=$(STAGING_DIR) -C $(CURL_DIR) install
-	-rm -rf $(STAGING_DIR)/man
-	touch $(STAGING_DIR)/bin/$(CURL_BINARY)
+$(CURL_DESTDIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
+	-mkdir $(CURL_DESTDIR)/bin
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(CURL_DIR) install
+	$(SED) "s,^libdir=.*,libdir=\'$(CURL_DESTDIR)/lib\',g" $(CURL_DESTDIR)/lib/libcurl.la
+	touch $(CURL_DESTDIR)/bin/$(CURL_BINARY)
 
-$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(STAGING_DIR)/bin/$(CURL_BINARY)
+$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(CURL_DESTDIR)/bin/$(CURL_BINARY)
 	-mkdir $(TARGET_DIR)/usr/lib
 	-mkdir $(TARGET_DIR)/usr/bin
-	cp -a $(STAGING_DIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
+	cp -a $(CURL_DESTDIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
 
 $(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
-	cp -a $(STAGING_DIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
+	cp -a $(CURL_DESTDIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
 
 curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
 
-libcurl: $(STAGING_DIR)/bin/$(CURL_BINARY)
+libcurl: $(CURL_DESTDIR)/bin/$(CURL_BINARY)
 
 curl-clean:
 	rm -f $(TARGET_DIR)/usr/lib/libcurl.so*
 	rm -f $(TARGET_DIR)/usr/bin/curl
-	rm -f $(STAGING_DIR)/bin/curl*
-	rm -f $(STAGING_DIR)/lib/libcurl.so*
-	rm -rf $(STAGING_DIR)/usr/include/curl
+	rm -f $(CURL_DESTDIR)/bin/curl*
+	rm -f $(CURL_DESTDIR)/lib/libcurl.so*
+	rm -rf $(CURL_DESTDIR)/include/curl
 	-$(MAKE) -C $(CURL_DIR) clean
 
 curl-dirclean:

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/curl
@ 2008-07-05  7:44 ulf at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2008-07-05  7:44 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2008-07-05 00:44:28 -0700 (Sat, 05 Jul 2008)
New Revision: 22647

Log:
Use latest config.* from buildroot in curl

Modified:
   trunk/buildroot/package/curl/curl.mk


Changeset:
Modified: trunk/buildroot/package/curl/curl.mk
===================================================================
--- trunk/buildroot/package/curl/curl.mk	2008-07-05 07:25:06 UTC (rev 22646)
+++ trunk/buildroot/package/curl/curl.mk	2008-07-05 07:44:28 UTC (rev 22647)
@@ -26,7 +26,9 @@
 	(cd $(CURL_DIR); rm -rf config.cache; \
 		aclocal; \
 		libtoolize --force; \
-		./reconf; \
+		./reconf; )
+	$(CONFIG_UPDATE) $(CURL_DIR)
+	(cd $(CURL_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure \

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/curl
@ 2008-12-28 13:50 jacmet at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: jacmet at uclibc.org @ 2008-12-28 13:50 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-28 13:50:49 +0000 (Sun, 28 Dec 2008)
New Revision: 24575

Log:
curl: remove unused legacy patches

Removed:
   trunk/buildroot/package/curl/curl-7.10.4-path.patch
   trunk/buildroot/package/curl/curl-7.12.0-nousr.patch
   trunk/buildroot/package/curl/curl-7.13.1-2005-3185.patch
   trunk/buildroot/package/curl/curl-7.13.1-auth.patch
   trunk/buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch


Changeset:
Deleted: trunk/buildroot/package/curl/curl-7.10.4-path.patch
===================================================================
--- trunk/buildroot/package/curl/curl-7.10.4-path.patch	2008-12-28 13:50:45 UTC (rev 24574)
+++ trunk/buildroot/package/curl/curl-7.10.4-path.patch	2008-12-28 13:50:49 UTC (rev 24575)
@@ -1,13 +0,0 @@
---- curl-7.10.4/lib/Makefile.am
-+++ curl-7.10.4/lib/Makefile.am
-@@ -78,8 +78,8 @@
- 
- install-data-hook:
- 	@if test -n "@CURL_CA_BUNDLE@"; then \
--	  $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
--	  @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
-+	  $(mkinstalldirs) `dirname $(prefix)/../@CURL_CA_BUNDLE@`; \
-+	  @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(prefix)/../@CURL_CA_BUNDLE@; \
-         fi
- 
- # this hook is mainly for non-unix systems to build even if configure

Deleted: trunk/buildroot/package/curl/curl-7.12.0-nousr.patch
===================================================================
--- trunk/buildroot/package/curl/curl-7.12.0-nousr.patch	2008-12-28 13:50:45 UTC (rev 24574)
+++ trunk/buildroot/package/curl/curl-7.12.0-nousr.patch	2008-12-28 13:50:49 UTC (rev 24575)
@@ -1,16 +0,0 @@
---- curl-7.12.0/configure.ac.orig	2004-05-25 23:43:39.000000000 +0200
-+++ curl-7.12.0/configure.ac		2004-07-26 15:12:03.029071072 +0200
-@@ -742,5 +742,5 @@
-     dnl check the given spot right away!
-     EXTRA_SSL=$OPT_SSL
--    LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
-+    #LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
-     CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
-     ;;
-@@ -750,5 +750,5 @@
-      HAVECRYPTO="yes"
-      ],[
--     LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff"
-+     LDFLAGS="$CLEANLDFLAGS"
-      CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
-      AC_CHECK_LIB(crypto, CRYPTO_add_lock,[

Deleted: trunk/buildroot/package/curl/curl-7.13.1-2005-3185.patch
===================================================================
--- trunk/buildroot/package/curl/curl-7.13.1-2005-3185.patch	2008-12-28 13:50:45 UTC (rev 24574)
+++ trunk/buildroot/package/curl/curl-7.13.1-2005-3185.patch	2008-12-28 13:50:49 UTC (rev 24575)
@@ -1,16 +0,0 @@
---- curl-7.13.1/lib/http_ntlm.c.2005-3185	2005-02-22 13:10:30.000000000 +0100
-+++ curl-7.13.1/lib/http_ntlm.c	2005-10-19 15:18:42.165859528 +0200
-@@ -534,6 +534,13 @@
-     size=64;
-     ntlmbuf[62]=ntlmbuf[63]=0;
- 
-+    /* Make sure that the user and domain strings fit in the target buffer
-+         before we copy them there. */
-+    if(size + userlen + domlen >= sizeof(ntlmbuf)) {
-+      failf(conn->data, "user + domain name too big");
-+      return CURLE_OUT_OF_MEMORY;
-+    }
-+
-     memcpy(&ntlmbuf[size], domain, domlen);
-     size += domlen;
- 

Deleted: trunk/buildroot/package/curl/curl-7.13.1-auth.patch
===================================================================
--- trunk/buildroot/package/curl/curl-7.13.1-auth.patch	2008-12-28 13:50:45 UTC (rev 24574)
+++ trunk/buildroot/package/curl/curl-7.13.1-auth.patch	2008-12-28 13:50:49 UTC (rev 24575)
@@ -1,48 +0,0 @@
---- curl-7.13.1/lib/http.c.pom	2005-02-19 00:53:07.000000000 +0100
-+++ curl-7.13.1/lib/http.c	2005-04-27 11:48:40.000000000 +0200
-@@ -455,6 +455,7 @@
-   /* To prevent the user+password to get sent to other than the original
-      host due to a location-follow, we do some weirdo checks here */
-   if(!data->state.this_is_a_follow ||
-+     conn->bits.netrc || 
-      !data->state.first_host ||
-      curl_strequal(data->state.first_host, conn->host.name) ||
-      data->set.http_disable_hostname_check_before_authentication) {
---- curl-7.13.1/lib/url.c.pom	2005-02-09 23:47:57.000000000 +0100
-+++ curl-7.13.1/lib/url.c	2005-04-27 11:45:59.000000000 +0200
-@@ -3131,15 +3131,23 @@
-            user, passwd);
-   }
- 
-+  conn->bits.netrc = FALSE;
-   if (data->set.use_netrc != CURL_NETRC_IGNORED) {
-     if(Curl_parsenetrc(conn->host.name,
-                        user, passwd,
-                        data->set.netrc_file)) {
--      infof(data, "Couldn't find host %s in the " DOT_CHAR "netrc file, using defaults\n",
-+      infof(data, "Couldn't find host %s in the " DOT_CHAR
-+            "netrc file, using defaults\n",
-             conn->host.name);
-     }
--    else
-+    else {
-+      /* set bits.netrc TRUE to remember that we got the name from a .netrc
-+         file, so that it is safe to use even if we followed a Location: to a
-+         different host or similar. */
-+      conn->bits.netrc = TRUE;
-+
-       conn->bits.user_passwd = 1; /* enable user+password */
-+    }
-   }
- 
-   /* If our protocol needs a password and we have none, use the defaults */
---- curl-7.13.1/lib/urldata.h.pom	2005-02-09 14:06:56.000000000 +0100
-+++ curl-7.13.1/lib/urldata.h	2005-04-27 11:50:31.000000000 +0200
-@@ -388,6 +388,7 @@
-   bool ftp_use_lprt;  /* As set with CURLOPT_FTP_USE_EPRT, but if we find out
-                          LPRT doesn't work we disable it for the forthcoming
-                          requests */
-+  bool netrc;         /* name+password provided by netrc */
- };
- 
- struct hostname {

Deleted: trunk/buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
===================================================================
--- trunk/buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch	2008-12-28 13:50:45 UTC (rev 24574)
+++ trunk/buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch	2008-12-28 13:50:49 UTC (rev 24575)
@@ -1,23 +0,0 @@
---- curl-7.13.1/lib/url.c.cve-2005-4077	2005-12-08 13:08:03.000000000 +0100
-+++ curl-7.13.1/lib/url.c	2005-12-08 13:15:56.565790336 +0100
-@@ -2313,12 +2313,18 @@
-   if(urllen < LEAST_PATH_ALLOC)
-     urllen=LEAST_PATH_ALLOC;
- 
--  conn->pathbuffer=(char *)malloc(urllen);
-+  /*
-+   * We malloc() the buffers below urllen+2 to make room for to possibilities:
-+   * 1 - an extra terminating zero
-+   * 2 - an extra slash (in case a syntax like "www.host.com?moo" is used)
-+   */
-+
-+  conn->pathbuffer=(char *)malloc(urllen+3);
-   if(NULL == conn->pathbuffer)
-     return CURLE_OUT_OF_MEMORY; /* really bad error */
-   conn->path = conn->pathbuffer;
- 
--  conn->host.rawalloc=(char *)malloc(urllen);
-+  conn->host.rawalloc=(char *)malloc(urllen+3);
-   if(NULL == conn->host.rawalloc)
-     return CURLE_OUT_OF_MEMORY;
-   conn->host.name = conn->host.rawalloc;

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/curl
@ 2008-12-28 13:50 jacmet at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: jacmet at uclibc.org @ 2008-12-28 13:50 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-28 13:50:53 +0000 (Sun, 28 Dec 2008)
New Revision: 24576

Log:
curl: convert to Makefile.autotools.in format, bump version

Modified:
   trunk/buildroot/package/curl/Config.in
   trunk/buildroot/package/curl/curl.mk


Changeset:
Modified: trunk/buildroot/package/curl/Config.in
===================================================================
--- trunk/buildroot/package/curl/Config.in	2008-12-28 13:50:49 UTC (rev 24575)
+++ trunk/buildroot/package/curl/Config.in	2008-12-28 13:50:53 UTC (rev 24576)
@@ -1,11 +1,3 @@
-config BR2_PACKAGE_CURL
-	bool "curl"
-	help
-	  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
-	  and Dict servers, using any of the supported protocols.
-
-	  http://curl.haxx.nu/
-
 config BR2_PACKAGE_LIBCURL
 	bool "libcurl"
 	help
@@ -13,3 +5,9 @@
 	  and Dict servers, using any of the supported protocols.
 
 	  http://curl.haxx.nu/
+
+config BR2_PACKAGE_CURL
+	bool "curl binary"
+	depends on BR2_PACKAGE_LIBCURL
+	help
+	  Install curl binary as well

Modified: trunk/buildroot/package/curl/curl.mk
===================================================================
--- trunk/buildroot/package/curl/curl.mk	2008-12-28 13:50:49 UTC (rev 24575)
+++ trunk/buildroot/package/curl/curl.mk	2008-12-28 13:50:53 UTC (rev 24576)
@@ -3,95 +3,15 @@
 # curl
 #
 #############################################################
-CURL_VERSION:=7.17.1
-LIBCURL_VERSION:=4.0.1
-CURL_SOURCE:=curl-$(CURL_VERSION).tar.bz2
-CURL_SITE:=http://curl.haxx.se/download/
-CURL_CAT:=$(BZCAT)
-CURL_DIR:=$(BUILD_DIR)/curl-$(CURL_VERSION)
-CURL_BINARY:=curl
-CURL_DESTDIR:=$(STAGING_DIR)/usr
+LIBCURL_VERSION = 7.19.2
+LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
+LIBCURL_SITE = http://curl.haxx.se/download/
+LIBCURL_INSTALL_STAGING = YES
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
+		   $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
 
-$(DL_DIR)/$(CURL_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(CURL_SITE)/$(CURL_SOURCE)
+$(eval $(call AUTOTARGETS,package,libcurl))
 
-curl-source: $(DL_DIR)/$(CURL_SOURCE)
-
-$(CURL_DIR)/.unpacked: $(DL_DIR)/$(CURL_SOURCE)
-	$(CURL_CAT) $(DL_DIR)/$(CURL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(CURL_DIR) package/curl/ curl-$(CURL_VERSION)-\*.patch*
-	touch $(CURL_DIR)/.unpacked
-
-$(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked
-	(cd $(CURL_DIR); rm -rf config.cache; \
-		aclocal; \
-		libtoolize --force; \
-		./reconf; )
-	$(CONFIG_UPDATE) $(CURL_DIR)
-	(cd $(CURL_DIR); \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-	)
-	touch $(CURL_DIR)/.configured
-
-$(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured
-	$(MAKE) -C $(CURL_DIR)
-
-$(CURL_DESTDIR)/bin/$(CURL_BINARY): $(CURL_DIR)/src/.libs/$(CURL_BINARY)
-	-mkdir $(CURL_DESTDIR)/bin
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(CURL_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(CURL_DESTDIR)/lib\',g" $(CURL_DESTDIR)/lib/libcurl.la
-	touch $(CURL_DESTDIR)/bin/$(CURL_BINARY)
-
-$(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION): $(CURL_DESTDIR)/bin/$(CURL_BINARY)
-	-mkdir $(TARGET_DIR)/usr/lib
-	-mkdir $(TARGET_DIR)/usr/bin
-	cp -a $(CURL_DESTDIR)/lib/libcurl.so* $(TARGET_DIR)/usr/lib
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
-
-$(TARGET_DIR)/usr/bin/$(CURL_BINARY): $(TARGET_DIR)/usr/lib/libcurl.so.$(LIBCURL_VERSION)
-	cp -a $(CURL_DESTDIR)/bin/$(CURL_BINARY) $(TARGET_DIR)/usr/bin
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
-
-curl: uclibc $(TARGET_DIR)/usr/bin/$(CURL_BINARY)
-
-libcurl: $(CURL_DESTDIR)/bin/$(CURL_BINARY)
-
-curl-clean:
-	rm -f $(TARGET_DIR)/usr/lib/libcurl.so*
-	rm -f $(TARGET_DIR)/usr/bin/curl
-	rm -f $(CURL_DESTDIR)/bin/curl*
-	rm -f $(CURL_DESTDIR)/lib/libcurl.so*
-	rm -rf $(CURL_DESTDIR)/include/curl
-	-$(MAKE) -C $(CURL_DIR) clean
-
-curl-dirclean:
-	rm -rf $(CURL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CURL),y)
-TARGETS+=curl
-endif
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
-TARGETS+=libcurl
-endif
+$(LIBCURL_HOOK_POST_INSTALL):
+	rm -rf $(TARGET_DIR)/usr/bin/curl-config \
+	       $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-12-28 13:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-27  8:22 [Buildroot] svn commit: trunk/buildroot/package/curl ulf at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2007-11-28  8:57 ulf at uclibc.org
2008-07-05  7:44 ulf at uclibc.org
2008-12-28 13:50 jacmet at uclibc.org
2008-12-28 13:50 jacmet at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox