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.

Sign up for GitHub

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

Jump to bottom

libpq: Avoid broken symlinks in include/catalog #25355

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −13
Open

libpq: Avoid broken symlinks in include/catalog #25355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions recipes/libpq/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,20 +183,20 @@ def build(self):
self.run("perl build.pl libpgport")
else:
autotools = Autotools(self)
with chdir(self, os.path.join(self.source_folder)):
with chdir(self, os.path.join(self.build_folder)):
autotools.configure()
with chdir(self, os.path.join(self.source_folder, "src", "backend")):
with chdir(self, os.path.join(self.build_folder, "src", "backend")):
autotools.make(target="generated-headers")
with chdir(self, os.path.join(self.source_folder, "src", "common")):
with chdir(self, os.path.join(self.build_folder, "src", "common")):
autotools.make()
with chdir(self, os.path.join(self.source_folder, "src", "include")):
with chdir(self, os.path.join(self.build_folder, "src", "include")):
autotools.make()
with chdir(self, os.path.join(self.source_folder, "src", "interfaces", "libpq")):
with chdir(self, os.path.join(self.build_folder, "src", "interfaces", "libpq")):
autotools.make()
if Version(self.version) >= 12:
with chdir(self, os.path.join(self.source_folder, "src", "port")):
with chdir(self, os.path.join(self.build_folder, "src", "port")):
autotools.make()
with chdir(self, os.path.join(self.source_folder, "src", "bin", "pg_config")):
with chdir(self, os.path.join(self.build_folder, "src", "bin", "pg_config")):
autotools.make()

def _remove_unused_libraries_from_package(self):
Expand Down Expand Up @@ -233,16 +233,16 @@ def package(self):
copy(self, pattern="*.lib", dst=os.path.join(self.package_folder, "lib"), src=self.source_folder, keep_path=False)
else:
autotools = Autotools(self)
with chdir(self, os.path.join(self.source_folder, "src", "common")):
with chdir(self, os.path.join(self.build_folder, "src", "common")):
autotools.install()
with chdir(self, os.path.join(self.source_folder, "src", "include")):
with chdir(self, os.path.join(self.build_folder, "src", "include")):
autotools.install()
with chdir(self, os.path.join(self.source_folder, "src", "interfaces", "libpq")):
with chdir(self, os.path.join(self.build_folder, "src", "interfaces", "libpq")):
autotools.install()
if Version(self.version) >= 12:
with chdir(self, os.path.join(self.source_folder, "src", "port")):
with chdir(self, os.path.join(self.build_folder, "src", "port")):
autotools.install()
with chdir(self, os.path.join(self.source_folder, "src", "bin", "pg_config")):
with chdir(self, os.path.join(self.build_folder, "src", "bin", "pg_config")):
autotools.install()
copy(self, "*.h", src=os.path.join(self.source_folder, "src", "include", "catalog"),
dst=os.path.join(self.package_folder, "include", "catalog"))
Expand All @@ -251,7 +251,7 @@ def package(self):
rmdir(self, os.path.join(self.package_folder, "include", "postgresql", "server"))
self._remove_unused_libraries_from_package()
fix_apple_shared_install_name(self)
copy(self, "*.h", src=os.path.join(self.build_folder, "src", "backend", "catalog"),
copy(self, "*.h", src=os.path.join(self.source_folder, "src", "backend", "catalog"),
dst=os.path.join(self.package_folder, "include", "catalog"))

def package_info(self):
Expand Down
Loading