diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-23 15:40:45 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-23 15:40:45 +0400 |
| commit | 857ed45fd77688d2b7bb412201ba2c0def5e43bd (patch) | |
| tree | 617d62135ff165f094bfbd52c9cf803756f1e7d1 | |
| parent | a4d84031bba016ec8d26a6927d4c6a8a3a287e89 (diff) | |
| download | llvm-toolchain-3.5-857ed45fd77688d2b7bb412201ba2c0def5e43bd.tar.gz | |
Use egrep and fine instead of ggrep and gfind
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/dyson-coreutils.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a68db1d..3c12373 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ llvm-toolchain-3.5 (1:3.5~+rc2-2~dyson1) UNRELEASED; urgency=medium - Use --whole-archive instead of -z allextract (dyson-gnu-ld.patch) - Use -Wl,--no-keep-memory (debian/rules) - Don't build lldb, it does not support illumos (debian/rules) + - Use egrep and fine instead of ggrep and gfind + (debian/patches/dyson-coreutils.patch) -- Igor Pashev <pashev.igor@gmail.com> Sat, 23 Aug 2014 12:14:59 +0400 diff --git a/debian/patches/dyson-coreutils.patch b/debian/patches/dyson-coreutils.patch new file mode 100644 index 0000000..73511d9 --- /dev/null +++ b/debian/patches/dyson-coreutils.patch @@ -0,0 +1,30 @@ +Index: llvm-3.5.git/utils/llvmdo +=================================================================== +--- llvm-3.5.git.orig/utils/llvmdo ++++ llvm-3.5.git/utils/llvmdo +@@ -166,12 +166,6 @@ files_to_ignore="\ + + if test -d "$TOPDIR" ; then + cd $TOPDIR +- # Have to use the right "find" on a per-platform basis. Most platforms have +- # Gnu find as "find", but Solaris does not. +- case `uname -s` in +- SunOS) find_prog=gfind ;; +- *) find_prog=find ;; +- esac + # Turn off file name generation (globbing) so that substitution of the + # variables doesn't cause the shell to create lists of file names + set -f +Index: llvm-3.5.git/utils/llvmgrep +=================================================================== +--- llvm-3.5.git.orig/utils/llvmgrep ++++ llvm-3.5.git/utils/llvmgrep +@@ -28,7 +28,7 @@ fi + if test -d "$TOPDIR" ; then + cd $TOPDIR + case `uname -s` in +- SunOS) grep_cmd="ggrep -H -n" ;; ++ SunOS) grep_cmd="egrep -H -n" ;; + Linux|Darwin) grep_cmd="egrep -H -n" ;; + *) grep_cmd="egrep -l -n" ;; + esac diff --git a/debian/patches/series b/debian/patches/series index 3ee38cd..494108c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -45,3 +45,4 @@ kfreebsd-lldb-gdbserver.diff gcc-compat-1.diff gcc-compat-2.diff dyson-gnu-ld.patch +dyson-coreutils.patch |