git.squeep.com Git - portage-squeep/blob - dev-libs/icu/files/icu-65.1-remove-bashisms.patch

   1 --- a/config/icu-config-bottom
   2 +++ b/config/icu-config-bottom
   3 @@ -218,65 +218,65 @@
   4             ;;
   5
   6         --cflags)
   7 -           echo $ECHO_N "${CFLAGS} ${ECHO_C}"
   8 +           printf "%s" "${CFLAGS} "
   9             ;;
  10
  11         --cc)
  12 -           echo $ECHO_N "${CC} ${ECHO_C}"
  13 +           printf "%s" "${CC} "
  14             ;;
  15
  16         --cxx)
  17 -           echo $ECHO_N "${CXX} ${ECHO_C}"
  18 +           printf "%s" "${CXX} "
  19             ;;
  20
  21         --cxxflags)
  22 -           echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
  23 +           printf "%s" "${CXXFLAGS} "
  24             ;;
  25
  26         --cppflags)
  27             # Don't echo the -I. - it's unneeded.
  28 -           echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
  29 +           printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
  30             ;;
  31
  32         --cppflags-searchpath)
  33 -           echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
  34 +           printf "%s" "-I${prefix}/include "
  35             ;;
  36
  37         --cppflags-dynamic)
  38 -           echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
  39 +           printf "%s" "${SHAREDLIBCPPFLAGS} "
  40             ;;
  41
  42         --cxxflags-dynamic)
  43 -           echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
  44 +           printf "%s" "${SHAREDLIBCXXFLAGS} "
  45             ;;
  46
  47         --cflags-dynamic)
  48 -           echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
  49 +           printf "%s" "${SHAREDLIBCFLAGS} "
  50             ;;
  51
  52         --ldflags-system)
  53 -           echo $ECHO_N "${LIBS} ${ECHO_C}"
  54 +           printf "%s" "${LIBS} "
  55             ;;
  56
  57         --ldflags)
  58 -           echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
  59 +           printf "%s" "${LDFLAGS} ${ICULIBS} "
  60  # $RPATH_LDFLAGS
  61             ;;
  62
  63         --ldflags-libsonly)
  64 -           echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
  65 +           printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
  66             ;;
  67
  68         --ldflags-icuio)
  69 -           echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
  70 +           printf "%s" " ${ICULIBS_ICUIO} "
  71             ;;
  72
  73         --ldflags-obsolete)
  74 -           echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
  75 +           printf "%s" "${ICULIBS_OBSOLETE} "
  76             ;;
  77
  78         --ldflags-toolutil)
  79 -           echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
  80 +           printf "%s" " ${ICULIBS_TOOLUTIL} "
  81             ;;
  82
  83         --ldflags-layout)
  84 @@ -285,7 +285,7 @@
  85             ;;
  86
  87         --ldflags-searchpath)
  88 -           echo $ECHO_N "-L${libdir} ${ECHO_C}"
  89 +           printf "%s" "-L${libdir} "
  90             ;;
  91
  92         --detect-prefix)
  93 @@ -321,47 +321,47 @@
  94             ;;
  95
  96         --shared-datadir)
  97 -           echo $ECHO_N "${datadir} ${ECHO_C}"
  98 +           printf "%s" "${datadir} "
  99             ;;
 100
 101          --incfile)
 102 -           echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
 103 +           printf "%s" "${pkglibdir}/Makefile.inc "
 104             ;;
 105
 106         --incpkgdatafile)
 107 -           echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
 108 +           printf "%s" "${pkglibdir}/pkgdata.inc "
 109             ;;
 110
 111         --icudata)
 112 -           echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
 113 +           printf "%s" "${ICUDATA_NAME} "
 114             ;;
 115
 116         --icudata-mode)
 117 -           echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
 118 +           printf "%s" "${PKGDATA_MODE} "
 119             ;;
 120
 121         --icudata-install-dir)
 122 -        echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
 123 +        printf "%s" "${ICUPKGDATA_DIR} "
 124             ;;
 125
 126         --icudatadir)
 127 -           echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
 128 +           printf "%s" "${ICUDATA_DIR} "
 129             ;;
 130
 131         --shlib-c)
 132 -           echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
 133 +           printf "%s" "${SHLIB_c} "
 134             ;;
 135
 136         --shlib-cc)
 137 -           echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
 138 +           printf "%s" "${SHLIB_cc} "
 139             ;;
 140
 141         --version)
 142 -           echo $ECHO_N $VERSION
 143 +           printf "%s" "$VERSION"
 144             ;;
 145
 146         --unicode-version)
 147 -           echo $ECHO_N $UNICODE_VERSION
 148 +           printf "%s" "$UNICODE_VERSION"
 149             ;;
 150
 151         --host)
 152 --- a/config/Makefile.inc.in
 153 +++ b/config/Makefile.inc.in
 154 @@ -124,12 +124,6 @@
 155  # with usually. Many applications will want to add $(ICULIBS_I18N) as well.
 156  ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)
 157
 158 -# Proper echo newline handling is needed in icu-config
 159 -ECHO_N=@ICU_ECHO_N@
 160 -ECHO_C=@ICU_ECHO_C@
 161 -# Not currently being used but good to have for proper tab handling
 162 -ECHO_T=@ICU_ECHO_T@
 163 -
 164  ##################################################################
 165  ##################################################################
 166  #
 167 --- a/configure.ac
 168 +++ b/configure.ac
 169 @@ -26,24 +26,6 @@
 170  PACKAGE="icu"
 171  AC_SUBST(PACKAGE)
 172
 173 -# Use custom echo test for newline option
 174 -# Current autoconf (2.65) gives incorrect echo newline option
 175 -# for icu-config
 176 -# This may be removed later - mow (June 17, 2010)
 177 -ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
 178 -case `/bin/sh -c "echo -n x"` in
 179 --n*)
 180 -  case `/bin/sh -c "echo 'x\c'"` in
 181 -  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
 182 -  *)   ICU_ECHO_C='\c';;
 183 -  esac;;
 184 -*)
 185 -  ICU_ECHO_N='-n';;
 186 -esac
 187 -AC_SUBST(ICU_ECHO_N)
 188 -AC_SUBST(ICU_ECHO_C)
 189 -AC_SUBST(ICU_ECHO_T)
 190 -
 191  AC_MSG_CHECKING(for ICU version numbers)
 192
 193  # Get the ICU version from uversion.h or other headers
 194 --- a/icudefs.mk.in
 195 +++ b/icudefs.mk.in
 196 @@ -161,11 +161,6 @@
 197  ENABLE_STATIC = @ENABLE_STATIC@
 198  ENABLE_SHARED = @ENABLE_SHARED@
 199
 200 -# Echo w/o newline
 201 -
 202 -#ECHO_N = @ICU_ECHO_N@
 203 -#ECHO_C = @ICU_ECHO_C@
 204 -
 205  # Commands to compile
 206  COMPILE.c=    $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
 207  COMPILE.cc=   $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c