diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/ncurses/Makefile | 1 | ||||
| -rw-r--r-- | package/vim/Makefile | 11 | ||||
| -rw-r--r-- | package/vim/patches/patch-src_auto_configure | 42 |
3 files changed, 7 insertions, 47 deletions
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index e9aaddf9a..4a2eea8e7 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV})) +TARGET_CFLAGS+= -lgcc CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ diff --git a/package/vim/Makefile b/package/vim/Makefile index da2cd3d3b..a96c799b1 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vim -PKG_VERSION:= 7.3 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 5b9510a17074e2b37d8bb38ae09edbf2 +PKG_VERSION:= 7.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 607e135c559be642f210094ad023dc65 PKG_DESCR:= The text editor PKG_SECTION:= editor PKG_DEPENDS:= libncurses libgcc @@ -15,13 +15,14 @@ PKG_URL:= http://www.vim.org/ PKG_SITES:= ftp://ftp.vim.org/pub/vim/unix/ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -WRKDIST= ${WRKDIR}/vim73 +WRKDIST= ${WRKDIR}/vim74 WRKSRC= ${WRKDIST}/src include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,VIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS+= -lgcc CONFIGURE_ENV+= vim_cv_toupper_broken=no \ vim_cv_getcwd_broken=no \ vim_cv_stat_ignores_slash=yes \ @@ -60,7 +61,7 @@ post-install: ${INSTALL_DIR} ${IDIR_VIM}/usr/bin ${INSTALL_DIR} ${IDIR_VIM}/usr/share/vim ${CP} ${WRKINST}/usr/bin/{ex,vim,view} ${IDIR_VIM}/usr/bin - ${CP} ${WRKINST}/usr/share/vim/vim73/vimrc_example.vim \ + ${CP} ${WRKINST}/usr/share/vim/vim74/vimrc_example.vim \ ${IDIR_VIM}/usr/share/vim/vimrc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vim/patches/patch-src_auto_configure b/package/vim/patches/patch-src_auto_configure deleted file mode 100644 index 37544f63b..000000000 --- a/package/vim/patches/patch-src_auto_configure +++ /dev/null @@ -1,42 +0,0 @@ ---- vim73.orig/src/auto/configure 2010-08-13 16:17:15.000000000 +0200 -+++ vim73/src/auto/configure 2010-09-20 02:59:14.017806852 +0200 -@@ -11639,39 +11639,6 @@ _ACEOF - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 --$as_echo_n "checking uint32_t is 32 bits... " >&6; } --if test "$cross_compiling" = yes; then : -- as_fn_error "could not compile program using uint32_t." "$LINENO" 5 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#ifdef HAVE_STDINT_H --# include <stdint.h> --#endif --#ifdef HAVE_INTTYPES_H --# include <inttypes.h> --#endif --main() { -- uint32_t nr1 = (uint32_t)-1; -- uint32_t nr2 = (uint32_t)0xffffffffUL; -- if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1); -- exit(0); --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 --$as_echo "ok" >&6; } --else -- as_fn_error "WRONG! uint32_t not defined correctly." "$LINENO" 5 --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- -- - bcopy_test_prog=' - #include "confdefs.h" - #ifdef HAVE_STRING_H |