upgrade libncurses to 5.6
git-svn-id: svn://svn.openwrt.org/openwrt/packages@7541 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
aa1dccfd58
commit
70bcca18c5
@ -9,13 +9,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ncurses
|
||||
PKG_VERSION:=5.2
|
||||
PKG_RELEASE:=8
|
||||
PKG_VERSION:=5.6
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@GNU/ncurses
|
||||
PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47
|
||||
PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
|
||||
PKG_CAT:=zcat
|
||||
|
||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
||||
|
@ -1,24 +1,12 @@
|
||||
diff -ruN ncurses-5.2-orig/aclocal.m4 ncurses-5.2-6/aclocal.m4
|
||||
--- ncurses-5.2-orig/aclocal.m4 2000-10-21 00:57:49.000000000 +0200
|
||||
+++ ncurses-5.2-6/aclocal.m4 2005-08-09 14:50:15.000000000 +0200
|
||||
@@ -1919,7 +1919,7 @@
|
||||
EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
|
||||
diff -ur ncurses-5.6/aclocal.m4 ncurses-5.6-owrt/aclocal.m4
|
||||
--- ncurses-5.6/aclocal.m4 2006-12-17 17:12:38.000000000 +0100
|
||||
+++ ncurses-5.6-owrt/aclocal.m4 2007-06-09 19:47:38.000000000 +0200
|
||||
@@ -3816,7 +3816,7 @@
|
||||
EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
|
||||
fi
|
||||
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
|
||||
- MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $[@] .$(REL_VERSION)`.$(ABI_VERSION),-stats,-lc -o $[@]'
|
||||
+ MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $[@] .$(REL_VERSION)`.$(ABI_VERSION),-stats,$(LDFLAGS) -lc -o $[@]'
|
||||
;;
|
||||
openbsd2*)
|
||||
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
|
||||
diff -ruN ncurses-5.2-orig/configure ncurses-5.2-6/configure
|
||||
--- ncurses-5.2-orig/configure 2000-10-21 00:58:49.000000000 +0200
|
||||
+++ ncurses-5.2-6/configure 2005-08-09 14:50:25.000000000 +0200
|
||||
@@ -2660,7 +2660,7 @@
|
||||
EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
|
||||
fi
|
||||
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
|
||||
- MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $@ .$(REL_VERSION)`.$(ABI_VERSION),-stats,-lc -o $@'
|
||||
+ MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $@ .$(REL_VERSION)`.$(ABI_VERSION),-stats,$(LDFLAGS) -lc -o $@'
|
||||
CF_SHARED_SONAME
|
||||
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
|
||||
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]'
|
||||
;;
|
||||
openbsd2*)
|
||||
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
|
||||
|
@ -1,65 +0,0 @@
|
||||
diff -ruN ncurses-5.2-old/configure ncurses-5.2-new/configure
|
||||
--- ncurses-5.2-old/configure 2005-08-23 04:17:49.000000000 +0200
|
||||
+++ ncurses-5.2-new/configure 2005-08-23 04:18:39.000000000 +0200
|
||||
@@ -7191,11 +7191,11 @@
|
||||
fi
|
||||
done
|
||||
echo "$ac_t""$cf_cv_src_modules" 1>&6
|
||||
-TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
|
||||
+TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
|
||||
|
||||
|
||||
|
||||
-PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
|
||||
+PROG_ARGS="-L${LIB_DIR} $PROG_ARGS"
|
||||
|
||||
|
||||
SRC_SUBDIRS="man include"
|
||||
diff -ruN ncurses-5.2-old/form/Makefile.in ncurses-5.2-new/form/Makefile.in
|
||||
--- ncurses-5.2-old/form/Makefile.in 2000-10-14 19:57:02.000000000 +0200
|
||||
+++ ncurses-5.2-new/form/Makefile.in 2005-08-23 04:22:08.000000000 +0200
|
||||
@@ -85,7 +85,7 @@
|
||||
LINK = $(LIBTOOL) $(CC)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
-SHLIB_DIRS = -L../lib -L$(libdir)
|
||||
+SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
MK_SHARED_LIB = @MK_SHARED_LIB@
|
||||
diff -ruN ncurses-5.2-old/menu/Makefile.in ncurses-5.2-new/menu/Makefile.in
|
||||
--- ncurses-5.2-old/menu/Makefile.in 2000-10-14 19:57:02.000000000 +0200
|
||||
+++ ncurses-5.2-new/menu/Makefile.in 2005-08-23 04:22:18.000000000 +0200
|
||||
@@ -85,7 +85,7 @@
|
||||
LINK = $(LIBTOOL) $(CC)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
-SHLIB_DIRS = -L../lib -L$(libdir)
|
||||
+SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
MK_SHARED_LIB = @MK_SHARED_LIB@
|
||||
diff -ruN ncurses-5.2-old/ncurses/Makefile.in ncurses-5.2-new/ncurses/Makefile.in
|
||||
--- ncurses-5.2-old/ncurses/Makefile.in 2000-10-15 00:55:35.000000000 +0200
|
||||
+++ ncurses-5.2-new/ncurses/Makefile.in 2005-08-23 04:21:53.000000000 +0200
|
||||
@@ -99,7 +99,7 @@
|
||||
LINK = $(LIBTOOL) $(CC)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
-SHLIB_DIRS = -L../lib -L$(libdir)
|
||||
+SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) @SHLIB_LIST@
|
||||
TINFO_LIST = $(SHLIB_DIRS) @TINFO_LIST@
|
||||
|
||||
diff -ruN ncurses-5.2-old/panel/Makefile.in ncurses-5.2-new/panel/Makefile.in
|
||||
--- ncurses-5.2-old/panel/Makefile.in 2000-10-14 19:57:02.000000000 +0200
|
||||
+++ ncurses-5.2-new/panel/Makefile.in 2005-08-23 04:22:30.000000000 +0200
|
||||
@@ -86,7 +86,7 @@
|
||||
LINK = $(LIBTOOL) $(CC)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
-SHLIB_DIRS = -L../lib -L$(libdir)
|
||||
+SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
MK_SHARED_LIB = @MK_SHARED_LIB@
|
Loading…
x
Reference in New Issue
Block a user