aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorBirger J. Nordølum2012-06-09 16:51:13 +0200
committerAdam Vandenberg2012-09-27 07:05:06 -0700
commit8bc83eba9b939bd14a4edd7588f86893e5f35194 (patch)
tree4454a9e7aa1c2a742f7820149b9bf1f40542759f /Library/Formula
parent1261b7ae5833cb32b1325a3bd793a4a026d77042 (diff)
downloadhomebrew-8bc83eba9b939bd14a4edd7588f86893e5f35194.tar.bz2
SquashFS: 4.2 and add LZO,XZ support.
Closes #14863. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/squashfs.rb28
1 files changed, 16 insertions, 12 deletions
diff --git a/Library/Formula/squashfs.rb b/Library/Formula/squashfs.rb
index 2f782253d..76a20a3b7 100644
--- a/Library/Formula/squashfs.rb
+++ b/Library/Formula/squashfs.rb
@@ -2,24 +2,27 @@ require 'formula'
class Squashfs < Formula
homepage 'http://squashfs.sourceforge.net/'
- url 'http://sourceforge.net/projects/squashfs/files/squashfs/squashfs4.0/squashfs4.0.tar.gz'
- sha1 '3efe764ac27c507ee4a549fc6507bc86ea0660dd'
+ url 'http://sourceforge.net/projects/squashfs/files/squashfs/squashfs4.2/squashfs4.2.tar.gz'
+ sha256 'd9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96'
+
+ depends_on 'lzo'
+ depends_on 'xz'
fails_with :clang do
build 318
end
+ # The instructions for this software say to do this on OS X
def patches
- { :p0 => DATA }
+ { :p0 => DATA }
end
def install
cd 'squashfs-tools' do
- system "make"
+ system "make XATTR_SUPPORT=0 EXTRA_CFLAGS=-std=gnu89 LZO_SUPPORT=1 LZO_DIR='#{HOMEBREW_PREFIX}' XZ_SUPPORT=1 XZ_DIR='#{HOMEBREW_PREFIX}'"
bin.install %w{mksquashfs unsquashfs}
end
-
- doc.install %w{ACKNOWLEDGEMENTS CHANGES COPYING INSTALL OLD-READMEs PERFORMANCE.README README README-4.0}
+ doc.install %w{ACKNOWLEDGEMENTS CHANGES COPYING INSTALL OLD-READMEs PERFORMANCE.README README README-4.2}
end
end
@@ -45,14 +48,15 @@ Only in squashfs-tools: mksquashfs.c.orig
diff -u squashfs-tools.orig/unsquashfs.c squashfs-tools/unsquashfs.c
--- squashfs-tools.orig/unsquashfs.c 2009-04-05 14:23:06.000000000 -0700
+++ squashfs-tools/unsquashfs.c 2011-11-17 17:51:44.000000000 -0800
-@@ -21,6 +21,7 @@
- * unsquashfs.c
- */
+@@ -29,7 +29,7 @@
+ #include "compressor.h"
+ #include "xattr.h"
+-#include <sys/sysinfo.h>
+#include <sys/sysctl.h>
- #include "unsquashfs.h"
- #include "squashfs_swap.h"
- #include "squashfs_compat.h"
+ #include <sys/types.h>
+
+ struct cache *fragment_cache, *data_cache;
@@ -1195,7 +1196,7 @@
int match = use_regex ?
regexec(path->name[i].preg, name, (size_t) 0,