Changeset 24744


Ignore:
Timestamp:
2010-12-21T05:39:46+01:00 (6 years ago)
Author:
swalker
Message:

[packages] lftp: update to 4.1.1, use g++-uc, remove stdc++ hack, use tabs rather than spaces, refresh patches

Location:
packages/net/lftp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/lftp/Makefile

    r22184 r24744  
    99 
    1010PKG_NAME:=lftp 
    11 PKG_VERSION:=4.0.9 
     11PKG_VERSION:=4.1.1 
    1212PKG_RELEASE:=1 
    1313 
     
    1515PKG_SOURCE_URL:=http://lftp.cybermirror.org \ 
    1616  http://lftp.cybermirror.org/old 
    17 PKG_MD5SUM:=d3f0cd7569e31e50370208dd77a7c41b 
     17PKG_MD5SUM:=87717c30869a626cc53817c1c0a585ef 
    1818 
    1919PKG_INSTALL:=1 
     
    3636endef 
    3737 
    38 # uses GNU configure 
    39  
    4038CONFIGURE_ARGS += \ 
    4139        --without-libiconv-prefix \ 
     
    4745 
    4846CONFIGURE_VARS += \ 
    49         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \ 
    50         CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ 
    51         LDFLAGS="$$$$LDFLAGS" \ 
    52         LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses $(LIBGCC_S) -ldl" \ 
     47        CXX="$(STAGING_DIR)/host/bin/g++-uc" \ 
     48        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \ 
     49        CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ 
     50        LDFLAGS="$$$$LDFLAGS" \ 
     51        LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses $(LIBGCC_S) -ldl" \ 
     52        i_cv_posix_fallocate_works=no 
    5353 
    5454MAKE_VARS += \ 
     
    5757define Package/lftp/install 
    5858        $(INSTALL_DIR) $(1)/usr/bin 
    59         $(INSTALL_DIR) $(1)/usr/lib 
    6059        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lftp $(1)/usr/bin/ 
    6160endef 
    6261 
    63 define Package/lftp/postinst 
    64 # check for real system 
    65 if [ -z "$${IPKG_INSTROOT}" ]; then 
    66         if [ ! -e $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6 ]; then 
    67                 ln -s $${IPKG_INSTROOT}/usr/lib/libuClibc++.so.0 $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6 
    68         fi 
    69 fi 
    70  
    71 endef 
    72  
    73 define Package/lftp/postrm 
    74 if [ -z "$${IPKG_INSTROOT}" ]; then 
    75         if [ -L $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6 ]; then 
    76                 rm $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6 
    77         fi 
    78 fi 
    79  
    80 endef 
    81  
    8262$(eval $(call BuildPackage,lftp)) 
  • packages/net/lftp/patches/001-libintl.patch

    r21539 r24744  
    1212 #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) 
    1313 # include <cstdlib> 
    14  # if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H 
     14 # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H 
    1515-#  include <libintl.h> 
    1616 # endif 
Note: See TracChangeset for help on using the changeset viewer.