From b6e28db2e5ec9f79b7fe3ab4e67b265eccea29ba Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 4 Nov 2005 17:35:29 +0000 Subject: [PATCH] Stefan Fiedler: update xfsprogs (2.6.25 -> 2.7.3), for gcc40 search in libtermcap for symbols missing from libreadline Index: package/base/xfsprogs/xfsprogs.desc =================================================================== [2005102619131327744] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6603 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/xfsprogs/new_automake.patch | 35 +++++--------------- package/base/xfsprogs/readline-termcap.patch | 22 ++++++++++++ package/base/xfsprogs/xfsprogs.desc | 4 +-- 3 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 package/base/xfsprogs/readline-termcap.patch diff --git a/package/base/xfsprogs/new_automake.patch b/package/base/xfsprogs/new_automake.patch index 7c563c32a..6670ee132 100644 --- a/package/base/xfsprogs/new_automake.patch +++ b/package/base/xfsprogs/new_automake.patch @@ -1,29 +1,9 @@ -# --- 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/xfsprogs/new_automake.patch -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - -diff -ruN xfsprogs-2.6.13-old/configure.in xfsprogs-2.6.13/configure.in ---- xfsprogs-2.6.13-old/configure.in 2004-06-17 11:42:40.341733888 +0200 -+++ xfsprogs-2.6.13/configure.in 2004-06-17 11:41:28.386672720 +0200 -@@ -26,7 +26,50 @@ - enable_editline=no) - AC_SUBST(libeditline) - AC_SUBST(enable_editline) +--- ./configure.in~ 2005-10-19 04:38:18.000000000 +0200 ++++ ./configure.in 2005-10-19 04:39:58.000000000 +0200 +@@ -32,6 +32,51 @@ + test $enable_termcap = yes && libtermcap="-ltermcap",) + AC_SUBST(libtermcap) + +# Generic macro, sets up all of the global packaging variables. +# The following environment variables may be set to override defaults: +# DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP @@ -32,7 +12,7 @@ diff -ruN xfsprogs-2.6.13-old/configure.in xfsprogs-2.6.13/configure.in +AC_DEFUN([AC_PACKAGE_GLOBALS], + [ pkg_name="$1" + AC_SUBST(pkg_name) - ++ + . ./VERSION + pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} + AC_SUBST(pkg_version) @@ -68,6 +48,7 @@ diff -ruN xfsprogs-2.6.13-old/configure.in xfsprogs-2.6.13/configure.in + test -z "$PLATFORM" || pkg_platform="$PLATFORM" + AC_SUBST(pkg_platform) + ]) ++ AC_PACKAGE_GLOBALS(xfsprogs) AC_PACKAGE_UTILITIES(xfsprogs) diff --git a/package/base/xfsprogs/readline-termcap.patch b/package/base/xfsprogs/readline-termcap.patch new file mode 100644 index 000000000..8cb3cf39c --- /dev/null +++ b/package/base/xfsprogs/readline-termcap.patch @@ -0,0 +1,22 @@ +--- xfsprogs-2.7.3/configure~ 2005-10-07 18:52:51.000000000 +0200 ++++ xfsprogs-2.7.3/configure 2005-10-24 00:18:45.000000000 +0200 +@@ -1284,7 +1284,7 @@ + # Check whether --enable-readline or --disable-readline was given. + if test "${enable_readline+set}" = set; then + enableval="$enable_readline" +- test $enable_readline = yes && libreadline="-lreadline" ++ test $enable_readline = yes && libreadline="-lreadline -ltermcap" + else + enable_readline=no + fi; +--- xfsprogs-2.7.3/configure.in~ 2005-10-07 18:51:32.000000000 +0200 ++++ xfsprogs-2.7.3/configure.in 2005-10-24 00:18:34.000000000 +0200 +@@ -13,7 +13,7 @@ + + AC_ARG_ENABLE(readline, + [ --enable-readline=[yes/no] Enable readline command editing [default=no]], +- test $enable_readline = yes && libreadline="-lreadline", ++ test $enable_readline = yes && libreadline="-lreadline -ltermcap", + enable_readline=no) + AC_SUBST(libreadline) + AC_SUBST(enable_readline) diff --git a/package/base/xfsprogs/xfsprogs.desc b/package/base/xfsprogs/xfsprogs.desc index cea4e1a5d..7f310f04b 100644 --- a/package/base/xfsprogs/xfsprogs.desc +++ b/package/base/xfsprogs/xfsprogs.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 2.6.25 +[V] 2.7.3 [P] X -?---5---9 184.400 -[D] 2161488680 xfsprogs-2.6.25.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ +[D] 888413655 xfsprogs-2.7.3.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/