fmdiff: use make file and correct broken symlink #14143
Conversation
|
We can't directly symlink system files into the user's prefix. If this is a limitation of the software's ability to locate fmdiff through multiple levels of symlinks, this should be addressed in the software. Have you reported this to the author? |
|
I've notified the upsteam (http://www.defraine.net/~brunod/fmdiff/) with a proposed patch. In the meantime I've update the formula with a patch and removed the symlink. It seems long, but it's just the same 8 lines applied to four files. |
| @@ -3,11 +3,99 @@ | |||
| class Fmdiff < Formula | |||
| homepage 'http://www.defraine.net/~brunod/fmdiff/' | |||
| url 'http://www.defraine.net/~brunod/fmdiff/fmscripts-20120522.tar.gz' | |||
| sha1 'cdb98c68b617c8b42e714a906b7f3824c4c5afe9' | |||
| md5 'c760830c1f67626a9b609cea3338c576' | |||
There was a problem hiding this comment.
No need to change this to md5 - keep it as sha1.
|
Patches apply correctly against head, however head wasn't using svn so it was failing (the download was garbage). Put sha1 back. |
|
Could you squash these three commits into one? Thanks! |
|
Done |
Run make in order to properly detect which version of XCode is installed Run make install instead of bin.install Update to latest version which resolves the multiple symlink layers issue. Fixed head to use svn. Previous head didn't work (just downloaded a single html file).
|
Upstream patch was released, changed pull request to reflect that. Thanks to Bruno De Fraine for getting back to me super fast. |
|
Thanks! This is why I get nervous about patches for HEAD. ;) Just a note - I fixed them up for you, but there were two things that Pulled, thanks again! |
|
Ah, sorry that was my bad. Thanks for fixing that up. |
Run make in order to properly detect which version of XCode is installed Run make install instead of bin.install Update to latest version which resolves the multiple symlink layers issue. Fixed head to use svn. Previous head didn't work (just downloaded a single html file). Closes Homebrew#14143. Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Run make in order to properly detect which version of XCode is installed Run make install instead of bin.install Update to latest version which resolves the multiple symlink layers issue. Fixed head to use svn. Previous head didn't work (just downloaded a single html file). Closes Homebrew#14143. Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Run make in order to properly detect which version of XCode is installed Run make install instead of bin.install Update to latest version which resolves the multiple symlink layers issue. Fixed head to use svn. Previous head didn't work (just downloaded a single html file). Closes Homebrew#14143. Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Run make in order to properly detect which version of XCode is installed
Run make install instead of bin.install
Correctly generate the filemerge symlink in /usr/local/bin. Without a
direct symlink fmdiff simply crash. Users may not have had this issue if
fmdiff was previously installed since they already had the symlink
I'm directly creating a symlink in /usr/local/bin. If someone has a better suggestion of how to do this I will happily amend my commit. The issue is that the normal linking process creates two layers of symlinks which causes the fmdiff scripts to fail when using readlink on the second layer symlink.