Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/pigz/patches/Makefile.patch
author John Beck <John.Beck@Oracle.COM>
Wed, 20 Mar 2013 10:12:13 -0700
changeset 1226 5e2a9b83712f
permissions -rw-r--r--
PSARC 2012/357 pigz 15824048 SUNBT7205721 bring pigz into userland consolidation
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1226
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     1
 
# Solaris used to have whereis but it was removed early in S12.  Use type
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     2
 
# instead.  Because most Linux distros have whereis, this patch is deemed
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     3
 
# Solaris-centric and thus not worthy of being submitted upstream.
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     4
 
#
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     5
 
--- pigz-2.2.5/Makefile.orig	2012-02-11 21:18:18.000000000 -0800
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     6
 
+++ pigz-2.2.5/Makefile	2013-03-15 06:01:46.213801609 -0700
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     7
 
@@ -39,7 +39,7 @@
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     8
 
 	(printf "w" | gzip ; printf "x") | ./pigz -cdf | wc -c | test `cat` -eq 2
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     9
 
 	(printf "w" | gzip ; printf "xy") | ./pigz -cdf | wc -c | test `cat` -eq 3
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    10
 
 	(printf "w" | gzip ; printf "xyz") | ./pigz -cdf | wc -c | test `cat` -eq 4
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    11
 
-	-@if test "`whereis compress | grep /`" != ""; then \
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    12
 
+	-@if test "`type -f compress | grep /`" != ""; then \
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    13
 
 	  echo 'compress -f < pigz.c | ./unpigz | cmp - pigz.c' ;\
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    14
 
 	  compress -f < pigz.c | ./unpigz | cmp - pigz.c ;\
5e2a9b83712f PSARC 2012/357 pigz
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    15
 
 	fi
upstream/oracle/userland-gate