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

Fix libblastrampoline full source build to install into the right location #45746

Merged
merged 3 commits into from
Jun 19, 2022

Conversation

ViralBShah
Copy link
Member

@ViralBShah ViralBShah commented Jun 19, 2022

As suggested by @inkydragon below, fix the LBT source build.

CHOLMOD full source build was unable to find the BLAS, but should be fixed with this PR.

@ViralBShah ViralBShah force-pushed the vs/full-source-dist branch from f12cd2f to 6089df9 Compare June 19, 2022 13:06
@ViralBShah ViralBShah added the building Build system, or building Julia or its dependencies label Jun 19, 2022
@ViralBShah
Copy link
Member Author

cc @inkydragon

@inkydragon
Copy link
Member

inkydragon commented Jun 19, 2022

I guess we already has:

$(eval $(call staged-install, \
blastrampoline,$(BLASTRAMPOLINE_SRC_DIR), \
BLASTRAMPOLINE_INSTALL,, \
$$(BLASTRAMPOLINE_OBJ_TARGET), \
$$(INSTALL_NAME_CMD)libblastrampoline.$$(SHLIB_EXT) $$(build_shlibdir)/libblastrampoline.$$(SHLIB_EXT)))

Maybe we need to update the version?
After merged this pr: JuliaLinearAlgebra/libblastrampoline#76

AND apply this patch:

$(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src $(MAKE_COMMON) install

-	$(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src $(MAKE_COMMON) install 
+	$(MAKE) -C $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/src install $(MAKE_COMMON) DESTDIR="$2"

@DilumAluthge DilumAluthge requested a review from staticfloat June 19, 2022 13:22
@ViralBShah
Copy link
Member Author

I see that INSTALL_NAME_CMD is in there, but I wonder why adding this helped. I agree we should hold off on this until LBT is bumped and the other PR gets merged. Hopefully it won't be necessary.

@ViralBShah ViralBShah marked this pull request as draft June 19, 2022 13:33
@inkydragon
Copy link
Member

but I wonder why adding this helped.

Without DESTDIR="$2", make install install lib to wrong place, then staged-install got an empty dir, so it failed to install the lib.

If you check usr-staging/blastrampoline-d32042273719672c6669f6442a0be5605d434b70.tar.
It is a tar that contain an empty . dir.

@ViralBShah
Copy link
Member Author

Should DESTDIR be $(build_shlibdir) or $(build_libdir)?

Use DESTDIR to install into
@ViralBShah ViralBShah changed the title Run $(INSTALL_NAME_CMD) on libblastrampoline in full source build Fix libblastrampoline full source build to install into the right location Jun 19, 2022
@ViralBShah ViralBShah added the backport 1.8 Change should be backported to release-1.8 label Jun 19, 2022
@ViralBShah ViralBShah marked this pull request as ready for review June 19, 2022 18:18
@ViralBShah
Copy link
Member Author

@inkydragon This also fixes the staged full source build, which was not working earlier.

@ViralBShah
Copy link
Member Author

While we should certainly turn off the mbedtls testing in the full source build, it would anyways be a good idea for python3 to be available on the buildbots. @DilumAluthge Thoughts?

@ViralBShah ViralBShah merged commit 1d78265 into master Jun 19, 2022
@ViralBShah ViralBShah deleted the vs/full-source-dist branch June 19, 2022 21:24
inkydragon added a commit to inkydragon/julia that referenced this pull request Jun 20, 2022
KristofferC pushed a commit that referenced this pull request Jul 4, 2022
…ation (#45746)

* Bump LBT to 5.1.1
* Use DESTDIR to install into
* Update LBT checksums

(cherry picked from commit 1d78265)
KristofferC pushed a commit that referenced this pull request Jul 4, 2022
…ation (#45746)

* Bump LBT to 5.1.1
* Use DESTDIR to install into
* Update LBT checksums

(cherry picked from commit 1d78265)
@KristofferC KristofferC mentioned this pull request Jul 5, 2022
36 tasks
@KristofferC KristofferC removed the backport 1.8 Change should be backported to release-1.8 label Jul 6, 2022
pcjentsch pushed a commit to pcjentsch/julia that referenced this pull request Aug 18, 2022
…ation (JuliaLang#45746)

* Bump LBT to 5.1.1
* Use DESTDIR to install into
* Update LBT checksums
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
building Build system, or building Julia or its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants