Skip to content
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

Partially revert #42919 #42969

Merged
merged 2 commits into from
Nov 6, 2021
Merged

Partially revert #42919 #42969

merged 2 commits into from
Nov 6, 2021

Conversation

ararslan
Copy link
Member

@ararslan ararslan commented Nov 6, 2021

The change to RPATH setting for macOS seems to have improved the situation for users on Monterey, but the other changes in #42919 that affect other platforms seem to have caused regressions on musl Linux (#42940) and FreeBSD (#42944). The easiest thing to do here is to keep the changes from #42919 as they apply to macOS but revert the others.

Fixes #42940
Fixes #42944

The change to RPATH setting for macOS seems to have improved the
situation for users on Monterey, but the other changes in #42919 that
affect other platforms seem to have caused regressions on musl Linux
(#42940) and FreeBSD (#42944). The easiest thing to do here is to keep
the changes from #42919 as they apply to macOS but revert the others.
@ararslan ararslan added building Build system, or building Julia or its dependencies bugfix This change fixes an existing bug labels Nov 6, 2021
Make.inc Show resolved Hide resolved
Make.inc Outdated Show resolved Hide resolved
@DilumAluthge
Copy link
Member

DilumAluthge commented Nov 6, 2021

If you look at the logs, in its current state (86c2d80) this PR fixes both musl64 and freebsd64.

@DilumAluthge
Copy link
Member

In its current state (023d4ca) this PR fixes both musl64 and freebsd64.

@ararslan
Copy link
Member Author

ararslan commented Nov 6, 2021

Just a note in case anyone is wondering whether this will impact the fixes for macOS Monterey: The full conditional is

julia/Make.inc

Lines 1189 to 1205 in 023d4ca

# shared library runtime paths
ifneq (,$(filter $(OS),WINNT emscripten))
RPATH :=
RPATH_ORIGIN :=
RPATH_ESCAPED_ORIGIN :=
RPATH_LIB :=
else ifeq ($(OS), Darwin)
RPATH := -Wl,-rpath,'@executable_path/$(build_libdir_rel)'
RPATH_ORIGIN := -Wl,-rpath,'@loader_path/'
RPATH_ESCAPED_ORIGIN := $(RPATH_ORIGIN)
RPATH_LIB := -Wl,-rpath,'@loader_path/'
else
RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin
RPATH_ORIGIN := -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
RPATH_ESCAPED_ORIGIN := -Wl,-rpath,'\$$\$$ORIGIN' -Wl,-z,origin -Wl,-rpath-link,$(build_shlibdir)
RPATH_LIB := -Wl,-rpath,'$$ORIGIN/' -Wl,-z,origin
endif
. Note though that the changes in this PR only touch that final else block,

julia/Make.inc

Lines 1200 to 1205 in 023d4ca

else
RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin
RPATH_ORIGIN := -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
RPATH_ESCAPED_ORIGIN := -Wl,-rpath,'\$$\$$ORIGIN' -Wl,-z,origin -Wl,-rpath-link,$(build_shlibdir)
RPATH_LIB := -Wl,-rpath,'$$ORIGIN/' -Wl,-z,origin
endif
. That means it actually can't affect macOS. (Also IIUC the syntax for those flags is wrong for macOS, so they wouldn't work even if Mac snuck through to that condition somehow.)

@staticfloat staticfloat merged commit 653cad3 into master Nov 6, 2021
@staticfloat staticfloat deleted the aa/partially-revert-42919 branch November 6, 2021 20:25
KristofferC pushed a commit that referenced this pull request Nov 7, 2021
* Partially revert #42919

The change to RPATH setting for macOS seems to have improved the
situation for users on Monterey, but the other changes in #42919 that
affect other platforms seem to have caused regressions on musl Linux
(#42940) and FreeBSD (#42944). The easiest thing to do here is to keep
the changes from #42919 as they apply to macOS but revert the others.

* Un-revert the `RPATH_LIB` definition

(cherry picked from commit 653cad3)
LilithHafner pushed a commit to LilithHafner/julia that referenced this pull request Feb 22, 2022
* Partially revert JuliaLang#42919

The change to RPATH setting for macOS seems to have improved the
situation for users on Monterey, but the other changes in JuliaLang#42919 that
affect other platforms seem to have caused regressions on musl Linux
(JuliaLang#42940) and FreeBSD (JuliaLang#42944). The easiest thing to do here is to keep
the changes from JuliaLang#42919 as they apply to macOS but revert the others.

* Un-revert the `RPATH_LIB` definition
LilithHafner pushed a commit to LilithHafner/julia that referenced this pull request Mar 8, 2022
* Partially revert JuliaLang#42919

The change to RPATH setting for macOS seems to have improved the
situation for users on Monterey, but the other changes in JuliaLang#42919 that
affect other platforms seem to have caused regressions on musl Linux
(JuliaLang#42940) and FreeBSD (JuliaLang#42944). The easiest thing to do here is to keep
the changes from JuliaLang#42919 as they apply to macOS but revert the others.

* Un-revert the `RPATH_LIB` definition
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix This change fixes an existing bug building Build system, or building Julia or its dependencies
Projects
None yet
4 participants