[gentoo-commits] gentoo-x86 commit in app-shells/fish/files: fish-1.23.1-gentoo-alt.patch

[gentoo-commits] gentoo-x86 commit in app-shells/fish/files: fish-1.23.1-gentoo-alt.patch

[Fabian Groffen (grobian)]

grobian     10/04/18 12:58:23

  Modified:             fish-1.23.1-gentoo-alt.patch
  Log:
  Update gentoo-alt patch to make iconv work again, and not wrongly reported as failing
  (Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.2                  app-shells/fish/files/fish-1.23.1-gentoo-alt.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch?r1=1.1&r2=1.2

Index: fish-1.23.1-gentoo-alt.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fish-1.23.1-gentoo-alt.patch	9 Apr 2010 04:11:37 -0000	1.1
+++ fish-1.23.1-gentoo-alt.patch	18 Apr 2010 12:58:23 -0000	1.2
@@ -62,7 +62,7 @@
  AC_PROG_CPP
  AC_PROG_INSTALL
  
-@@ -519,12 +477,8 @@
+@@ -419,12 +477,9 @@
  	AC_SEARCH_LIBS( gettext, intl,,)
  fi
  
@@ -72,8 +72,25 @@
 -
 -LIBS_FISH=$LIBS
 -LIBS=$LIBS_COMMON
++AM_ICONV
 +LIBS_FISH="$LIBS $LIBICONV"
 +LIBS="$LIBS_COMMON $LIBICONV"
  
  #
  # Check for libraries needed by fish_indent. 
+@@ -504,7 +504,6 @@
+ 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_PAGER=$LIBS
+ LIBS=$LIBS_COMMON
+ 
+@@ -516,7 +516,6 @@
+ 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_FISHD=$LIBS
+ LIBS=$LIBS_COMMON
+ 

[gentoo-commits] gentoo-x86 commit in app-shells/fish/files: fish-1.23.1-gentoo-alt.patch

[Lars Wendler (polynomial-c)]

polynomial-c    10/04/09 04:11:37

  Added:                fish-1.23.1-gentoo-alt.patch
  Log:
  version bump
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-shells/fish/files/fish-1.23.1-gentoo-alt.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.1-gentoo-alt.patch?rev=1.1&content-type=text/plain

Index: fish-1.23.1-gentoo-alt.patch
===================================================================
* Remove Darwin cruft, remove some Solaris misdetection crap, add
  AM_ICONV instead of weird iconv check that not suprisingly fails on
  Darwin.

--- fish-1.23.1/configure.ac
+++ fish-1.23.1/configure.ac
@@ -91,45 +91,6 @@
 
 
 #
-# 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)
@@ -153,10 +114,7 @@
 # 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_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
@@ -519,12 +477,8 @@
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 
-# Check for libiconv_open if we can't find iconv_open. Silly OS X does
-# weird macro magic for the sole purpose of amusing me.
-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
-
-LIBS_FISH=$LIBS
-LIBS=$LIBS_COMMON
+LIBS_FISH="$LIBS $LIBICONV"
+LIBS="$LIBS_COMMON $LIBICONV"
 
 #
 # Check for libraries needed by fish_indent.