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

[libffi] Don't replace string in file that doesn't exist. #20554

Merged
merged 4 commits into from
Oct 7, 2021

Conversation

larshg
Copy link
Contributor

@larshg larshg commented Oct 6, 2021

Describe the pull request

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libffi but no changes to version or port version.
-- Version: 3.4.2#1
-- Old SHA: f9f43cad9f7bd65719c32b242d330492ad326456
-- New SHA: 5686da25259f97bc3938649bf9e016778fb6b2a2
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/libffi/portfile.cmake

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libffi but no changes to version or port version.
-- Version: 3.4.2#1
-- Old SHA: f9f43cad9f7bd65719c32b242d330492ad326456
-- New SHA: 5686da25259f97bc3938649bf9e016778fb6b2a2
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/libffi/portfile.cmake

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ff5afbab34834eaf1aebba808c47fea4fd606276 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 3aa7be4..61d777b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3354,7 +3354,7 @@
     },
     "libffi": {
       "baseline": "3.4.2",
-      "port-version": 1
+      "port-version": 2
     },
     "libfido2": {
       "baseline": "1.7.0",
diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json
index 52f85d9..100d9fa 100644
--- a/versions/l-/libffi.json
+++ b/versions/l-/libffi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34f5c50a198c6ee30d5280fbbd5196526c2157ce",
+      "version": "3.4.2",
+      "port-version": 2
+    },
     {
       "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456",
       "version": "3.4.2",

ports/libffi/portfile.cmake Outdated Show resolved Hide resolved
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ff5afbab34834eaf1aebba808c47fea4fd606276 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json
index 100d9fa..5454fe1 100644
--- a/versions/l-/libffi.json
+++ b/versions/l-/libffi.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "34f5c50a198c6ee30d5280fbbd5196526c2157ce",
+      "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e",
       "version": "3.4.2",
       "port-version": 2
     },

@ras0219-msft ras0219-msft merged commit 92770f6 into microsoft:master Oct 7, 2021
@ras0219-msft
Copy link
Contributor

LGTM, thanks for the improvement!

yurybura pushed a commit to yurybura/vcpkg that referenced this pull request Oct 7, 2021
…20554)

* Don't replace string in file that doesn't exist.

* Update per bot.

* Update per bot again.

* Address comments.
@larshg larshg deleted the Fixlibffi branch October 8, 2021 12:12
BillyONeal added a commit that referenced this pull request Oct 12, 2021
* [scripts/boost] fix issue #20417
[boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters

* add versions

* [scripts/boost] update port version after #20421

* [boost-odeint] move boost-mpi dependency to the feature

* add version

* [boost-modular-build-helper] rework user-config generation

* [boost-python] move python3 from explicit dependency to default feature

* [boost-modular-build-helper] update version

* add verions

* [boost-modular-build-helper] fix empty flags

* update version

* Fix compilation on Emscripten / WebAssembly (#20551)

* [opencv4,opencv3] Control exported protobuf dependency (#20550)

* Control exported protobuf dependency

* Update versions

* Control exported protobuf dependency

* Update versions

* [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422)

* [OpenMVS] restore deprecated cmake scripts

* [OpenMVS] fix references

* switch back to vcpkg_cmake_*

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* [libffi] Don't replace string in file that doesn't exist. (#20554)

* Don't replace string in file that doesn't exist.

* Update per bot.

* Update per bot again.

* Address comments.

* [json-dto] Update to 0.2.14 (#20570)

* json-dto updated to v.0.2.14.

* json-dto-0.2.14 added to baseline.

* Change deprecated commands.

* Update baseline for fresh json-dto-0.2.14.

* [sail] Update to 0.9.0-pre17 (#20562)

* [sail] Update to 0.9.0-pre17

* [sail] vcpkg x-add-version --all --overwrite-version

* [sail] Update pre17 hash

* [sail] vcpkg x-add-version --all --overwrite-version

* [freexl] Update to 1.0.6 (#20520)

* Reformat portfile

* Minimize makefiles patch

* Update to 1.0.6

* Fix uwp builds, remove skip from baseline

* Install pc file for windows

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [dartsim] Update to 6.11.0 (#20566)

* Update dartsim

* Use newer vcpkg functions

* Update version number

* Update ports/dartsim/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update versions

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes

* update version

* [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files

* update version

* Resolve differences from rerunning generate-ports.ps1.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Tobias Markus <tobbi.bugs@googlemail.com>
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Lars Glud <larshg@gmail.com>
Co-authored-by: eao197 <eao197@users.noreply.github.com>
Co-authored-by: Dmitry Baryshev <dmitrymq@gmail.com>
Co-authored-by: Akash <Ace314159@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Win64 docker image fails to build on Azure
3 participants