Skip to content

Commit

Permalink
firebird: fix linter warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Jun 30, 2023
1 parent 7b41111 commit 3c23ecc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions recipes/firebird/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ def generate(self):
env = VirtualRunEnv(self)
env.generate(scope="build")
tc = AutotoolsToolchain(self)
tc.configure_args.append(f"--with-builtin-tommath")
tc.configure_args.append(f"--with-builtin-tomcrypt")
tc.configure_args.append("--with-builtin-tommath")
tc.configure_args.append("--with-builtin-tomcrypt")
# Reduce the amount of warnings
tc.extra_cxxflags.append("-Wno-unused-result")
tc.generate()
Expand All @@ -81,7 +81,7 @@ def _patch_sources(self):
replace_in_file(self, os.path.join(self.source_folder, "builds/posix/Makefile.in"),
f"$(MAKE) {target}", "")
replace_in_file(self, os.path.join(self.source_folder, "builds/posix/Makefile.in"),
f"$(MAKE) utilities", "$(MAKE) isql gbak gfix udfsupport")
"$(MAKE) utilities", "$(MAKE) isql gbak gfix udfsupport")

def build(self):
self._patch_sources()
Expand All @@ -94,8 +94,8 @@ def build(self):
autotools.make()

def package(self):
for license in ["IDPLicense.txt", "IPLicense.txt"]:
copy(self, license,
for license_file in ["IDPLicense.txt", "IPLicense.txt"]:
copy(self, license_file,
src=os.path.join(self.source_folder, "builds", "install", "misc"),
dst=os.path.join(self.package_folder, "licenses"))
copy(self, "LICENSE-*",
Expand All @@ -106,7 +106,7 @@ def package(self):
src=os.path.join(self.source_folder, f"gen/{self.settings.build_type}/firebird/lib"),
dst=os.path.join(self.package_folder, "lib"))
copy(self, "*",
src=os.path.join(self.source_folder, f"src/include"),
src=os.path.join(self.source_folder, "src/include"),
dst=os.path.join(self.package_folder, "include"))
fix_apple_shared_install_name(self)

Expand Down

0 comments on commit 3c23ecc

Please sign in to comment.