Skip to content

Conversation

vchuravy
Copy link
Member

@vchuravy vchuravy commented Oct 6, 2021

Reverts #42512

Broke FreeBSD https://build.julialang.org/#/builders/78/builds/3568
and apparently MacOs #41936 (comment)

Sorry about that.

@vchuravy vchuravy added embarrassing-bugfix Whoops! merge me PR is reviewed. Merge when all tests are passing labels Oct 6, 2021
Copy link
Member

@vtjnash vtjnash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libz needs to be added to LIBJULIACODEGEN_BUILD_DEPLIB now, to make freebsd happy

@vchuravy
Copy link
Member Author

vchuravy commented Oct 6, 2021

Yeah will do that when I re-land. Any ideas on what is up with Mac?

@vtjnash
Copy link
Member

vtjnash commented Oct 6, 2021

There's an extra $( in the Makefile (since v1.4) which eats a few tokens of the link line

@vtjnash vtjnash closed this Oct 6, 2021
@vtjnash
Copy link
Member

vtjnash commented Oct 6, 2021

Jeff is pushing a fix shortly

@vtjnash vtjnash deleted the revert-42512-vc/bump_llvm branch October 6, 2021 20:02
@JeffBezanson
Copy link
Member

😆 😱

@vtjnash vtjnash restored the revert-42512-vc/bump_llvm branch October 6, 2021 20:19
@vtjnash
Copy link
Member

vtjnash commented Oct 6, 2021

Oh, or perhaps not. Seems like we also might need to rebuild LLVM, since it is setting rpath incorrectly (from linux64):

$ for x in usr/lib/*.so; do echo $x; objdump -x $x | grep 'RPATH\|RUNPATH'; done

usr/lib/libamd.so
  RPATH                $ORIGIN
usr/lib/libasan.so
  RPATH                /workspace/destdir/x86_64-linux-gnu/lib/../lib64
usr/lib/libatomic.so
usr/lib/libblastrampoline.so
usr/lib/libbtf.so
  RPATH                $ORIGIN
usr/lib/libcamd.so
  RPATH                $ORIGIN
usr/lib/libccalltest.so
usr/lib/libccolamd.so
  RPATH                $ORIGIN
usr/lib/libcholmod.so
  RPATH                $ORIGIN
usr/lib/libcolamd.so
  RPATH                $ORIGIN
usr/lib/libcurl.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libdSFMT.so
usr/lib/libGCCheckerPlugin.so
usr/lib/libgfortran.so
  RPATH                /workspace/destdir/x86_64-linux-gnu/lib/../lib64
usr/lib/libgit2.so
  RPATH                $ORIGIN
usr/lib/libgmp.so
usr/lib/libgmpxx.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libgomp.so
usr/lib/libImplicitAtomics2Plugin.so
usr/lib/libImplicitAtomicsPlugin.so
usr/lib/libitm.so
usr/lib/libjulia-codegen-debug.so
  RUNPATH              $ORIGIN/julia:$ORIGIN
usr/lib/libjulia-codegen.so
  RUNPATH              $ORIGIN/julia:$ORIGIN
usr/lib/libjulia-debug.so
  RUNPATH              $ORIGIN/julia:$ORIGIN
usr/lib/libjulia-internal-debug.so
  RUNPATH              $ORIGIN/julia:$ORIGIN
usr/lib/libjulia-internal.so
  RUNPATH              $ORIGIN/julia:$ORIGIN
usr/lib/libjulia.so
  RUNPATH              $ORIGIN/julia:$ORIGIN
usr/lib/libklu.so
  RPATH                $ORIGIN
usr/lib/libldl.so
  RPATH                $ORIGIN
usr/lib/libLLVM-12.0.1jl.so
  RPATH                $ORIGIN/../lib
usr/lib/libLLVM-12jl.so
  RPATH                $ORIGIN/../lib
usr/lib/libllvmcalltest.so
usr/lib/libLLVM.so
  RPATH                $ORIGIN/../lib
usr/lib/liblsan.so
  RPATH                /workspace/destdir/x86_64-linux-gnu/lib/../lib64
usr/lib/libmbedcrypto.so
usr/lib/libmbedtls.so
  RUNPATH              $ORIGIN
usr/lib/libmbedx509.so
  RUNPATH              $ORIGIN
usr/lib/libmpfr.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libnghttp2.so
usr/lib/libobjc.so
usr/lib/libopenblas64_.0.3.17.so
  RPATH                $ORIGIN
usr/lib/libopenblas64_.so
  RPATH                $ORIGIN
usr/lib/libopenlibm.so
usr/lib/libpcre2-16.so
usr/lib/libpcre2-32.so
usr/lib/libpcre2-8.so
usr/lib/libpcre2-posix.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libquadmath.so
usr/lib/librbio.so
  RPATH                $ORIGIN
usr/lib/libspqr.so
  RPATH                $ORIGIN
usr/lib/libssh2.so
  RUNPATH              $ORIGIN
usr/lib/libssp.so
usr/lib/libstdc++.so
usr/lib/libsuitesparseconfig.so
  RPATH                $ORIGIN
usr/lib/libtsan.so
  RPATH                /workspace/destdir/x86_64-linux-gnu/lib/../lib64
usr/lib/libubsan.so
  RPATH                /workspace/destdir/x86_64-linux-gnu/lib/../lib64
usr/lib/libumfpack.so
  RPATH                $ORIGIN
usr/lib/libunwind-coredump.so
usr/lib/libunwind-generic.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libunwind-ptrace.so
usr/lib/libunwind-setjmp.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libunwind.so
usr/lib/libunwind-x86_64.so
  RUNPATH              /workspace/destdir/lib:$ORIGIN
usr/lib/libuv.so
usr/lib/libz.so

And we've also got /workspace/destdir leaking into a few others, though that is less critical.

Additionally, looks like we now have DLLVM_ENABLE_ZLIB=ON in Yggdrasil, so that may need to be set explicitly in our deps/llvm.mk now too.

@vtjnash vtjnash removed the merge me PR is reviewed. Merge when all tests are passing label Oct 6, 2021
@vchuravy
Copy link
Member Author

vchuravy commented Oct 6, 2021

Additionally, looks like we now have -DLLVM_ENABLE_ZLIB=ON in Yggdrasil, so that may need to be set explicitly in our deps/llvm.mk now too.

Yeah I started on that, but then I got stumped on adding a dependency edge to install-zlib

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants