Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
6c703083c9
3 changed files with 2 additions and 87 deletions
  1. +0
    -44
      package/base/ncurses/head-tail.patch
  2. +2
    -2
      package/base/ncurses/ncurses.desc
  3. +0
    -41
      package/base/ncurses/tic-shlibs-run.patch.cross

+ 0
- 44
package/base/ncurses/head-tail.patch

@ -1,44 +0,0 @@
diff -dur ncurses-5.3/configure ncurses-5.3-p/configure
--- ncurses-5.3/configure 2002-09-22 02:49:14.000000000 +0200
+++ ncurses-5.3-p/configure 2004-11-04 19:10:01.187625096 +0100
@@ -1963,7 +1963,7 @@
if test "$GCC" = yes ; then
echo "$as_me:1964: checking version of gcc" >&5
echo $ECHO_N "checking version of gcc... $ECHO_C" >&6
- GCC_VERSION="`${CC} --version|head -1`"
+ GCC_VERSION="`${CC} --version|head -n1`"
echo "$as_me:1967: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6
fi
@@ -2850,7 +2850,7 @@
if test "$GXX" = yes; then
echo "$as_me:2851: checking version of g++" >&5
echo $ECHO_N "checking version of g++... $ECHO_C" >&6
- GXX_VERSION="`${CXX-g++} --version|head -1`"
+ GXX_VERSION="`${CXX-g++} --version|head -n1`"
echo "$as_me:2854: result: $GXX_VERSION" >&5
echo "${ECHO_T}$GXX_VERSION" >&6
case $GXX_VERSION in
Nur in ncurses-5.3-p/: configure~.
diff -dur ncurses-5.3/configure.in ncurses-5.3-p/configure.in
--- ncurses-5.3/configure.in 2002-09-15 02:11:28.000000000 +0200
+++ ncurses-5.3-p/configure.in 2004-11-04 19:09:52.302975768 +0100
@@ -83,7 +83,7 @@
GCC_VERSION=none
if test "$GCC" = yes ; then
AC_MSG_CHECKING(version of gcc)
- GCC_VERSION="`${CC} --version|head -1`"
+ GCC_VERSION="`${CC} --version|head -n1`"
AC_MSG_RESULT($GCC_VERSION)
fi
@@ -158,7 +158,7 @@
GXX_VERSION=none
if test "$GXX" = yes; then
AC_MSG_CHECKING(version of g++)
- GXX_VERSION="`${CXX-g++} --version|head -1`"
+ GXX_VERSION="`${CXX-g++} --version|head -n1`"
AC_MSG_RESULT($GXX_VERSION)
case $GXX_VERSION in
1*|2.[[0-6]]*)
Nur in ncurses-5.3-p/: configure.in~.

+ 2
- 2
package/base/ncurses/ncurses.desc

@ -38,9 +38,9 @@
[L] GPL
[S] Stable
[V] 5.3
[V] 5.4
[P] X -X-3-----9 104.000
[D] 3372452585 ncurses-5.3.tar.gz ftp://ftp.gnu.org/pub/gnu/ncurses/
[D] 3539979981 ncurses-5.4.tar.gz ftp://ftp.gnu.org/pub/gnu/ncurses/
[D] 430723242 termtypes.ti.gz http://catb.org/~esr/terminfo/

+ 0
- 41
package/base/ncurses/tic-shlibs-run.patch.cross

@ -1,41 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/ncurses/tic-shlibs-run.patch.cross
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./misc/run_tic.in.orig 2004-09-21 00:08:05.106683264 +0200
+++ ./misc/run_tic.in 2004-09-21 00:08:35.937996192 +0200
@@ -66,6 +66,10 @@
*) PATH=../progs:${DESTDIR}$bindir:$PATH ;;
esac
export PATH
+SHLIB=$srcdir/shlib
+else
+# Cross-compiling, so don't set PATH or run shlib.
+SHLIB=
fi
#
@@ -111,7 +115,7 @@
problems for older ncurses applications.
EOF
-if ( $srcdir/shlib tic$suffix -s -o $TERMINFO $source )
+if ( $SHLIB tic$suffix -s -o $TERMINFO $source )
then
echo '** built new '$TERMINFO
else

|||||||
100:0
Loading…
Cancel
Save