bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24744 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2010-12-21 04:39:46 +00:00
parent 0642455fd0
commit b101a078b1
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/lftp/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=lftp PKG_NAME:=lftp
PKG_VERSION:=4.0.9 PKG_VERSION:=4.1.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://lftp.cybermirror.org \ PKG_SOURCE_URL:=http://lftp.cybermirror.org \
http://lftp.cybermirror.org/old http://lftp.cybermirror.org/old
PKG_MD5SUM:=d3f0cd7569e31e50370208dd77a7c41b PKG_MD5SUM:=87717c30869a626cc53817c1c0a585ef
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -35,8 +35,6 @@ define Package/lftp/description
library is used for input. library is used for input.
endef endef
# uses GNU configure
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--without-libiconv-prefix \ --without-libiconv-prefix \
--without-libintl-prefix \ --without-libintl-prefix \
@ -46,37 +44,19 @@ CONFIGURE_ARGS += \
--disable-static --disable-static
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \ CXX="$(STAGING_DIR)/host/bin/g++-uc" \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \
LDFLAGS="$$$$LDFLAGS" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses $(LIBGCC_S) -ldl" \ LDFLAGS="$$$$LDFLAGS" \
LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses $(LIBGCC_S) -ldl" \
i_cv_posix_fallocate_works=no
MAKE_VARS += \ MAKE_VARS += \
LD="\$$$$(CC)" \ LD="\$$$$(CC)" \
define Package/lftp/install define Package/lftp/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lftp $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lftp $(1)/usr/bin/
endef endef
define Package/lftp/postinst
# check for real system
if [ -z "$${IPKG_INSTROOT}" ]; then
if [ ! -e $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6 ]; then
ln -s $${IPKG_INSTROOT}/usr/lib/libuClibc++.so.0 $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6
fi
fi
endef
define Package/lftp/postrm
if [ -z "$${IPKG_INSTROOT}" ]; then
if [ -L $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6 ]; then
rm $${IPKG_INSTROOT}/usr/lib/libstdc\+\+.so.6
fi
fi
endef
$(eval $(call BuildPackage,lftp)) $(eval $(call BuildPackage,lftp))

2
net/lftp/patches/001-libintl.patch
View File

@ -11,7 +11,7 @@
@@ -55,7 +54,6 @@ @@ -55,7 +54,6 @@
#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
# include <cstdlib> # include <cstdlib>
# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
-# include <libintl.h> -# include <libintl.h>
# endif # endif
#endif #endif