diff options
| author | Travis Kemen <thepeople@openwrt.org> | 2008-07-29 12:57:43 +0000 |
|---|---|---|
| committer | Travis Kemen <thepeople@openwrt.org> | 2008-07-29 12:57:43 +0000 |
| commit | 272ae30c6307d3c179b64ac3d21958b972d92086 (patch) | |
| tree | d085bb168f9f5148105508176d6b5b35240d5e35 /package/opkg | |
| parent | d3e93d1a1878d7c9ccded5deb0a00f91bba151c2 (diff) | |
| download | upstream-272ae30c6307d3c179b64ac3d21958b972d92086.tar.gz upstream-272ae30c6307d3c179b64ac3d21958b972d92086.tar.bz2 upstream-272ae30c6307d3c179b64ac3d21958b972d92086.zip | |
removed a missed dependancy on curl
remove use of autogen, just run the one needed command from in it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11991 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/opkg')
| -rw-r--r-- | package/opkg/Makefile | 3 | ||||
| -rw-r--r-- | package/opkg/patches/001-use-wget | 31 | ||||
| -rw-r--r-- | package/opkg/patches/002-fix-autogen | 8 |
3 files changed, 32 insertions, 10 deletions
diff --git a/package/opkg/Makefile b/package/opkg/Makefile index ab41ac0995..45010c7f3a 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -22,7 +22,6 @@ include $(INCLUDE_DIR)/package.mk define Package/opkg SECTION:=base CATEGORY:=Base system - DEPENDS:=+libcurl TITLE:=opkg package management system URL:=http://wiki.openmoko.org/wiki/Opkg endef @@ -46,7 +45,7 @@ CONFIGURE_ARGS += \ define Build/Configure (cd $(PKG_BUILD_DIR); \ - ./autogen.sh \ + autoreconf -v --install || exit 1 \ ); $(call Build/Configure/Default) endef diff --git a/package/opkg/patches/001-use-wget b/package/opkg/patches/001-use-wget index a8ec7c518a..e6c7e9ca0e 100644 --- a/package/opkg/patches/001-use-wget +++ b/package/opkg/patches/001-use-wget @@ -75,3 +75,34 @@ Index: opkg-4561/configure.ac dnl ********** +Index: opkg-4561/libopkg/opkg.c +=================================================================== +--- opkg-4561/libopkg/opkg.c-orig 2008-07-28 16:27:53.000000000 -0500 ++++ opkg-4561/libopkg/opkg.c 2008-07-29 07:46:42.000000000 -0500 +@@ -1013,8 +1013,9 @@ + + return package; + } +- ++#ifdef HAVE_CURL + #include <curl/curl.h> ++#endif + /** + * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status. + * @param opkg The opkg_t +@@ -1064,6 +1065,7 @@ + repositories--; + + err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL); ++ #ifdef HAVE_CURL + if (!(err == CURLE_OK || + err == CURLE_HTTP_RETURNED_ERROR || + err == CURLE_FILE_COULDNT_READ_FILE || +@@ -1072,6 +1074,7 @@ + )) { + ret++; + } ++ #endif + str_list_elt_deinit(iter1); + free(iter1); + } diff --git a/package/opkg/patches/002-fix-autogen b/package/opkg/patches/002-fix-autogen deleted file mode 100644 index 0d39c42298..0000000000 --- a/package/opkg/patches/002-fix-autogen +++ /dev/null @@ -1,8 +0,0 @@ ---- opkg-4561/autogen.sh-orig 2008-07-28 18:00:33.000000000 -0500 -+++ opkg-4561/autogen.sh 2008-07-28 18:00:45.000000000 -0500 -@@ -1,5 +1,3 @@ - #! /bin/sh - autoreconf -v --install || exit 1 - glib-gettextize --force --copy || exit 1 --./configure --enable-maintainer-mode "$@" -- |