From 2ca10531d8472e68f5abfc94913a9a8d6d38f00e Mon Sep 17 00:00:00 2001 From: zhongtao Date: Sat, 26 Oct 2024 15:56:11 +0800 Subject: [PATCH] recover add fPIC compile option pr Signed-off-by: zhongtao --- 0017-add-fPIC-compile-option.patch | 25 +++++++++++++++++++++++++ lxc.spec | 1 + 2 files changed, 26 insertions(+) create mode 100644 0017-add-fPIC-compile-option.patch diff --git a/0017-add-fPIC-compile-option.patch b/0017-add-fPIC-compile-option.patch new file mode 100644 index 0000000..6103c00 --- /dev/null +++ b/0017-add-fPIC-compile-option.patch @@ -0,0 +1,25 @@ +From 03e6b2afddf816e9931ae0eb463ead33ceaaea98 Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Wed, 9 Oct 2024 10:12:34 +0800 +Subject: [PATCH] add fPIC compile option + +Signed-off-by: zhongtao +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 05bcbb2..2954422 100644 +--- a/meson.build ++++ b/meson.build +@@ -235,6 +235,7 @@ if want_isulad + yajldep = dependency('yajl', version : '>=2') + srcconf.set('HAVE_ISULAD', yajldep.found()) + liblxc_dependencies += yajldep ++ possible_link_flags += ['-fPIC'] + else + srcconf.set('HAVE_ISULAD', false) + endif +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index f128797..6078ea3 100644 --- a/lxc.spec +++ b/lxc.spec @@ -25,6 +25,7 @@ Patch0013: 0013-ensure-cpuset-cgroup-built-while-writing-cgroup.proc.patch Patch0014: 0014-fix-cpuset-cgroup-error.patch Patch0015: 0015-append-mntopt-to-mntdata-if-not-found-in-mount_opt.patch Patch0016: 0016-unfreeze-freezing-container-and-bugfix-for-files.lim.patch +Patch0017: 0017-add-fPIC-compile-option.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) -- Gitee