Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:verhaegs:branches:home:verhaegs:amixdev
ppc-morphos-binutils
0004-Remove-white-space-disruption.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0004-Remove-white-space-disruption.patch of Package ppc-morphos-binutils
From cc925dd4c59873bd1a92c26bc763cc61654a9f6b Mon Sep 17 00:00:00 2001 From: Staf Verhaegen <staf@stafverhaegen.be> Date: Wed, 3 Dec 2014 01:17:22 +0100 Subject: [PATCH 4/5] Remove white-space disruption --- configure | 113 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/configure b/configure index 3e88364..42d5761 100755 --- a/configure +++ b/configure @@ -10,12 +10,12 @@ # it 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. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ # preparation for compilation. # # If configure succeeds, it leaves its status in config.status. -# If configure fails after disturbing the status quo, +# If configure fails after disturbing the status quo, # config.status is removed. # @@ -181,7 +181,7 @@ do --*) ;; -*) option=-$option ;; esac - + # Split out the argument for options that take them case $option in --*=*) @@ -782,7 +782,7 @@ tooldir='$(exec_prefix)'/${target_alias} if [ "${host_alias}" != "${target_alias}" ] ; then if [ "${program_prefixoption}" = "" ] ; then - if [ "${program_suffixoption}" = "" ] ; then + if [ "${program_suffixoption}" = "" ] ; then if [ "${program_transform_nameoption}" = "" ] ; then program_prefix=${target_alias}- ; fi @@ -809,7 +809,7 @@ if [ -z "${CC}" ] && [ -r Makefile ]; then /\\$/ N s/\\\n//g t loop -/^CC[ ]*=/ s/CC[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc +/^CC[ ]*=/ s/CC[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc CC=`tail -1 Makefile.cc` rm -f Makefile.cc fi @@ -819,7 +819,7 @@ if [ -z "${CFLAGS}" ] && [ -r Makefile ]; then /\\$/ N s/\\\n//g t loop -/^CFLAGS[ ]*=/ s/CFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc +/^CFLAGS[ ]*=/ s/CFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc CFLAGS=`tail -1 Makefile.cc` rm -f Makefile.cc fi @@ -829,7 +829,7 @@ if [ -z "${CXX}" ] && [ -r Makefile ]; then /\\$/ N s/\\\n//g t loop -/^CXX[ ]*=/ s/CXX[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc +/^CXX[ ]*=/ s/CXX[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc CXX=`tail -1 Makefile.cc` rm -f Makefile.cc fi @@ -839,7 +839,7 @@ if [ -z "${CXXFLAGS}" ] && [ -r Makefile ]; then /\\$/ N s/\\\n//g t loop -/^CXXFLAGS[ ]*=/ s/CXXFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc +/^CXXFLAGS[ ]*=/ s/CXXFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc CXXFLAGS=`tail -1 Makefile.cc` rm -f Makefile.cc fi @@ -850,7 +850,7 @@ fi for prog in 'bison -y' byacc yacc do set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/$tmp; then @@ -888,7 +888,7 @@ done for prog in flex lex do set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/$tmp; then @@ -918,7 +918,7 @@ if [ "${build}" != "${host}" ]; then /\\$/ N s/\\\n//g t loop -/^'"${var}"'[ ]*=/ s/'"${var}"'[ ]*=[ ]*\(.*\)/\1/p' \ +/^'"${var}"'[ ]*=/ s/'"${var}"'[ ]*=[ ]*\(.*\)/\1/p' \ < Makefile > Makefile.v t=`tail -1 Makefile.v` if [ -n "${t}" ]; then @@ -956,7 +956,7 @@ t loop WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres} if [ -z "${YACC}" ]; then - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/bison; then @@ -979,7 +979,7 @@ t loop fi if [ -z "${LEX}" ]; then - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/flex; then @@ -1007,7 +1007,7 @@ t loop else # If CC is still not set, try to get gcc. if [ -z "${CC}" ]; then - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/gcc; then @@ -1148,7 +1148,7 @@ for subdir in . ${subdirs} ; do if ${symbolic_link} ${srcfile} ${link} >/dev/null 2>&1 ; then true else - # We need to re-remove the file because Lynx leaves a + # We need to re-remove the file because Lynx leaves a # very strange directory there when it fails an NFS symlink. ${remove} -r -f ${link} ${hard_link} ${srcfile} ${link} @@ -1186,7 +1186,7 @@ EOF # code is order so as to try to sed the smallest input files we know. # so do these separately because I don't trust the order of sed -e expressions. - # the five makefile fragments MUST end up in the resulting Makefile in this order: + # the five makefile fragments MUST end up in the resulting Makefile in this order: # package macros, target, host, site, and package rules. if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then @@ -1329,7 +1329,7 @@ EOF if [ "${site_makefile_frag}" != "" ] ; then echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile} - fi + fi # record if we want to build shared libs. if test -z "${enable_shared}"; then @@ -1354,63 +1354,62 @@ EOF # remove any form feeds. if [ -z "${subdirs}" ]; then rm -f ${subdir}/Makefile.tm2 - sed -e "s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}:" \ - -e "s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \ + sed -e "s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}:" \ + -e "s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \ ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2 rm -f ${subdir}/Makefile.tem mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem fi - sed -e "s|^prefix[ ]*=.*$|prefix = ${prefix}|" \ - -e "s|^exec_prefix[ ]*=.*$|exec_prefix = ${exec_prefix}|" \ - -e "s|^bindir[ ]*=.*$|bindir = ${bindir}|" \ - -e "s|^sbindir[ ]*=.*$|sbindir = ${sbindir}|" \ - -e "s|^libexecdir[ ]*=.*$|libexecdir = ${libexecdir}|" \ - -e "s|^datadir[ ]*=.*$|datadir = ${datadir}|" \ - -e "s|^sysconfdir[ ]*=.*$|sysconfdir = ${sysconfdir}|" \ - -e "s|^sharedstatedir[ ]*=.*$|sharedstatedir = ${sharedstatedir}|" \ - -e "s|^localstatedir[ ]*=.*$|localstatedir = ${localstatedir}|" \ - -e "s|^libdir[ ]*=.*$|libdir = ${libdir}|" \ - -e "s|^includedir[ ]*=.*$|includedir = ${includedir}|" \ - -e "s|^oldincludedir[ ]*=.*$|oldincludedir = ${oldincludedir}|" \ - -e "s|^infodir[ ]*=.*$|infodir = ${infodir}|" \ - -e "s|^mandir[ ]*=.*$|mandir = ${mandir}|" \ - -e "/^CC[ ]*=/{ + sed -e "s|^prefix[ ]*=.*$|prefix = ${prefix}|" \ + -e "s|^exec_prefix[ ]*=.*$|exec_prefix = ${exec_prefix}|" \ + -e "s|^bindir[ ]*=.*$|bindir = ${bindir}|" \ + -e "s|^sbindir[ ]*=.*$|sbindir = ${sbindir}|" \ + -e "s|^libexecdir[ ]*=.*$|libexecdir = ${libexecdir}|" \ + -e "s|^datadir[ ]*=.*$|datadir = ${datadir}|" \ + -e "s|^sysconfdir[ ]*=.*$|sysconfdir = ${sysconfdir}|" \ + -e "s|^sharedstatedir[ ]*=.*$|sharedstatedir = ${sharedstatedir}|" \ + -e "s|^localstatedir[ ]*=.*$|localstatedir = ${localstatedir}|" \ + -e "s|^libdir[ ]*=.*$|libdir = ${libdir}|" \ + -e "s|^includedir[ ]*=.*$|includedir = ${includedir}|" \ + -e "s|^oldincludedir[ ]*=.*$|oldincludedir = ${oldincludedir}|" \ + -e "s|^infodir[ ]*=.*$|infodir = ${infodir}|" \ + -e "s|^mandir[ ]*=.*$|mandir = ${mandir}|" \ + -e "/^CC[ ]*=/{ :loop1 /\\\\$/ N s/\\\\\\n//g t loop1 - s%^CC[ ]*=.*$%CC = ${CC}% + s%^CC[ ]*=.*$%CC = ${CC}% }" \ - -e "/^CXX[ ]*=/{ + -e "/^CXX[ ]*=/{ :loop2 /\\\\$/ N s/\\\\\\n//g t loop2 - s%^CXX[ ]*=.*$%CXX = ${CXX}% + s%^CXX[ ]*=.*$%CXX = ${CXX}% }" \ - -e "/^CFLAGS[ ]*=/{ + -e "/^CFLAGS[ ]*=/{ :loop3 /\\\\$/ N s/\\\\\\n//g t loop3 - s%^CFLAGS[ ]*=.*$%CFLAGS = ${CFLAGS}% + s%^CFLAGS[ ]*=.*$%CFLAGS = ${CFLAGS}% }" \ - -e "/^CXXFLAGS[ ]*=/{ + -e "/^CXXFLAGS[ ]*=/{ :loop4 /\\\\$/ N s/\\\\\\n//g t loop4 - s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% + s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% }" \ -e "s|^SHELL[ ]*=.*$|SHELL = ${config_shell}|" \ -e "s:^GDB_TK[ ]*=.*$:GDB_TK = ${GDB_TK}:" \ - -e "s|^srcdir[ ]*=.*$|srcdir = ${makesrcdir}|" \ + -e "s|^srcdir[ ]*=.*$|srcdir = ${makesrcdir}|" \ -e "s///" \ - -e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \ - -e "s:^program_suffix[ ]*=.*$:program_suffix = ${program_suffix}:" \ - -e "s:^program_transform_name[ ]*=.*$:program_transform_name = ${program_transform_name}:" \ - -e "s|^tooldir[ ]*=.*$|tooldir = ${tooldir}|" \ - -e "s|^build_tooldir[ ]*=.*$|build_tooldir = ${tooldir}|" \ + -e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \ + -e "s:^program_suffix[ ]*=.*$:program_suffix = ${program_suffix}:" \ + -e "s:^program_transform_name[ ]*=.*$:program_transform_name = ${program_transform_name}:" \ + -e "s|^tooldir[ ]*=.*$|tooldir = ${tooldir}|" \ -e "s:^DEFAULT_YACC[ ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \ -e "s:^DEFAULT_LEX[ ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \ -e "s:^DEFAULT_M4[ ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \ @@ -1421,12 +1420,12 @@ EOF if [ "${build}" != "${host}" ]; then for var in ${tools}; do val=`eval 'echo $'"${var}"` - sed -e "/^${var}[ ]*=/{ + sed -e "/^${var}[ ]*=/{ :loop1 /\\\\$/ N /\\\\$/ b loop1 s/\\\\\\n//g - s%^${var}[ ]*=.*$%${var} = ${val}% + s%^${var}[ ]*=.*$%${var} = ${val}% }" ${Makefile} > ${Makefile}.tem mv -f ${Makefile}.tem ${Makefile} done @@ -1581,14 +1580,14 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then ### The recursion line is here. if [ ! -z "${recprog}" ] ; then - if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${tgt_alias} \ - ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \ - ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then - true - else + if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \ + ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \ + ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then + true + else echo Configure in `pwd` failed, exiting. 1>&2 - exit 1 - fi + exit 1 + fi fi cd ${POPDIR} -- 1.7.11.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
