From 3780f29c29234e6e85dbcc4dcc7b00de7c5b7ae5 Mon Sep 17 00:00:00 2001 From: jikai Date: Mon, 25 Nov 2024 06:52:57 +0000 Subject: [PATCH] sync patch from master to add fPIC compile option Signed-off-by: jikai --- 0018-add-fPIC-compile-option.patch | 25 +++++++++++++++++++++++++ lxc.spec | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0018-add-fPIC-compile-option.patch diff --git a/0018-add-fPIC-compile-option.patch b/0018-add-fPIC-compile-option.patch new file mode 100644 index 0000000..6103c00 --- /dev/null +++ b/0018-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 c538ad2..9cd99db 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 16 +%global _release 17 %bcond isulad 1 Name: lxc @@ -26,6 +26,7 @@ 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-fix-error-of-cc.compiles-on-aarch.patch +Patch0018: 0018-add-fPIC-compile-option.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -215,6 +216,12 @@ meson test -C build %endif %changelog +* Mon Nov 25 2024 jikai - 5.0.2-17 +- Type: bugfix +- ID:NA +- SUG:NA +- DESC: sync patch from master to add fPIC compile option + * Sun Sep 15 2024 yuanchao <1050706328@qq.com> - 5.0.2-16 - Type: bugfix - ID:NA -- Gitee