diff options
Diffstat (limited to 'package/libsoup/patches/patch-build-aux_missing')
| -rw-r--r-- | package/libsoup/patches/patch-build-aux_missing | 440 |
1 files changed, 440 insertions, 0 deletions
diff --git a/package/libsoup/patches/patch-build-aux_missing b/package/libsoup/patches/patch-build-aux_missing new file mode 100644 index 000000000..d51cb4f26 --- /dev/null +++ b/package/libsoup/patches/patch-build-aux_missing @@ -0,0 +1,440 @@ +--- libsoup-2.44.2.orig/build-aux/missing 2013-10-18 00:01:48.000000000 +0200 ++++ libsoup-2.44.2/build-aux/missing 2014-04-14 17:21:42.180934853 +0200 +@@ -1,10 +1,10 @@ + #! /bin/sh +-# Common wrapper for a few potentially missing GNU programs. ++# Common stub for a few missing GNU programs while installing. + +-scriptversion=2012-06-26.16; # UTC ++scriptversion=2012-01-06.18; # UTC + +-# Copyright (C) 1996-2013 Free Software Foundation, Inc. +-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. ++# Copyright (C) 1996-2012 Free Software Foundation, Inc. ++# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -29,33 +29,61 @@ if test $# -eq 0; then + exit 1 + fi + +-case $1 in ++run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + +- --is-lightweight) +- # Used by our autoconf macros to check whether the available missing +- # script is modern enough. +- exit 0 +- ;; ++# In the cases where this matters, 'missing' is being run in the ++# srcdir already. ++if test -f configure.ac; then ++ configure_ac=configure.ac ++else ++ configure_ac=configure.in ++fi + +- --run) +- # Back-compat with the calling convention used by older automake. +- shift +- ;; ++msg="missing on your system" ++ ++case $1 in ++--run) ++ # Try to run requested program, and just exit if it succeeds. ++ run= ++ shift ++ "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi ++ ;; + + -h|--h|--he|--hel|--help) + echo "\ + $0 [OPTION]... PROGRAM [ARGUMENT]... + +-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +-to PROGRAM being missing or too old. ++Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an ++error status if there is no known handling for PROGRAM. + + Options: + -h, --help display this help and exit + -v, --version output version information and exit ++ --run try to run the given command, and emulate it if it fails + + Supported PROGRAM values: +- aclocal autoconf autoheader autom4te automake makeinfo +- bison yacc flex lex help2man ++ aclocal touch file 'aclocal.m4' ++ autoconf touch file 'configure' ++ autoheader touch file 'config.h.in' ++ autom4te touch the output file, or create a stub one ++ automake touch all 'Makefile.in' files ++ bison create 'y.tab.[ch]', if possible, from existing .[ch] ++ flex create 'lex.yy.c', if possible, from existing .c ++ help2man touch the output file ++ lex create 'lex.yy.c', if possible, from existing .c ++ makeinfo touch the output file ++ yacc create 'y.tab.[ch]', if possible, from existing .[ch] + + Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and + 'g' are ignored when checking the name. +@@ -70,141 +98,228 @@ Send bug reports to <bug-automake@gnu.or + ;; + + -*) +- echo 1>&2 "$0: unknown '$1' option" ++ echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + + esac + +-# Run the given program, remember its exit status. +-"$@"; st=$? ++# normalize program name to check for. ++program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` + +-# If it succeeded, we are done. +-test $st -eq 0 && exit 0 ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). This is about non-GNU programs, so use $1 not ++# $program. ++case $1 in ++ lex*|yacc*) ++ # Not GNU programs, they don't have --version. ++ ;; + +-# Also exit now if we it failed (or wasn't found), and '--version' was +-# passed; such an option is passed most likely to detect whether the +-# program is present and works. +-case $2 in --version|--help) exit $st;; esac ++ *) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running '$TOOL --version' or '$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 ++ fi ++ ;; ++esac + +-# Exit code 63 means version mismatch. This often happens when the user +-# tries to use an ancient version of a tool on a file that requires a +-# minimum version. +-if test $st -eq 63; then +- msg="probably too old" +-elif test $st -eq 127; then +- # Program was missing. +- msg="missing on your system" +-else +- # Program was found and executed, but failed. Give up. +- exit $st +-fi ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case $program in ++ aclocal*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified 'acinclude.m4' or '${configure_ac}'. You might want ++ to install the Automake and Perl packages. Grab them from ++ any GNU archive site." ++ touch aclocal.m4 ++ ;; + +-perl_URL=http://www.perl.org/ +-flex_URL=http://flex.sourceforge.net/ +-gnu_software_URL=http://www.gnu.org/software ++ autoconf*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified '${configure_ac}'. You might want to install the ++ Autoconf and GNU m4 packages. Grab them from any GNU ++ archive site." ++ touch configure ++ ;; + +-program_details () +-{ +- case $1 in +- aclocal|automake) +- echo "The '$1' program is part of the GNU Automake package:" +- echo "<$gnu_software_URL/automake>" +- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" +- echo "<$gnu_software_URL/autoconf>" +- echo "<$gnu_software_URL/m4/>" +- echo "<$perl_URL>" +- ;; +- autoconf|autom4te|autoheader) +- echo "The '$1' program is part of the GNU Autoconf package:" +- echo "<$gnu_software_URL/autoconf/>" +- echo "It also requires GNU m4 and Perl in order to run:" +- echo "<$gnu_software_URL/m4/>" +- echo "<$perl_URL>" +- ;; +- esac +-} ++ autoheader*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified 'acconfig.h' or '${configure_ac}'. You might want ++ to install the Autoconf and GNU m4 packages. Grab them ++ from any GNU archive site." ++ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` ++ test -z "$files" && files="config.h" ++ touch_files= ++ for f in $files; do ++ case $f in ++ *:*) touch_files="$touch_files "`echo "$f" | ++ sed -e 's/^[^:]*://' -e 's/:.*//'`;; ++ *) touch_files="$touch_files $f.in";; ++ esac ++ done ++ touch $touch_files ++ ;; + +-give_advice () +-{ +- # Normalize program name to check for. +- normalized_program=`echo "$1" | sed ' +- s/^gnu-//; t +- s/^gnu//; t +- s/^g//; t'` ++ automake*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. ++ You might want to install the Automake and Perl packages. ++ Grab them from any GNU archive site." ++ find . -type f -name Makefile.am -print | ++ sed 's/\.am$/.in/' | ++ while read f; do touch "$f"; done ++ ;; + +- printf '%s\n' "'$1' is $msg." ++ autom4te*) ++ echo 1>&2 "\ ++WARNING: '$1' is needed, but is $msg. ++ You might have modified some files without having the ++ proper tools for further handling them. ++ You can get '$1' as part of Autoconf from any GNU ++ archive site." + +- configure_deps="'configure.ac' or m4 files included by 'configure.ac'" +- case $normalized_program in +- autoconf*) +- echo "You should only need it if you modified 'configure.ac'," +- echo "or m4 files included by it." +- program_details 'autoconf' +- ;; +- autoheader*) +- echo "You should only need it if you modified 'acconfig.h' or" +- echo "$configure_deps." +- program_details 'autoheader' +- ;; +- automake*) +- echo "You should only need it if you modified 'Makefile.am' or" +- echo "$configure_deps." +- program_details 'automake' +- ;; +- aclocal*) +- echo "You should only need it if you modified 'acinclude.m4' or" +- echo "$configure_deps." +- program_details 'aclocal' +- ;; +- autom4te*) +- echo "You might have modified some maintainer files that require" +- echo "the 'automa4te' program to be rebuilt." +- program_details 'autom4te' +- ;; +- bison*|yacc*) +- echo "You should only need it if you modified a '.y' file." +- echo "You may want to install the GNU Bison package:" +- echo "<$gnu_software_URL/bison/>" +- ;; +- lex*|flex*) +- echo "You should only need it if you modified a '.l' file." +- echo "You may want to install the Fast Lexical Analyzer package:" +- echo "<$flex_URL>" +- ;; +- help2man*) +- echo "You should only need it if you modified a dependency" \ +- "of a man page." +- echo "You may want to install the GNU Help2man package:" +- echo "<$gnu_software_URL/help2man/>" ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo "#! /bin/sh" ++ echo "# Created by GNU Automake missing as a replacement of" ++ echo "# $ $@" ++ echo "exit 0" ++ chmod +x $file ++ exit 1 ++ fi + ;; +- makeinfo*) +- echo "You should only need it if you modified a '.texi' file, or" +- echo "any other file indirectly affecting the aspect of the manual." +- echo "You might want to install the Texinfo package:" +- echo "<$gnu_software_URL/texinfo/>" +- echo "The spurious makeinfo call might also be the consequence of" +- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" +- echo "want to install GNU make:" +- echo "<$gnu_software_URL/make/>" +- ;; +- *) +- echo "You might have modified some files without having the proper" +- echo "tools for further handling them. Check the 'README' file, it" +- echo "often tells you about the needed prerequisites for installing" +- echo "this package. You may also peek at any GNU archive site, in" +- echo "case some other package contains this missing '$1' program." +- ;; +- esac +-} + +-give_advice "$1" | sed -e '1s/^/WARNING: /' \ +- -e '2,$s/^/ /' >&2 ++ bison*|yacc*) ++ echo 1>&2 "\ ++WARNING: '$1' $msg. You should only need it if ++ you modified a '.y' file. You may need the Bison package ++ in order for those modifications to take effect. You can get ++ Bison from any GNU archive site." ++ rm -f y.tab.c y.tab.h ++ if test $# -ne 1; then ++ eval LASTARG=\${$#} ++ case $LASTARG in ++ *.y) ++ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ++ if test -f "$SRCFILE"; then ++ cp "$SRCFILE" y.tab.c ++ fi ++ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ++ if test -f "$SRCFILE"; then ++ cp "$SRCFILE" y.tab.h ++ fi ++ ;; ++ esac ++ fi ++ if test ! -f y.tab.h; then ++ echo >y.tab.h ++ fi ++ if test ! -f y.tab.c; then ++ echo 'main() { return 0; }' >y.tab.c ++ fi ++ ;; + +-# Propagate the correct exit status (expected to be 127 for a program +-# not found, 63 for a program that failed due to version mismatch). +-exit $st ++ lex*|flex*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified a '.l' file. You may need the Flex package ++ in order for those modifications to take effect. You can get ++ Flex from any GNU archive site." ++ rm -f lex.yy.c ++ if test $# -ne 1; then ++ eval LASTARG=\${$#} ++ case $LASTARG in ++ *.l) ++ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ++ if test -f "$SRCFILE"; then ++ cp "$SRCFILE" lex.yy.c ++ fi ++ ;; ++ esac ++ fi ++ if test ! -f lex.yy.c; then ++ echo 'main() { return 0; }' >lex.yy.c ++ fi ++ ;; ++ ++ help2man*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified a dependency of a manual page. You may need the ++ Help2man package in order for those modifications to take ++ effect. You can get Help2man from any GNU archive site." ++ ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo ".ab help2man is required to generate this page" ++ exit $? ++ fi ++ ;; ++ ++ makeinfo*) ++ echo 1>&2 "\ ++WARNING: '$1' is $msg. You should only need it if ++ you modified a '.texi' or '.texinfo' file, or any other file ++ indirectly affecting the aspect of the manual. The spurious ++ call might also be the consequence of using a buggy 'make' (AIX, ++ DU, IRIX). You might want to install the Texinfo package or ++ the GNU make package. Grab either from any GNU archive site." ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -z "$file"; then ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 ++ touch $file ++ ;; ++ ++ *) ++ echo 1>&2 "\ ++WARNING: '$1' is needed, and is $msg. ++ You might have modified some files without having the ++ proper tools for further handling them. Check the 'README' file, ++ it often tells you about the needed prerequisites for installing ++ this package. You may also peek at any GNU archive site, in case ++ some other package would contain this missing '$1' program." ++ exit 1 ++ ;; ++esac ++ ++exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) |