Re: [ptxdist] [APPLIED] ifplugd: Added new patch to fix a linker error with GCC10

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 1e5fab0e2e79dd79d16385abcd3c9e6ec22a7917.

Michael

[sent from post-receive hook]

On Wed, 16 Jun 2021 12:35:03 +0200, Felix Mellmann <flix.ptxdist@benfm.de> wrote:
> Added a new patch to the ifplugd package which resolves a
> linker error when using GCC10.
> 
> Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
> Message-Id: <20210531132947.220277-2-flix.ptxdist@benfm.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
> new file mode 100644
> index 000000000000..b1800d7c6517
> --- /dev/null
> +++ b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
> @@ -0,0 +1,28 @@
> +From: Felix Mellmann <flix.ptxdist@benfm.de>
> +Date: Mon, 31 May 2021 15:05:14 +0200
> +Subject: [PATCH] Fix linker error when using GCC10
> +
> +This patch fixes a linker error when using GCC10. Two
> +variables need to be marked as external to avoid multiple
> +definition.
> +
> +Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
> +---
> + src/interface.h | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/interface.h b/src/interface.h
> +index d223b1f5fabc..fd4a5f4cea63 100644
> +--- a/src/interface.h
> ++++ b/src/interface.h
> +@@ -21,8 +21,8 @@
> +  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> +  */
> + 
> +-int interface_auto_up;
> +-int interface_do_message;
> ++extern int interface_auto_up;
> ++extern int interface_do_message;
> + 
> + typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
> + 
> diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
> index a564ff7ddc85..1f8bb67d00ed 100644
> --- a/patches/ifplugd-0.28/series
> +++ b/patches/ifplugd-0.28/series
> @@ -1,4 +1,5 @@
>  # generated by git-ptx-patches
>  #tag:base --start-number 1
>  0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> -# bbf895f48ef5cf6b103f60be48b437c9  - git-ptx-patches magic
> +0002-Fix-linker-error-when-using-GCC10.patch
> +# 5f6a3e3cf4117f7c3e207f9b9c45eb10  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de