Changeset 11991


Ignore:
Timestamp:
2008-07-29T14:57:43+02:00 (10 years ago)
Author:
thepeople
Message:

removed a missed dependancy on curl
remove use of autogen, just run the one needed command from in it

Location:
trunk/package/opkg
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/opkg/Makefile

    r11988 r11991  
    2323  SECTION:=base 
    2424  CATEGORY:=Base system 
    25   DEPENDS:=+libcurl 
    2625  TITLE:=opkg package management system 
    2726  URL:=http://wiki.openmoko.org/wiki/Opkg 
     
    4746define Build/Configure 
    4847        (cd $(PKG_BUILD_DIR); \ 
    49                 ./autogen.sh \ 
     48                autoreconf -v --install || exit 1 \ 
    5049        ); 
    5150        $(call Build/Configure/Default) 
  • trunk/package/opkg/patches/001-use-wget

    r11983 r11991  
    7676  
    7777 dnl ********** 
     78Index: opkg-4561/libopkg/opkg.c 
     79=================================================================== 
     80--- opkg-4561/libopkg/opkg.c-orig       2008-07-28 16:27:53.000000000 -0500 
     81+++ opkg-4561/libopkg/opkg.c    2008-07-29 07:46:42.000000000 -0500 
     82@@ -1013,8 +1013,9 @@ 
     83  
     84   return package; 
     85 } 
     86- 
     87+#ifdef HAVE_CURL 
     88 #include <curl/curl.h> 
     89+#endif 
     90 /** 
     91  * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status.  
     92  * @param opkg The opkg_t 
     93@@ -1064,6 +1065,7 @@ 
     94     repositories--; 
     95  
     96     err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL); 
     97+    #ifdef HAVE_CURL 
     98     if (!(err == CURLE_OK ||  
     99                err == CURLE_HTTP_RETURNED_ERROR ||  
     100                err == CURLE_FILE_COULDNT_READ_FILE || 
     101@@ -1072,6 +1074,7 @@ 
     102                )) { 
     103            ret++; 
     104     } 
     105+    #endif 
     106     str_list_elt_deinit(iter1); 
     107     free(iter1); 
     108   } 
Note: See TracChangeset for help on using the changeset viewer.