From 567434561fc8e36f187b67eee000997576ff7335 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Fri, 17 Dec 2021 14:39:10 +0100 Subject: [PATCH] remove -Wl,-rpath from PkgConfigDeps generator --- .../gnu/pkgconfigdeps/pc_files_templates.py | 6 --- .../toolchains/gnu/test_pkgconfigdeps.py | 45 +------------------ 2 files changed, 2 insertions(+), 49 deletions(-) diff --git a/conan/tools/gnu/pkgconfigdeps/pc_files_templates.py b/conan/tools/gnu/pkgconfigdeps/pc_files_templates.py index e0dbe84babe..6fce53364f4 100644 --- a/conan/tools/gnu/pkgconfigdeps/pc_files_templates.py +++ b/conan/tools/gnu/pkgconfigdeps/pc_files_templates.py @@ -18,12 +18,6 @@ def _get_pc_file_template(): {%- for shared_flag in (cpp_info.sharedlinkflags + cpp_info.exelinkflags) -%} {{ shared_flag + " " }} {%- endfor -%} - {%- for _ in libdirs -%} - {%- set flag = gnudeps_flags._rpath_flags(["${libdir%s}" % loop.index]) -%} - {%- if flag|length -%} - {{ flag[0] + " " }} - {%- endif -%} - {%- endfor -%} {%- for framework in (gnudeps_flags.frameworks + gnudeps_flags.framework_paths) -%} {{ framework + " " }} {%- endfor -%} diff --git a/conans/test/functional/toolchains/gnu/test_pkgconfigdeps.py b/conans/test/functional/toolchains/gnu/test_pkgconfigdeps.py index 10f48420339..0cc77f62311 100644 --- a/conans/test/functional/toolchains/gnu/test_pkgconfigdeps.py +++ b/conans/test/functional/toolchains/gnu/test_pkgconfigdeps.py @@ -1,5 +1,4 @@ import os -import platform import textwrap from conans.test.assets.genconanfile import GenConanfile @@ -44,9 +43,6 @@ def package_info(self): pc_path = os.path.join(client.current_folder, "MyLib.pc") assert os.path.exists(pc_path) is True pc_content = load(pc_path) - expected_rpaths = "" - if platform.system() in ("Linux", "Darwin"): - expected_rpaths = ' -Wl,-rpath,"${libdir1}" -Wl,-rpath,"${libdir2}"' expected_content = textwrap.dedent("""\ libdir1=/my_absoulte_path/fake/mylib/lib libdir2=${prefix}/lib2 @@ -55,8 +51,8 @@ def package_info(self): Name: MyLib Description: Conan package: MyLib Version: 0.1 - Libs: -L"${libdir1}" -L"${libdir2}"%s - Cflags: -I"${includedir1}\"""" % expected_rpaths) + Libs: -L"${libdir1}" -L"${libdir2}" + Cflags: -I"${includedir1}\"""") # Avoiding trailing whitespaces in Jinja template for line in pc_content.splitlines()[1:]: @@ -110,43 +106,6 @@ def package_info(self): assert "\n".join(pc_content.splitlines()[1:]) == expected -def test_pkg_config_rpaths(): - # rpath flags are only generated for gcc and clang - profile = textwrap.dedent("""\ - [settings] - os=Linux - compiler=gcc - compiler.version=7 - compiler.libcxx=libstdc++ - """) - conanfile = textwrap.dedent(""" - from conans import ConanFile - - class PkgConfigConan(ConanFile): - name = "MyLib" - version = "0.1" - settings = "os", "compiler" - exports = "mylib.so" - - def package(self): - self.copy("mylib.so", dst="lib") - - def package_info(self): - self.cpp_info.libs = ["mylib"] - """) - client = TestClient() - client.save({"conanfile.py": conanfile, - "linux_gcc": profile, - "mylib.so": "fake lib content"}) - client.run("create . -pr=linux_gcc") - client.run("install MyLib/0.1@ -g PkgConfigDeps -pr=linux_gcc") - - pc_path = os.path.join(client.current_folder, "MyLib.pc") - assert os.path.exists(pc_path) is True - pc_content = load(pc_path) - assert '-Wl,-rpath,"${libdir1}"' in pc_content - - def test_system_libs(): conanfile = textwrap.dedent(""" from conans import ConanFile