Add superenv for Linuxbrew by sjackman · Pull Request #263 · Linuxbrew/brew

sjackman · 2017-02-13T23:29:52Z

No description provided.

sjackman · 2017-02-13T23:33:02Z

@Linuxbrew/core As the title says. In this version, I've copied Library/Homebrew/shims/linux/super/cc from the Mac version and modified it just enough to get it up and running. It'll require much more work to bring it up to pace with --env=std in Linuxbrew.

sjackman · 2017-02-13T23:56:45Z

My last commit makes --env=std the default on Linuxbrew, so that --env=super is opt-in. With that change, we should be able to merge this PR now, and work on improving superenv together.

DoomHammer · 2017-02-15T09:29:20Z

Why remove inherit?

The behaviour hasn't changed. --env=inherit still works as before.

sjackman · 2017-02-16T15:08:06Z

Succeeded on Linux. Unrelated (I think) error on Mac:

Error:
Satisfy Dependencies and Requirements::depends_on macos#test_0001_understands depends_on macos: <array>:
Hbc::CaskError: It seems there is already an App at '/tmp/homebrew-tests-20170215-10426-1fzztn2/prefix/appdir-1487198972-634/Caffeine.app'.

https://travis-ci.org/Linuxbrew/brew/jobs/202017165#L469

bw-yuhogg · 2017-02-16T16:37:20Z

Does it make sense to skip this if rpath_paths is empty?

Yes. It shouldn't happen I think, but better to be paranoid. Thanks for catching that case. Fixed.

bw-yuhogg · 2017-02-16T16:44:32Z

Should this be restricted to runtime dependencies?

For shellinabox I got:

patchelf --print-rpath ~/.linuxbrew/bin/shellinaboxd /home/linuxbrew/.linuxbrew/lib:/home/linuxbrew/.linuxbrew/opt/libtool/lib:/home/linuxbrew/.linuxbrew/opt/zlib/lib:/home/linuxbrew/.linuxbrew/opt/openssl/lib

zlib and openssl make sense, but I don't think libtool should be there.

Putting some debugging code in revealed autoconf and automake, both build deps, were also considered, but they didn't end up in the RPATH presumably because they don't have lib directories.

👍 Nice catch. Fixed.

I haven't yet fixed this for the rpath PR for --env=std. There's shared code, so I think I'll merge this PR first, and then rebase the rpath code on top of this merged PR.

Add the opt_lib directory of each dependency to the RPATH after $HOMEBREW_PREFIX/lib, which is searched first, allowing dependent libraries to be found even when the keg is unlinked.

bw-yuhogg · 2017-02-16T17:28:36Z

      ENV.keg_only_deps = keg_only_deps
      ENV.deps = formula_deps
+      ENV.run_time_deps = run_time_deps
      ENV.x11 = reqs.any? { |rq| rq.is_a?(X11Requirement) }


Tangent: Does this need to be changed to also support XorgRequirement?

Note that when we port that to Homebrew/brew, I think we'll probably drop that name and instead use the extension mechanism Mike made, which is going to require some rather substantive retesting on our end come merge time.

It's used to point to paths to in the XQuartz SDK, which shouldn't be necessary for xorg because it's in the brew prefix.

Using -rpath=/a -rpath=/a:/b results in /a:/a:/b whereas using -rpath=/a -rpath=/a -rpath=/b results in /a:/b

maxim-belkin · 2017-02-22T22:16:57Z

+  exit 1
+fi
+exec "$HOMEBREW_RUBY_PATH" -x "$0" "$@"
+#!/usr/bin/env ruby -W0


Interesting approach... :)

sjackman added the in progress label Feb 13, 2017

sjackman changed the title ~~Add superenv for Linuxbrew~~ Add superenv for Linuxbrew [WIP] Feb 13, 2017

sjackman added the enhancement label Feb 13, 2017

sjackman self-assigned this Feb 13, 2017

DoomHammer reviewed Feb 15, 2017

View reviewed changes

sjackman requested a review from bw-yuhogg February 15, 2017 21:10

sjackman changed the title ~~Add superenv for Linuxbrew [WIP]~~ Add superenv for Linuxbrew Feb 15, 2017

sjackman added 5 commits February 16, 2017 10:06

Add shims/linux/super

fb0ddd0

Add extend/os/linux/extend/ENV/super.rb

2c619d8

shims/linux/super/cc: Fix for Linuxbrew

e98070b

cc: Remove -headerpad_max_install_names for Linux

f56325e

Use --env=std by default for Linuxbrew

e535ac1

bw-yuhogg reviewed Feb 16, 2017

View reviewed changes

superenv: Set ld.so and RPATH for Linuxbrew

d452b8c

Add the opt_lib directory of each dependency to the RPATH after $HOMEBREW_PREFIX/lib, which is searched first, allowing dependent libraries to be found even when the keg is unlinked.

bw-yuhogg reviewed Feb 16, 2017

View reviewed changes

sjackman added 3 commits February 18, 2017 09:33

superenv: Remove macOS-specific code for Linuxbrew

8ce4e8d

superenv: Fix keep? for Linuxbrew

85018bb

super/cc: Remove redundant RPATH for Linuxbrew

edbec1c

Using -rpath=/a -rpath=/a:/b results in /a:/a:/b whereas using -rpath=/a -rpath=/a -rpath=/b results in /a:/b

maxim-belkin reviewed Feb 22, 2017

View reviewed changes

sjackman merged commit acd0ff3 into Linuxbrew:master Feb 22, 2017

sjackman removed the in progress label Feb 22, 2017

sjackman deleted the superenv branch February 22, 2017 23:25

sjackman mentioned this pull request Feb 22, 2017

superenv support in linuxbrew Linuxbrew/legacy-linuxbrew#266

Closed

Uh oh!

Conversation

sjackman commented Feb 13, 2017

Uh oh!

sjackman commented Feb 13, 2017

Uh oh!

sjackman commented Feb 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DoomHammer Feb 15, 2017

Choose a reason for hiding this comment

Uh oh!

sjackman Feb 15, 2017

Choose a reason for hiding this comment

Uh oh!

sjackman commented Feb 16, 2017

Uh oh!

bw-yuhogg Feb 16, 2017

Choose a reason for hiding this comment

Uh oh!

sjackman Feb 16, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bw-yuhogg Feb 16, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sjackman Feb 16, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sjackman Feb 16, 2017

Choose a reason for hiding this comment

Uh oh!

bw-yuhogg Feb 16, 2017

Choose a reason for hiding this comment

Uh oh!

sjackman Feb 16, 2017

Choose a reason for hiding this comment

Uh oh!

maxim-belkin Feb 22, 2017

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sjackman commented Feb 13, 2017 •

edited

Loading

sjackman Feb 16, 2017 •

edited

Loading

bw-yuhogg Feb 16, 2017 •

edited

Loading

sjackman Feb 16, 2017 •

edited

Loading