-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
mesa: attempt to avoid dependency on llvm #351
Conversation
Locally, I had to hack |
Merging changes from |
🍏
@sjackman should we worry about the above messages? And these deps are for me to verify:
|
That's weird. Which is it? |
Why does |
|
|
Is that the error when you remove |
no, there is |
|
It looks as though LLVM is a needed to build a driver for the |
not only r300... but that's not so important. |
Success: https://gist.github.com/04120e0b07a1500e9d44ba5468c73361
|
@sjackman what should we do with indirect dependencies?
|
I'm okay with leaving them as indirect dependencies for now. Perhaps it's a topic that we can revisit in the future. |
Formula/mesa.rb
Outdated
@@ -11,28 +11,33 @@ class Mesa < Formula | |||
|
|||
option "without-test", "Skip compile-time tests" | |||
option "with-static", "Build static libraries (not recommended)" | |||
option "with-llvm-support", "Build with extra drivers. Requires LLVM and Libelf" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this line. Use instead depends_on "llvm" => :optional
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could if you like include
option "with-llvm", "Build drivers that require llvm and libelf"
Formula/mesa.rb
Outdated
depends_on "libelf" # radeonsi requires libelf when using llvm | ||
# Revisit later [@maxim-belkin, March 6, 2018] | ||
# depends_on "linuxbrew/xorg/wayland-protocols" => :recommended | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use instead
depends_on "libelf" if build.with? "llvm"
Formula/mesa.rb
Outdated
] | ||
|
||
if build.with? "llvm-support" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto
Formula/mesa.rb
Outdated
|
||
depends_on "autoconf" => :build | ||
depends_on "automake" => :build | ||
depends_on "pkg-config" => :build | ||
depends_on "python" => :build |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please change this to depends_on "python" => :build
The python
formula (python 3) is currently broken.
We can have a look later if it makes sense to build this with python3.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suspect that Michka meant python@2
here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think so too :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, sorry, python@2
:)
3c1490e
to
a5e487b
Compare
waiting for Homebrew/homebrew-core#25060 to be merged |
PR Homebrew/homebrew-core#25060 PEP 394 is merged. |
b96045a
to
165907c
Compare
Formula/libva.rb
Outdated
|
||
bottle do | ||
sha256 "202cad95248823257d1d9cedefb76fc95593ef3dd61d93721a14f000f75bd0db" => :x86_64_linux | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to remove the bottle
block.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like it has to be removed though:
==> Installing linuxbrew/xorg/mesa dependency: linuxbrew/xorg/libva
==> Downloading https://linuxbrew.bintray.com/bottles-xorg/libva-1.8.2.x86_64_linux.bottle.tar.gz
/usr/bin/curl --show-error --user-agent Linuxbrew/1.5.6-14-g42f6c7a (Linux; x86_64 Ubuntu 14.04.5 LTS) curl/7.35.0 --fail --location --remote-time --continue-at - --output /home/linuxbrew/.cache/Homebrew/libva-1.8.2.x86_64_linux.bottle.tar.gz.incomplete https://linuxbrew.bintray.com/bottles-xorg/libva-1.8.2.x86_64_linux.bottle.tar.gz
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (22) The requested URL returned error: 401 Unauthorized
Error: Failed to download resource "libva"
Download failed: https://linuxbrew.bintray.com/bottles-xorg/libva-1.8.2.x86_64_linux.bottle.tar.gz
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm. Interesting. I guess because this PR is modifying both libva
and mesa
? I wonder how this issue is handled by upstream. In any case, your workaround of deleting the bottle block is fine.
|
4a3f405
to
6e09d8e
Compare
Any ideas how to fix this PR? CircleCI says
|
6e09d8e
to
97bd273
Compare
rebased and pushed |
97bd273
to
5c48389
Compare
Formula/libva.rb
Outdated
depends_on "linuxbrew/xorg/libdrm" | ||
depends_on "linuxbrew/xorg/libx11" | ||
depends_on "linuxbrew/xorg/libxext" | ||
depends_on "linuxbrew/xorg/libxfixes" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #384
Formula/libva.rb
Outdated
--sysconfdir=#{etc} | ||
--localstatedir=#{var} | ||
--sysconfdir=#{prefix}/etc | ||
--localstatedir=#{prefix}/var |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed in #384
Formula/mesa.rb
Outdated
depends_on "linuxbrew/xorg/xextproto" => :build | ||
depends_on "linuxbrew/xorg/xf86vidmodeproto" => :build | ||
depends_on "linuxbrew/xorg/fixesproto" => :build | ||
depends_on "linuxbrew/xorg/videoproto" => :build |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-proto
dependencies are addressed in #382
5c48389
to
4febb97
Compare
Just as a reminder (to myself) this PR attempts to remove dependency of "default" |
794d954
to
0ea487a
Compare
Is LLVM a build-time or run-time dependency? |
According to the linkage information produced by |
Could you open a PR in that case to add |
brew audit --strict <formula>
(where<formula>
is the name of the formula you're submitting)?brew install <formula>
?Related to #329