riak 1.4.0 #21186

erbmicha · 2013-07-13T07:49:37Z

No description provided.

adamv · 2013-07-13T16:50:38Z

Library/Formula/riak.rb

+  # patch scripts to work with homebrew symlinking
+  def patches
+    [
+      "https://gist.github.com/erbmicha/5970803/raw", # env.sh patch


I like the other approach of just hardcoding the Homebrew path instead.

It was designed to work for all symlinking, not just homebrew. This way Basho can use it in their build process for other products.

On Jul 13, 2013, at 9:50 AM, Adam Vandenberg [email protected] wrote:

In Library/Formula/riak.rb:

option '32-bit'

patch scripts to work with homebrew symlinking

def patches

[

"https://gist.github.com/erbmicha/5970803/raw", # env.sh patch
I like the other approach of just hardcoding the Homebrew path instead.

—
Reply to this email directly or view it on GitHub.

When they accept it upstream then we won't need a patch, but in the meantime, the approach used in the other riak 1.4.0 submission has a smaller footprint.

If by "they" you mean Basho, then you are correct, but I've been told that won't be until the next release and then the formula will be updated accordingly.

On Jul 13, 2013, at 12:04 PM, Adam Vandenberg [email protected] wrote:

In Library/Formula/riak.rb:

option '32-bit'

patch scripts to work with homebrew symlinking

def patches

[

"https://gist.github.com/erbmicha/5970803/raw", # env.sh patch
When they accept it upstream then we won't need a patch, but in the meantime, the approach used in the other riak 1.4.0 submission has a smaller footprint.

—
Reply to this email directly or view it on GitHub.

mistydemeo · 2013-07-13T20:51:28Z

I'm sure there's a good reason, but why are we installing binaries instead of building from source?

erbmicha · 2013-07-13T21:25:32Z

I tried that route originally, but Basho distributes the binaries with a patched Erlang R15B01. That is a pain to replicate. Besides, this is a much faster install :)

On Jul 13, 2013, at 1:51 PM, Misty De Meo [email protected] wrote:

I'm sure there's a good reason, but why are we installing binaries instead of building from source?

—
Reply to this email directly or view it on GitHub.

jacknagel · 2013-07-13T21:30:46Z

Library/Formula/riak.rb

-    url 'http://s3.amazonaws.com/downloads.basho.com/riak/1.3/1.3.1/osx/10.6/riak-1.3.1-osx-i386.tar.gz'
-    version '1.3.1-i386'
-    sha256 '1169ddcbc1a613c734f3df7350b416e84c667faaae73b647d2fa696aa45bc085'
+    ohai "There is no pre-compiled 32-bit version anymore. Go to http://docs.basho.com/riak/latest/tutorials/installation/Installing-on-Mac-OS-X/#From-Source and compile from source."
  end


This conditional needs to be removed; it's not OK to print stuff in the DSL section of the formula, as that means it will be printed every time this formula is loaded on 32-bit systems. The depends_on :arch => :x86_64 tells Homebrew to print an appropriate warning and disallow installing on such platforms.

Removed. Sending a new pull request...

Can you cancel this pull request so I can send a new one? It won't let me send while this is open.

You can force-push back to the same branch and the current pull request will be updated.

Nevermind. I didn't realize that the pull request would update with subsequent commits to the files included. Neat :)

mistydemeo · 2013-07-13T21:54:50Z

I tried that route originally, but Basho distributes the binaries with a patched Erlang R15B01. That is a pain to replicate.

That's unfortunate. I really would rather not drop support for 32-bit Macs.

@jacknagel

removing the comment about 32-bit not being available per comment by @jacknagel

adamv · 2013-07-13T23:09:54Z

Library/Formula/riak.rb

-    end
-
+    prefix.install Dir['*']
+    rm Dir.glob("#{bin}/*.orig") # get rid of the patch backups before symlinking to bin


Remove files before installing.

removed conditional

xpe · 2013-07-14T02:00:27Z

So, my pull request is over at #21155. Is that what people want to go with? I can squash it into one commit if that would help.

xpe · 2013-07-14T02:02:19Z

FWIW, the patching approach (this pull request) gives these warnings (?) for me:

==> Patching
patching file lib/env.sh
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 15 with fuzz 1.
patching file bin/riak
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 4 with fuzz 1.
patching file bin/search-cmd
patch unexpectedly ends in middle of line
Hunk #2 succeeded at 13 with fuzz 1.
patching file bin/riak-admin
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 3 with fuzz 1.
patching file bin/riak-debug
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 99 with fuzz 1.

erbmicha · 2013-07-14T02:15:14Z

I know, but they succeed. I tried a few different ways to generate the diffs that wouldn't result in those warnings, but everything did. They were generate by git.

Interesting that if I use the same file with "patch" at the commandline there are no warnings. Whatever flags homebrew uses with "patch" must be generating them.

On Jul 13, 2013, at 7:02 PM, David James [email protected] wrote:

FWIW, the patching approach gives these warnings (?) for me:

==> Patching
patching file lib/env.sh
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 15 with fuzz 1.
patching file bin/riak
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 4 with fuzz 1.
patching file bin/search-cmd
patch unexpectedly ends in middle of line
Hunk #2 succeeded at 13 with fuzz 1.
patching file bin/riak-admin
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 3 with fuzz 1.
patching file bin/riak-debug
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 99 with fuzz 1.

—
Reply to this email directly or view it on GitHub.

adamv · 2013-07-17T14:02:20Z

Calling this a duplicate of #21155.

riak 1.4.0

49577da

erbmicha mentioned this pull request Jul 13, 2013

riak 1.4.0 #21155

Closed

adamv reviewed Jul 13, 2013
View reviewed changes

jacknagel reviewed Jul 13, 2013
View reviewed changes

riak 1.4.0

86629cf

removing the comment about 32-bit not being available per comment by @jacknagel

adamv reviewed Jul 13, 2013
View reviewed changes

riak 1.4.0

fd84854

removed conditional

adamv closed this Jul 17, 2013

Homebrew locked and limited conversation to collaborators Feb 17, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

riak 1.4.0 #21186

riak 1.4.0 #21186

erbmicha commented Jul 13, 2013

adamv Jul 13, 2013

erbmicha Jul 13, 2013

patch scripts to work with homebrew symlinking

adamv Jul 13, 2013

erbmicha Jul 13, 2013

patch scripts to work with homebrew symlinking

mistydemeo commented Jul 13, 2013

erbmicha commented Jul 13, 2013

jacknagel Jul 13, 2013

erbmicha Jul 13, 2013

erbmicha Jul 13, 2013

mistydemeo Jul 13, 2013

erbmicha Jul 13, 2013

mistydemeo commented Jul 13, 2013

adamv Jul 13, 2013

xpe commented Jul 14, 2013

xpe commented Jul 14, 2013

erbmicha commented Jul 14, 2013

adamv commented Jul 17, 2013

riak 1.4.0 #21186

riak 1.4.0 #21186

Conversation

erbmicha commented Jul 13, 2013

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patch scripts to work with homebrew symlinking

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patch scripts to work with homebrew symlinking

mistydemeo commented Jul 13, 2013

erbmicha commented Jul 13, 2013

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mistydemeo commented Jul 13, 2013

Choose a reason for hiding this comment

xpe commented Jul 14, 2013

xpe commented Jul 14, 2013

erbmicha commented Jul 14, 2013

adamv commented Jul 17, 2013