X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fncurses%2Fpatches%2F500-cross.patch;h=ace6252fe605fa68419e3b5a820c53a6455a3a52;hb=HEAD;hp=953619140835dd8878f2f9a25d71077c2831cb95;hpb=9bf5291670905e8bf621b5bf0ab56670d76f35c1;p=openwrt-10.03%2F.git

diff --git a/package/ncurses/patches/500-cross.patch b/package/ncurses/patches/500-cross.patch
index 953619140..ace6252fe 100644
--- a/package/ncurses/patches/500-cross.patch
+++ b/package/ncurses/patches/500-cross.patch
@@ -1,24 +1,11 @@
-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"
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -4298,7 +4298,7 @@ CF_EOF
+ 			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 $[@]'
+ 		CF_SHARED_SONAME
+-		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_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"
-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 $@'
- 		;;
- 	openbsd2*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ 	openbsd[[2-9]].*)
+ 		if test "$DFT_LWR_MODEL" = "shared" ; then