merged
thanks
On 3/11/21 1:34 AM, kai wrote:
> From: Kai Kang <kai.k...@windriver.com>
>
> It fails to comile samhain for powerpc(qemuppc):
>
> | x_sh_dbIO.c: In function 'swap_short':
> | x_sh_dbIO.c:229:36: error: initializer element is not constant
> | 229 | static unsigned short ooop = *iptr;
> | | ^
>
> Assign after initialization of the static variable to avoid the failure.
>
> Signed-off-by: Kai Kang <kai.k...@windriver.com>
> ---
> ...-initializer-element-is-not-constant.patch | 28 +++++++++++++++++++
> recipes-ids/samhain/samhain.inc | 1 +
> 2 files changed, 29 insertions(+)
> create mode 100644
> recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch
>
> diff --git
> a/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch
>
> b/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch
> new file mode 100644
> index 0000000..72cb880
> --- /dev/null
> +++
> b/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch
> @@ -0,0 +1,28 @@
> +Fix error when compile for powerpc:
> +
> +| x_sh_dbIO.c: In function 'swap_short':
> +| x_sh_dbIO.c:229:36: error: initializer element is not constant
> +| 229 | static unsigned short ooop = *iptr;
> +| | ^
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Kai Kang <kai.k...@windriver.com>
> +---
> + src/sh_dbIO.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/src/sh_dbIO.c b/src/sh_dbIO.c
> +index b547ac5..23a9621 100644
> +--- a/src/sh_dbIO.c
> ++++ b/src/sh_dbIO.c
> +@@ -226,7 +226,8 @@ static unsigned short * swap_short (unsigned short *
> iptr)
> + else
> + {
> + /* alignment problem */
> +- static unsigned short ooop = *iptr;
> ++ static unsigned short ooop;
> ++ ooop = *iptr;
> + unsigned short hi = (ooop & 0xff00);
> + unsigned short lo = (ooop & 0xff);
> + ooop = (lo << 8) | (hi >> 8);
> diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
> index 6a2eb08..0148e46 100644
> --- a/recipes-ids/samhain/samhain.inc
> +++ b/recipes-ids/samhain/samhain.inc
> @@ -18,6 +18,7 @@ SRC_URI =
> "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
> file://samhain-avoid-searching-host-for-postgresql.patch \
> file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \
> file://fix-build-with-new-version-attr.patch \
> + file://samhain-fix-initializer-element-is-not-constant.patch \
> "
>
> SRC_URI[sha256sum] =
> "3e57574036d5055e9557ec5095818b419ea6c4365370fc2ccce1e9f87f9fad08"
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#52765): https://lists.yoctoproject.org/g/yocto/message/52765
Mute This Topic: https://lists.yoctoproject.org/mt/81249494/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
