Closed izahn closed 3 years ago
Hi! This is the friendly automated conda-forge-linting service.
I wanted to let you know that I linted all conda-recipes in your PR (recipe
) and found some lint.
Here's what I've got...
For recipe:
<two spaces>#<one space>[<expression>]
form. See lines [13, 14, 15, 16, 17]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.
I think this can be merged @asmeurer @msarahan @notestaff , basically I just dropped patches that were already applied or fixed upstream.
I think the Apple silicon stuff has to be tested manually. CC @erykoff
Thanks for the ping. I tested this and sadly it fails. The problem is that the upstream patch checks for arm-apple-darwin
but should check for arm64-apple-darwin
. This replacement for 0002-apple-silicon-resign-binary.patch
does work, I hope you can put it in on your fork:
--- src/Makefile.in.orig 2021-05-05 14:21:56.000000000 -0700
+++ src/Makefile.in 2021-05-05 14:21:59.000000000 -0700
@@ -339,7 +339,7 @@
## ARM Macs require that all code have a valid signature. Since pump
## invalidates the signature, we must re-sign to fix it.
-DO_CODESIGN=$(patsubst arm-apple-darwin%,yes,@configuration@)
+DO_CODESIGN=$(patsubst arm64-apple-darwin%,yes,@configuration@)
# 'make' verbosity.
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
Thanks @asmeurer and I replaced 0002-apple-silicon-resign-binary.patch
with the new one from @erykoff and and all the tests pass. @erykoff do you need to test this again?
Looks good to me.
Checklist
0
(if the version changed)conda-smithy
(Use the phrase code>@<space/conda-forge-admin, please rerender in a comment in this PR for automated rerendering)Closes https://github.com/conda-forge/emacs-feedstock/pull/51