!539 sync patch from master to add fPIC compile option

From: @jikai11 
Reviewed-by: @taotao-sauce 
Signed-off-by: @taotao-sauce
This commit is contained in:
openeuler-ci-bot 2024-11-25 07:39:49 +00:00 committed by Gitee
commit 07240b92d5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 03e6b2afddf816e9931ae0eb463ead33ceaaea98 Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Wed, 9 Oct 2024 10:12:34 +0800
Subject: [PATCH] add fPIC compile option
Signed-off-by: zhongtao <zhongtao17@huawei.com>
---
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

View File

@ -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 <jikai11@huawei.com> - 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