SOURCES: fish-link.patch - up for 1.23.0
aredridel
aredridel at pld-linux.org
Thu Jan 17 05:32:15 CET 2008
Author: aredridel Date: Thu Jan 17 04:32:15 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up for 1.23.0
---- Files affected:
SOURCES:
fish-link.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/fish-link.patch
diff -u SOURCES/fish-link.patch:1.1 SOURCES/fish-link.patch:1.2
--- SOURCES/fish-link.patch:1.1 Sat Aug 25 15:45:13 2007
+++ SOURCES/fish-link.patch Thu Jan 17 05:32:09 2008
@@ -1,11 +1,1012 @@
---- fish-1.22.3/configure.ac.orig 2007-02-08 18:38:58.000000000 +0100
-+++ fish-1.22.3/configure.ac 2007-08-25 15:38:21.396699519 +0200
-@@ -457,7 +457,7 @@
- fi
+diff -Nur fish-1.23.0.orig/configure.ac fish-1.23.0.link/configure.ac
+--- fish-1.23.0.orig/configure.ac 2008-01-12 18:47:44.000000000 -0700
++++ fish-1.23.0.link/configure.ac 2008-01-16 21:27:38.000000000 -0700
+@@ -504,7 +504,7 @@
+ LIBS=""
AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
-AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+AC_SEARCH_LIBS( setupterm, [tinfo ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
- AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
-
+ LIBS_SHARED=$LIBS
+ LIBS=$LIBS_COMMON
+diff -Nur fish-1.23.0.orig/configure.ac.orig fish-1.23.0.link/configure.ac.orig
+--- fish-1.23.0.orig/configure.ac.orig 1969-12-31 17:00:00.000000000 -0700
++++ fish-1.23.0.link/configure.ac.orig 2008-01-12 18:47:44.000000000 -0700
+@@ -0,0 +1,975 @@
++
++#
++# This file is the main build configuration file for fish. It is used
++# to determine your systems capabilities, and tries to adapt fish to
++# take maximum advantage of the services your system offers.
++#
++# Process this file using the 'autoconf' command to produce a working
++# configure script, which should in turn be executed in order to
++# configure the build process.
++#
++
++AC_INIT(fish,1.23.0,fish-users at lists.sf.net)
++
++
++#
++# List of output variables produced by this configure script
++#
++
++AC_SUBST( docdir )
++AC_SUBST( HAVE_GETTEXT )
++AC_SUBST( LDFLAGS_FISH )
++AC_SUBST( LIBS_FISH )
++AC_SUBST( LIBS_FISH_INDENT )
++AC_SUBST( LIBS_FISH_PAGER )
++AC_SUBST( LIBS_FISHD )
++AC_SUBST( LIBS_MIMEDB )
++AC_SUBST( LIBS_SET_COLOR )
++AC_SUBST( localedir )
++AC_SUBST( optbindirs )
++AC_SUBST( prefix )
++AC_SUBST( SEQ_FALLBACK )
++AC_SUBST( XSEL )
++AC_SUBST( XSEL_MAN )
++AC_SUBST( XSEL_MAN_PATH )
++
++#
++# If needed, run autoconf to regenerate the configure file
++#
++# This makes sure that after running autoconf once to create the first
++# version of configure, we never again need to worry about manually
++# running autoconf to handle an updates configure.ac.
++#
++
++AC_MSG_CHECKING([if autoconf needs to be run])
++if test configure -ot configure.ac; then
++ AC_MSG_RESULT([yes])
++ if which autoconf >/dev/null; then
++ # No need to provide any error messages if autoconf fails, the
++ # shell and autconf should take care of that themselves
++ AC_MSG_NOTICE([running autoconf])
++ if autoconf; then
++ ./configure "$@"
++ exit
++ fi
++ exit 1
++ else
++ AC_MSG_ERROR(
++ [cannot find the autoconf program in your path.
++This program needs to be run whenever the configure.ac file is modified.
++Please install it and try again.]
++ )
++ fi
++else
++ AC_MSG_RESULT([no])
++fi
++
++
++#
++# If needed, run autoheader to regenerate config.h.in
++#
++# This makes sure we never ever have to run autoheader manually. It
++# will be run whenever needed automatically.
++#
++
++AC_MSG_CHECKING([if autoheader needs to be run])
++if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
++ AC_MSG_RESULT([yes])
++ if which autoheader >/dev/null; then
++ AC_MSG_NOTICE([running autoheader])
++ autoheader || exit 1
++ else
++ AC_MSG_ERROR(
++ [cannot find the autoheader program in your path.
++This program needs to be run whenever the configure.ac file is modified.
++Please install it and try again.]
++ )
++ fi
++else
++ AC_MSG_RESULT([no])
++fi
++
++
++#
++# Detect directories which may contain additional headers, libraries
++# and commands. This needs to be done early - before Autoconf starts
++# to mess with CFLAGS and all the other environemnt variables.
++#
++# This mostly helps OS X users, since fink usually installs out of
++# tree and doesn't update CFLAGS.
++#
++
++for i in /usr/pkg /sw /opt /opt/local; do
++
++ AC_MSG_CHECKING([for $i/include include directory])
++ if test -d $i/include; then
++ AC_MSG_RESULT(yes)
++ CPPFLAGS="$CPPFLAGS -I$i/include/"
++ CFLAGS="$CFLAGS -I$i/include/"
++ else
++ AC_MSG_RESULT(no)
++ fi
++
++ AC_MSG_CHECKING([for $i/lib library directory])
++ if test -d $i/lib; then
++ AC_MSG_RESULT(yes)
++ LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
++ else
++ AC_MSG_RESULT(no)
++ fi
++
++ AC_MSG_CHECKING([for $i/bin command directory])
++ if test -d $i/bin; then
++ AC_MSG_RESULT(yes)
++ optbindirs="$optbindirs $i/bin"
++ else
++ AC_MSG_RESULT(no)
++ fi
++
++done
++
++
++#
++# Tell autoconf to create config.h header
++#
++AC_CONFIG_HEADERS(config.h)
++
++
++#
++# This adds markup to the code that results in a few extra compile
++# time checks on recent GCC versions. It helps stop a few common bugs.
++#
++
++AH_BOTTOM([#if __GNUC__ >= 3
++#define __warn_unused __attribute__ ((warn_unused_result))
++#define __sentinel __attribute__ ((sentinel))
++#else
++#define __warn_unused
++#define __sentinel
++#endif])
++
++
++#
++# Set up various programs needed for install
++#
++
++# Here we look for c99 before cc as Sun Studio compiler supports c99
++# through the c99 binary.
++
++AC_PROG_CC([gcc c99 cc])
++AC_PROG_CPP
++AC_PROG_INSTALL
++
++#
++# Check for seq command. If missing, make sure fallback shellscript
++# implementation is installed.
++#
++
++AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
++
++
++if test "$SEQ_FALLBACK"; then
++
++ #
++ # We already have seq. Check if the seq version is installed by an
++ # earlier fish version. If it is, we'll replace it.
++ #
++
++ file=`which seq`
++ if test -f "$file"; then
++
++ AC_MSG_CHECKING([if seq comes from a previous fish version])
++ shebang=`grep "\(^#!/.*/fish\|^#!/usr/bin/env fish\)" $file`
++
++ if test "$shebang"; then
++ SEQ_FALLBACK=seq
++ AC_MSG_RESULT(yes, replace it)
++ else
++ AC_MSG_RESULT(no, keep it)
++ fi
++ fi
++fi
++
++
++#
++# Optionally drop xsel command
++#
++
++AC_ARG_WITH(
++ xsel,
++ AC_HELP_STRING(
++ [--without-xsel],
++ [do not build the xsel program needed for X clipboard integration]
++ ),
++ [xsel=$withval],
++ [xsel=with_xsel]
++)
++
++if [[ "$xsel" = "with_xsel" ]]; then
++ XSEL=xsel-0.9.6/xsel
++ XSEL_MAN=xsel.1x
++ XSEL_MAN_PATH=xsel-0.9.6/xsel.1x
++fi
++
++
++#
++# Optionally drop gettext support
++#
++
++AC_ARG_WITH(
++ gettext,
++ AC_HELP_STRING(
++ [--without-gettext],
++ [do not translate messages, even if gettext is available]
++ ),
++ [local_gettext=$withval],
++ [local_gettext=yes]
++)
++
++if test x$local_gettext != xno; then
++ AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext])
++fi
++
++
++#
++# Test if the compiler accepts the -std=c99 flag. If so, using it
++# increases the odds of correct compilation, since we want to use the
++# *wprintf functions, which where defined in C99.
++#
++# NOTE: Never versions of autoconf has AC_CHECK_PROG_CC_C99
++#
++
++if test "$CC" != "c99"; then
++ XCFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -std=c99"
++ XCPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS -std=c99"
++ AC_MSG_CHECKING(if -std=c99 works)
++
++ AC_CACHE_VAL(
++ local_cv_has__std_c99,
++ [
++ AC_TRY_RUN(
++ [
++ #include <stdlib.h>
++ #include <stdio.h>
++
++ int main()
++ {
++ return 0;
++ }
++ ],
++ local_cv_has__std_c99=yes,
++ local_cv_has__std_c99=no,
++ )
++ ]
++ )
++
++ AC_MSG_RESULT($local_cv_has__std_c99)
++ case x$local_cv_has__std_c99 in
++ xno)
++ CFLAGS="$XCFLAGS"
++ CPPFLAGS="$XCPPFLAGS" ;;
++ esac
++fi
++
++#
++# Try to enable large file support. This will make sure that on systems
++# where off_t can be either 32 or 64 bit, the latter size is used. On
++# other systems, this should do nothing. (Hopefully)
++#
++
++CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
++
++#
++# If we are using gcc, set some flags that increase the odds of the
++# compiler producing a working binary...
++#
++
++if test "$GCC" = yes; then
++
++ #
++ # -fno-optimize-sibling-calls seems to work around a bug where
++ # sending a SIGWINCH to fish on NetBSD 3.0 causes fish to exit when
++ # compiled with GCC 3.3.3. This is probably either a compiler bug
++ # or a libc bug, but adding this flag seems to fix things for
++ # now. Long term, the real problem should be tracked down and
++ # truly fixed, at which point we can remove this silly flag. This
++ # bug has been verified to not exist on Linux using GCC 3.3.3.
++ #
++
++ CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
++
++
++ #
++ # -Wall is there to keep me on my toes
++ #
++
++ CFLAGS="$CFLAGS -Wall"
++
++ #
++ # This is needed in order to get the really cool backtraces
++ #
++
++ LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic"
++
++fi
++
++
++#
++# If we are compiling against glibc, set some flags to work around
++# some rather stupid attempts to hide prototypes for *wprintf
++# functions, as well as prototypes of various gnu extensions.
++#
++
++AC_MSG_CHECKING([if we are compiling against glibc])
++AC_RUN_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #include <stdlib.h>
++ #ifdef __GLIBC__
++ #define STATUS 0
++ #else
++ #define STATUS 1
++ #endif
++ ],
++ [
++ return STATUS;
++ ]
++ )
++ ],
++ [glibc=yes],
++ [glibc=no]
++)
++
++if test "$glibc" = yes; then
++ AC_MSG_RESULT(yes)
++
++ #
++ # This gives us access to prototypes for gnu extensions and C99
++ # functions if we are compiling agains glibc. All GNU extensions
++ # that are used must have a fallback implementation available in
++ # fallback.h, in order to keep fish working on non-gnu platforms.
++ #
++
++ CFLAGS="$CFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
++else
++ AC_MSG_RESULT(no)
++fi
++
++
++#
++# Test cpu for special handling of ppc
++#
++# This is used to skip use of tputs on ppc systems, since it seemed to
++# be broken, at least on older debin-based systems. This is obviously
++# not the right way to to detect whether this workaround should be
++# used, since it catches far to many systems, but I do not have the
++# hardware available to narrow this problem down, and in practice, it
++# seems that tputs is never really needed.
++#
++
++AC_CANONICAL_TARGET
++
++if test $target_cpu = powerpc; then
++ AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
++fi
++
++
++#
++# Solaris-specific flags go here
++#
++
++AC_MSG_CHECKING([if we are under Solaris])
++case $target_os in
++ solaris*)
++ AC_DEFINE( __EXTENSIONS__, 1, [Macro to enable additional prototypes under Solaris])
++ AC_MSG_RESULT(yes)
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++esac
++
++# Check for Solaris curses tputs having fixed length parameter list.
++AC_MSG_CHECKING([if we are using non varargs tparm.])
++AC_COMPILE_IFELSE(
++ [
++ AC_LANG_PROGRAM(
++ [
++ #include <curses.h>
++ #include <term.h>
++ ],
++ [
++ tparm( "" );
++ ]
++ )
++ ],
++ [tparm_solaris_kludge=no],
++ [tparm_solaris_kludge=yes]
++)
++if test "x$tparm_solaris_kludge" = "xyes"; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(
++ [TPARM_SOLARIS_KLUDGE],
++ [1],
++ [Define to 1 if tparm accepts a fixed amount of paramters.]
++ )
++else
++ AC_MSG_RESULT(no)
++fi
++
++
++#
++# BSD-specific flags go here
++#
++
++AC_MSG_CHECKING([if we are under BSD])
++case $target_os in
++ *bsd*)
++ AC_DEFINE( __BSD_VISIBLE, 1, [Macro to enable additional prototypes under BSD])
++ AC_DEFINE( _NETBSD_SOURCE, 1, [Macro to enable additional prototypes under BSD])
++ AC_MSG_RESULT(yes)
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++esac
++
++
++#
++# Set up PREFIX and related preprocessor symbols. Fish needs to know
++# where it will be installed. One of the reasons for this is so that
++# it can make sure the fish installation directory is in the path
++# during startup.
++#
++
++if [[ "$prefix" = NONE ]]; then
++ prefix=/usr/local
++fi
++
++
++#
++# Set up the directory where the documentation files should be
++# installed
++#
++
++AC_ARG_VAR( [docdir], [Documentation direcotry] )
++
++if test -z $docdir; then
++ docdir=$datadir/doc/fish
++else
++ docdir=$docdir
++fi
++
++
++#
++# Set up locale directory. This is where the .po files will be
++# installed.
++#
++
++localedir=$datadir/locale
++
++
++#
++# See if Linux procfs is present. This is used to get extra
++# information about running processes.
++#
++
++AC_CHECK_FILES([/proc/self/stat])
++
++
++#
++# This is ued to tell the wgetopt library to translate strings. This
++# way wgetopt can be dropped into any project without requiring i18n.
++#
++
++AC_DEFINE(
++ [HAVE_TRANSLATE_H],
++ [1],
++ [Define to 1 if the wgettext function should be used for translating strings.]
++)
++
++
++#
++# Check presense of various libraries. This is done on a per-binary
++# level, since including various extra libraries in all binaries only
++# because thay are used by some of them can cause extra bloat and
++# slower compiles when developing fish.
++#
++
++# Check for os dependant libraries for all binaries.
++LIBS_COMMON=$LIBS
++LIBS=""
++AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
++AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
++AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
++LIBS_SHARED=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fish.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++
++
++AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
++LIBS_FISH=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fish_indent.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_FISH_INDENT=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fish_pager.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_FISH_PAGER=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by fishd.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
++fi
++LIBS_FISHD=$LIBS
++LIBS=$LIBS_COMMON
++
++#
++# Check for libraries needed by mimedb.
++#
++
++LIBS_COMMON=$LIBS
++LIBS="$LIBS_SHARED"
++if test x$local_gettext != xno; then
++ AC_SEARCH_LIBS( gettext, intl,,)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/fish-link.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list