-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
nss: conan v2 support #19262
Open
valgur
wants to merge
52
commits into
conan-io:master
Choose a base branch
from
valgur:nss-conan-v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+378
−253
Open
nss: conan v2 support #19262
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
3f7cbc6
conan v2 support
SpaceIm 49da227
nss: minor fixes for v2 support
SpaceIm 91efa25
nss: further minor fixes
valgur abdf9c9
nss: bump deps
valgur df0db13
nss: tidy
valgur f9e98c9
nss: disable MSVC
valgur 5f3ef9d
nss: bump sqlite3
valgur 01776f9
nss: drop cross_building(self) check from sqlite3
valgur 9528a93
nss: set package_type to static-library, do not set shared for deps
valgur 3675da7
nss: bump sqlite3
valgur d654257
nss: drop old versions
valgur 7df3418
nss: add v3.99
valgur 9b5c543
nss: set shared=True for deps where necessary
valgur cd4cbf5
nss: allow MSVC builds
valgur b0ff870
nss: use a generator for make args
valgur 770600e
nss: switch to gyp-based build, rework components
valgur cd96096
nss: inject dependencies
valgur 26f1c9c
nss: downgrade sqlite3 for cpython
valgur 424b704
nss: adjust LD_LIBRARY_PATH for build
valgur b0506a1
nss: do not hide shlibsign errors
valgur 55ce5e9
nss: keep only the latest version, bump deps
valgur 64c86d0
nss: pin gyp-next
valgur 10113a1
Merge remote-tracking branch 'refs/remotes/upstream/master' into nss-…
valgur 16a0981
nss: downgrade sqlite3
valgur c99dfbc
Merge remote-tracking branch 'upstream/master' into nss-conan-v2
valgur 32bd3c5
nss: bump to v3.103
valgur b7c20e4
nss: bump tool deps
valgur db7e679
nss: tweak pip install
valgur a074668
nss: make sure shlibsign's .so dependencies are found via VirtualRunEnv
valgur 34f65d7
Merge remote-tracking branch 'upstream/master' into nss-conan-v2
valgur 0ac5895
nss: bump to v3.104
valgur 36b7733
nss: fix Python paths on MSYS2
valgur 9320139
nss: fix MSVC build
valgur 527aca5
nss: skip vswhere for now, bump cpython
valgur 9a906e4
nss: add a fix for shlibsign.py
valgur b102d4e
nss: use vswhere from system
valgur 779c901
nss: revert cpython changes
valgur 04f4287
nss: add cross-compilation support
valgur c95c042
Use a version range for sqlite3 to match qt/6.x recipe
valgur f91b63f
nss: drop test_v1_package
valgur 4d211a1
Merge remote-tracking branch 'upstream/master' into nss-conan-v2
valgur 25e930f
nss: clean up test_package
valgur 8567db8
nss: bump to 3.107, avoid vswhere
valgur 155665e
nss: use host_version for sqlite tool_requires
valgur f6cf763
nss: add v3.93 used in other recipes
valgur fbf7c23
nss: make sqlite3 a tool_requires, improve cross-compilation
valgur 5cedd92
Merge remote-tracking branch 'upstream/master' into nss-conan-v2
valgur 2b0b57b
nss: can use static sqlite3
valgur 766eddf
nss: fix self.options.shared use
valgur 6779049
nss: fix Windows build, ensure vendored sources are not used
valgur c5b7e10
nss: restructure package_info()
valgur 735df49
nss: improve static build support
valgur File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,16 @@ | ||
| sources: | ||
| "3.107": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_107_RTM/src/nss-3.107.tar.gz" | ||
| sha256: "7f7e96473e38150771a615f5d40e8c41ba3a19385301ae0c525091f2fc9d6729" | ||
| "3.93": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_93_RTM/src/nss-3.93.tar.gz" | ||
| sha256: "15f54bb72048eb105f8c0e936a04b899e74c3db9a19bbc1e00acee2af9476a8a" | ||
| "3.92": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_92_RTM/src/nss-3.92.tar.gz" | ||
| sha256: "3db192d6e882039af02ae7eaf3217ed114bb7ad83414c646772ab8021e24a254" | ||
| "3.91": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_91_RTM/src/nss-3.91.tar.gz" | ||
| sha256: "84bd46376df17118c55f6d73d30fd93a0af21296c66e7690471547e5898fc4b3" | ||
| "3.89": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/nss-3.89.tar.gz" | ||
| sha256: "55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5" | ||
| "3.88.1": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/nss-3.88.1.tar.gz" | ||
| sha256: "27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496" | ||
| "3.87": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/nss-3.87.tar.gz" | ||
| sha256: "68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d" | ||
| "3.86": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/nss-3.86.tar.gz" | ||
| sha256: "3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975" | ||
| "3.85": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_85_RTM/src/nss-3.85.tar.gz" | ||
| sha256: "afd9d64510b1154debbd6cab3571e9ff64a3373898e03483e4c85cdada13d297" | ||
| "3.84": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_84_RTM/src/nss-3.84.tar.gz" | ||
| sha256: "9a387ffe350ff14f001d943f96cc0c064891551d71e1a97a5ddbffe7f1207a25" | ||
| "3.83": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_83_RTM/src/nss-3.83.tar.gz" | ||
| sha256: "ab23ea67f964090b8b73c80a674082571c36e5f4eba92057ac648c9c1def0128" | ||
| "3.77": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_77_RTM/src/nss-3.77.tar.gz" | ||
| sha256: "825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd" | ||
| "3.76.1": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_1_RTM/src/nss-3.76.1.tar.gz" | ||
| sha256: "e13104c374e2e1d7890d8f6bc18d0f18eb886ed4dbad4144d1c482f2983d232a" | ||
| "3.72": | ||
| url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_72_RTM/src/nss-3.72.tar.gz" | ||
| sha256: "6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e" | ||
| patches: | ||
| "3.107": | ||
| - patch_file: "patches/3.107-avoid-vswhere.patch" | ||
| patch_description: "Use VCVars env vars instead of vswhere" | ||
| patch_type: "conan" | ||
| "3.93": | ||
| - patch_file: "patches/3.107-avoid-vswhere.patch" | ||
| patch_description: "Use VCVars env vars instead of vswhere" | ||
| patch_type: "conan" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you removing all these versions ?
We are migrating from debian based builds which currently brings 3.87.1 (so that version would even be missing for us) to conan based builds and in order to minimize risk, we try as much as we can to use the same lib version.
Was there any problem with this or it was solely to minimize the number of patches to make for all those versions ?