[yocto] [PATCH v2][meta-selinux] audit/auvirt: get inline functions work with both gnu89 & gnu11
wenzong.fan at windriver.com
wenzong.fan at windriver.com
Mon Sep 14 01:45:06 PDT 2015
From: Wenzong Fan <wenzong.fan at windriver.com>
After gcc upgraded to gcc5, and if the codes are compiled without
optimization (-O0), and the below error will happen:
auvirt.c:484: undefined reference to `copy_str'
auvirt.c:667: undefined reference to `is_resource'
collect2: error: ld returned 1 exit status
gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that
exactly one C source file has the callable copy of the inline function.
Consider the following program:
inline int
foo (void)
{
return 42;
}
int
main (void)
{
return foo ();
}
The program above will not link with the C99 inline semantics, because
no out-of-line function foo is generated. To fix this, either mark the
function foo as static, or add the following declaration:
static inline int foo (void);
More information refer to: https://gcc.gnu.org/gcc-5/porting_to.html
Note: using "extern inline" will fail to build with gcc4.x, so replace
inline with "static inline".
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
---
...et-inline-functions-work-with-gnu89-gnu11.patch | 71 ++++++++++++++++++++++
recipes-security/audit/audit_2.4.3.bb | 1 +
2 files changed, 72 insertions(+)
create mode 100644 recipes-security/audit/audit/audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch
diff --git a/recipes-security/audit/audit/audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch b/recipes-security/audit/audit/audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch
new file mode 100644
index 0000000..dfda1a8
--- /dev/null
+++ b/recipes-security/audit/audit/audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch
@@ -0,0 +1,71 @@
+From 15036dd4fa9eb209f5e148c6f7ee081f5ca78fa4 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan at windriver.com>
+Date: Fri, 11 Sep 2015 03:37:13 -0400
+Subject: [PATCH] audit/auvirt: get inline functions work with both gnu89 & gnu11
+
+After gcc upgraded to gcc5, and if the codes are compiled without
+optimization (-O0), and the below error will happen:
+
+ auvirt.c:484: undefined reference to `copy_str'
+ auvirt.c:667: undefined reference to `is_resource'
+ collect2: error: ld returned 1 exit status
+
+gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that
+exactly one C source file has the callable copy of the inline function.
+Consider the following program:
+
+ inline int
+ foo (void)
+ {
+ return 42;
+ }
+
+ int
+ main (void)
+ {
+ return foo ();
+ }
+
+The program above will not link with the C99 inline semantics, because
+no out-of-line function foo is generated. To fix this, either mark the
+function foo as static, or add the following declaration:
+
+ static inline int foo (void);
+
+More information refer to: https://gcc.gnu.org/gcc-5/porting_to.html
+
+Note: using "extern inline" will fail to build with gcc4.x, so replace
+inline with "static inline".
+
+Upstream Status: pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
+---
+ tools/auvirt/auvirt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/auvirt/auvirt.c b/tools/auvirt/auvirt.c
+index 655c454..b16d718 100644
+--- a/tools/auvirt/auvirt.c
++++ b/tools/auvirt/auvirt.c
+@@ -138,7 +138,7 @@ void event_free(struct event *event)
+ }
+ }
+
+-inline char *copy_str(const char *str)
++static inline char *copy_str(const char *str)
+ {
+ return (str) ? strdup(str) : NULL;
+ }
+@@ -650,7 +650,7 @@ int process_control_event(auparse_state_t *au)
+ return 0;
+ }
+
+-inline int is_resource(const char *res)
++static inline int is_resource(const char *res)
+ {
+ if (res == NULL ||
+ res[0] == '\0' ||
+--
+1.9.1
+
diff --git a/recipes-security/audit/audit_2.4.3.bb b/recipes-security/audit/audit_2.4.3.bb
index 0fcf145..f0fa949 100644
--- a/recipes-security/audit/audit_2.4.3.bb
+++ b/recipes-security/audit/audit_2.4.3.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://people.redhat.com/sgrubb/audit/audit-${PV}.tar.gz \
file://auditd \
file://auditd.service \
file://audit-volatile.conf \
+ file://audit-auvirt-get-inline-functions-work-with-gnu89-gnu11.patch \
"
SRC_URI[md5sum] = "544d863af2016b76afd8d1691b251164"
SRC_URI[sha256sum] = "9c914704fecc602e143e37152f3efbab2469692684c1a8cc1b801c1b49c7abc6"
--
1.9.1
More information about the yocto
mailing list