Skip to content

(#14217) qwt: Fix unresolvable conflict #14245

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

Closed

Conversation

EstebanDugueperoux2
Copy link
Contributor

A second PR to take into account @SpaceIm remark

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline

Failure in build 2 (d1ba590e66277042557ed095a95511289633b9a4):

  • qwt/6.2.0@:
    command 'git merge --no-ff 175934c' failed with exit code 1:
    Auto-merging recipes/qwt/all/conanfile.py
    CONFLICT (content): Merge conflict in recipes/qwt/all/conanfile.py
    Automatic merge failed; fix conflicts and then commit the result.

Note: To save resources, CI tries to finish as soon as an error is found. For this reason you might find that not all the references have been launched or not all the configurations for a given reference. Also, take into account that we cannot guarantee the order of execution as it depends on CI workload and workers availability.

@@ -65,7 +60,9 @@ def requirements(self):
def build_requirements(self):
if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
if is_msvc(self):

and add from conan.tools.microsoft import is_msvc

@@ -65,7 +60,9 @@ def requirements(self):
def build_requirements(self):
if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
self.build_requires("jom/1.1.3")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
self.build_requires("jom/1.1.3")
self.tool_requires("jom/1.1.3")

@@ -65,7 +60,9 @@ def requirements(self):
def build_requirements(self):
Copy link
Contributor

Choose a reason for hiding this comment

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

could you move build_requirements after validate() please?

Also:

  • move config_options & configure before requirements
  • use rm_safe to delete fPIC in configure and bump required_conan_version to 1.53.0
  • use export_conandata_patches in export_sources
  • extract apply_conandata_patches and call it at the beginning of build()

@ghost
Copy link

ghost commented Nov 17, 2022

I detected other pull requests that are modifying qwt/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prsso don't hesitate to report issues/improvements there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants