diff options
| author | Adam Vandenberg | 2013-04-30 09:21:57 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2013-04-30 09:21:57 -0700 |
| commit | e4d0ac98461e6f336e63ba777b598ab7d0c62361 (patch) | |
| tree | d81a28623969b481d68f88c285f447705c6f2ca0 /Library | |
| parent | 41d4ae5b0d021c3c92039a147c594d699f6c968b (diff) | |
| download | homebrew-e4d0ac98461e6f336e63ba777b598ab7d0c62361.tar.bz2 | |
e2fsprogs: fix compilation with clang
Closes #19532.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/e2fsprogs.rb | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Library/Formula/e2fsprogs.rb b/Library/Formula/e2fsprogs.rb index a32a3182e..b26e7be4e 100644 --- a/Library/Formula/e2fsprogs.rb +++ b/Library/Formula/e2fsprogs.rb @@ -12,11 +12,12 @@ class E2fsprogs < Formula depends_on 'pkg-config' => :build depends_on 'gettext' + # MacPorts patch to compile libs correctly. + # Fix a bare return for clang. def patches - # MacPorts patch to compile libs correctly. {:p0 => [ "https://trac.macports.org/export/92117/trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib" - ]} + ], :p1 => DATA} end def install @@ -26,3 +27,17 @@ class E2fsprogs < Formula system "make install-libs" end end + +__END__ +diff -urN e2fsprogs-1.42.7.orig/lib/ext2fs/gen_bitmap64.c e2fsprogs-1.42.7/lib/ext2fs/gen_bitmap64.c +--- e2fsprogs-1.42.7.orig/lib/ext2fs/gen_bitmap64.c 2013-01-21 19:33:35.000000000 -0800 ++++ e2fsprogs-1.42.7/lib/ext2fs/gen_bitmap64.c 2013-04-29 23:48:23.000000000 -0700 +@@ -657,7 +657,7 @@ + if ((block < bmap->start) || (block+num-1 > bmap->end)) { + ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, block, + bmap->description); +- return; ++ return EINVAL; + } + + return bmap->bitmap_ops->test_clear_bmap_extent(bmap, block, num); |