[OE-core] [oe-core][PATCH 2/2] systemd: fix tests when not using gold

Saul Wold sgw at linux.intel.com
Wed Apr 23 16:34:54 UTC 2014


On 04/23/2014 08:01 AM, Dan McGregor wrote:
> From: Dan McGregor <dan.mcgregor at usask.ca>
>
> Explicitly mark the dummy function as externally visible
> so that ld can find the symbol at link time. This is needed
> when the DISTRO_FEATURE ld-is-gold is not enabled; systemd
> uses -flto anyway.
>
> Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
> ---
>   meta/recipes-core/systemd/systemd/systemd-lto-fix.patch | 14 ++++++++++++++
>   meta/recipes-core/systemd/systemd_211.bb                |  1 +
>   2 files changed, 15 insertions(+)
>   create mode 100644 meta/recipes-core/systemd/systemd/systemd-lto-fix.patch
>
> diff --git a/meta/recipes-core/systemd/systemd/systemd-lto-fix.patch
> b/meta/recipes-core/systemd/systemd/systemd-lto-fix.patch
> new file mode 100644
> index 0000000..90875e4
> --- /dev/null
> +++ b/meta/recipes-core/systemd/systemd/systemd-lto-fix.patch

The patch also needs an appropriate Upstream-Status and Signed-off-by 
tags here.

Thanks
	Sau!

> @@ -0,0 +1,14 @@
> +diff --git a/src/test/test-udev.c b/src/test/test-udev.c
> +index b064744..3753c87 100644
> +--- a/src/test/test-udev.c
> ++++ b/src/test/test-udev.c
> +@@ -36,7 +36,8 @@
> + #include "udev.h"
> + #include "udev-util.h"
> +
> +-void udev_main_log(struct udev *udev, int priority,
> ++void __attribute__((externally_visible))
> ++     udev_main_log(struct udev *udev, int priority,
> +                    const char *file, int line, const char *fn,
> +                    const char *format, va_list args) {}
> +
> diff --git a/meta/recipes-core/systemd/systemd_211.bb
> b/meta/recipes-core/systemd/systemd_211.bb
> index df632ab..ddf89b8 100644
> --- a/meta/recipes-core/systemd/systemd_211.bb
> +++ b/meta/recipes-core/systemd/systemd_211.bb
> @@ -23,6 +23,7 @@ PV = "211+git${SRCPV}"
>
>   SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git
> \
>              file://binfmt-install.patch \
> +           file://systemd-lto-fix.patch \
>              file://systemd-pam-configure-check-uclibc.patch \
>              file://systemd-pam-fix-execvpe.patch \
>              file://systemd-pam-fix-fallocate.patch \
>



More information about the Openembedded-core mailing list