Skip to content

nodejs 15.6.0#174

Merged
xhochy merged 14 commits intoconda-forge:masterfrom
xhochy:15.6.0
Feb 23, 2021
Merged

nodejs 15.6.0#174
xhochy merged 14 commits intoconda-forge:masterfrom
xhochy:15.6.0

Conversation

@xhochy
Copy link
Member

@xhochy xhochy commented Jan 29, 2021

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

@conda-forge-linter
Copy link

conda-forge-linter commented Jan 29, 2021

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@isuruf
Copy link
Member

isuruf commented Feb 3, 2021

@conda-forge-admin, rerender

@github-actions
Copy link
Contributor

github-actions bot commented Feb 3, 2021

Hi! This is the friendly automated conda-forge-webservice.
I tried to rerender for you, but it looks like there was nothing to do.

minrk added 3 commits February 19, 2021 12:18
@minrk
remove deprecated --without-snapshot arg
55719fe
@minrk
workaround duplicate target error in ninja
364750a 
v8 is built twice when cross-compiling, but with the same target destination

but the destination is the same for both builds, causing a conflict

Patch puts shared intermediates in the per-toolchain subdirectories, resolving the conflict
@minrk
restore ppc64 parallelism branch
54b5479 
might be relevant to recent change in timeout
@minrk minrk mentioned this pull request Feb 19, 2021
Open
@minrk
Copy link
Member

minrk commented Feb 19, 2021

Got past the ninja conflict with a patch, but now failing with:

Details 
135/2302] LIBTOOL-STATIC obj.host/tools/v8_gypfiles/libtorque_base.a, POSTBUILDS
[136/2302] STAMP obj.host/tools/v8_gypfiles/torque.actions_depends.stamp
[137/2302] CXX obj.host/deps/v8/src/builtins/bytecode_builtins_list_generator.generate-bytecodes-builtins-list.o
[138/2302] CXX obj.host/deps/v8/src/interpreter/bytecode_builtins_list_generator.bytecodes.o
[139/2302] CXX obj.host/deps/v8/src/torque/torque.torque.o
[140/2302] LINK torque, POSTBUILDS
FAILED: torque 
$BUILD_PREFIX/bin/x86_64-apple-darwin13.4.0-clang++ -Wl,-pie -Wl,-headerpad_max_install_names -Wl,-dead_strip_dylibs -Wl,-rpath,$PREFIX/lib -L$PREFIX/lib -Wl,-search_paths_first -mmacosx-version-min=10.13 -L./ -stdlib=libc++ -o torque obj.host/deps/v8/src/torque/torque.torque.o obj.host/tools/v8_gypfiles/libtorque_base.a obj.host/tools/v8_gypfiles/libv8_libbase.a  -L$PREFIX/lib -lz -luv -lcrypto -lssl -licui18n -licuuc -licudata
ld: warning: ignoring file $PREFIX/lib/libz.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libuv.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libcrypto.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libssl.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libicui18n.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libicuuc.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libc++.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64
ld: warning: ignoring file $PREFIX/lib/libicudata.dylib, building for macOS-x86_64 but attempting to link with file built for macOS-arm64

The issue being that torque apparently needs to be built for both the host and target, which complicates things as dependencies must be linked from both the host and build prefixes.

@minrk
Copy link
Member

minrk commented Feb 19, 2021

btw, I think it's okay to merge these to clear the backlog of releases and finish fixing arm in a later PR. Is that okay?

@isuruf
Copy link
Member

isuruf commented Feb 19, 2021

You might need to patch in https://github.com/nodejs/node/pull/37444/files

@minrk
link dependencies for host
520fb05 
- upstream patch for LDFLAGS_host
- add library dependencies to build env as well,
  since they are needed for both the host and target arch
@xhochy xhochy marked this pull request as ready for review February 22, 2021 19:05
xhochy
xhochy commented Feb 22, 2021
View reviewed changes
@xhochy
Copy link
Member Author

xhochy commented Feb 22, 2021

@minrk @isuruf Thanks! This is passing now :) I did a small style fix regarding cross-compiling but from my side, I think we are ready for a merge. Any objections?

isuruf
isuruf reviewed Feb 22, 2021
View reviewed changes
xhochy
xhochy commented Feb 22, 2021
View reviewed changes
minrk
minrk approved these changes Feb 22, 2021
View reviewed changes
Copy link
Member

@minrk minrk left a comment

Choose a reason for hiding this comment

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

Yay! Team effort. LGTM.

@xhochy xhochy merged commit 8403eea into conda-forge:master Feb 23, 2021
@xhochy xhochy deleted the 15.6.0 branch February 23, 2021 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@isuruf isuruf isuruf left review comments

@minrk minrk minrk approved these changes

@blink1073 blink1073 Awaiting requested review from blink1073

@msarahan msarahan Awaiting requested review from msarahan

@pelson pelson Awaiting requested review from pelson

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@xhochy @conda-forge-linter @isuruf @minrk