All of lore.kernel.org
 help / color / mirror / Atom feed
From: Baruch Siach via buildroot <buildroot@buildroot.org>
To: Neal Frager <neal.frager@amd.com>
Cc: michal.simek@amd.com, luca.ceresoli@bootlin.com,
	thomas.petazzoni@bootlin.com, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v3 1/1] package/bootgen: bump to xilinx_v2023.1
Date: Tue, 16 May 2023 07:49:24 +0300	[thread overview]
Message-ID: <874jocc22f.fsf@tarshish> (raw)
In-Reply-To: <20230516044418.21419-1-neal.frager@amd.com>

Hi Neal,

On Tue, May 16 2023, Neal Frager wrote:
> This patch bumps bootgen to version xilinx_v2023.1.
> The patch for build machines with modern flex is no longer needed.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---
> V1->V2:
>   - Added patch file remove to commit
> V2->V3:
>   - Fixed file name in bootgen.hash file
> ---
>  ...x-build-on-machines-with-modern-flex.patch | 133 ------------------

The patch should also be removed from the .checkpackageignore list.

baruch

>  package/bootgen/bootgen.hash                  |   2 +-
>  package/bootgen/bootgen.mk                    |   2 +-
>  3 files changed, 2 insertions(+), 135 deletions(-)
>  delete mode 100644 package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch
>
> diff --git a/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch b/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch
> deleted file mode 100644
> index ea82f5e70c..0000000000
> --- a/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch
> +++ /dev/null
> @@ -1,133 +0,0 @@
> -From 7251dce3dc974c7372e7024ade3e8a455266cfd2 Mon Sep 17 00:00:00 2001
> -From: Peter Korsgaard <peter@korsgaard.com>
> -Date: Fri, 18 Mar 2022 09:02:31 +0100
> -Subject: [PATCH] Fix build on machines with modern flex
> -
> -Bootgen embeds an old version of flex, but uses the system include syntax
> -(#include <>) to reference it, causing conflicts on systems with the
> -development headers for a modern flex version installed, leading to build
> -issues like:
> -
> -../bisonflex/bif.yy.cpp: In member function 'virtual int BIF::FlexScanner::yylex()':
> -../bisonflex/bif.yy.cpp:1608:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream<char>'} and 'std::istream*' {aka 'std::basic_istream<char>*'})
> -
> -Fix it by using normal local #include statements by:
> -
> -sed -i 's/<FlexLexer.h>/"FlexLexer.h"/g' *
> -
> -Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> -[Submitted upstream: https://github.com/Xilinx/bootgen/pull/20]
> ----
> - FlexLexer.h         | 6 +++---
> - bif.yy.cpp          | 2 +-
> - bifscanner.h        | 2 +-
> - cmdoptions.yy.cpp   | 2 +-
> - cmdoptionsscanner.h | 2 +-
> - reginit.yy.cpp      | 2 +-
> - reginitscanner.h    | 2 +-
> - 7 files changed, 9 insertions(+), 9 deletions(-)
> -
> -diff --git a/FlexLexer.h b/FlexLexer.h
> -index b115b5d..1c0386f 100755
> ---- a/FlexLexer.h
> -+++ b/FlexLexer.h
> -@@ -33,15 +33,15 @@
> - //
> - // If you want to create multiple lexer classes, you use the -P flag
> - // to rename each yyFlexLexer to some other xxFlexLexer.  You then
> --// include <FlexLexer.h> in your other sources once per lexer class:
> -+// include "FlexLexer.h" in your other sources once per lexer class:
> - //
> - //	#undef yyFlexLexer
> - //	#define yyFlexLexer xxFlexLexer
> --//	#include <FlexLexer.h>
> -+//	#include "FlexLexer.h"
> - //
> - //	#undef yyFlexLexer
> - //	#define yyFlexLexer zzFlexLexer
> --//	#include <FlexLexer.h>
> -+//	#include "FlexLexer.h"
> - //	...
> - 
> - #ifndef __FLEX_LEXER_H
> -diff --git a/bif.yy.cpp b/bif.yy.cpp
> -index 7dd0841..9e09267 100644
> ---- a/bif.yy.cpp
> -+++ b/bif.yy.cpp
> -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
> - 
> - #define yytext_ptr yytext
> - 
> --#include <FlexLexer.h>
> -+#include "FlexLexer.h"
> - 
> - int yyFlexLexer::yywrap() { return 1; }
> - int yyFlexLexer::yylex()
> -diff --git a/bifscanner.h b/bifscanner.h
> -index a6ec9e4..ded78da 100755
> ---- a/bifscanner.h
> -+++ b/bifscanner.h
> -@@ -28,7 +28,7 @@
> - #if ! defined(yyFlexLexerOnce)
> - #undef yyFlexLexer
> - #define yyFlexLexer bifFlexLexer
> --#include <FlexLexer.h>
> -+#include "FlexLexer.h"
> - #endif
> - 
> - // Override the interface for yylex since we namespaced it
> -diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp
> -index 6ee80de..1acfcce 100644
> ---- a/cmdoptions.yy.cpp
> -+++ b/cmdoptions.yy.cpp
> -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
> - 
> - #define yytext_ptr yytext
> - 
> --#include <FlexLexer.h>
> -+#include "FlexLexer.h"
> - 
> - int yyFlexLexer::yywrap() { return 1; }
> - int yyFlexLexer::yylex()
> -diff --git a/cmdoptionsscanner.h b/cmdoptionsscanner.h
> -index a48af09..e02c1f1 100755
> ---- a/cmdoptionsscanner.h
> -+++ b/cmdoptionsscanner.h
> -@@ -29,7 +29,7 @@
> - 
> - #undef yyFlexLexer
> - #define yyFlexLexer reginitFlexLexer
> --#include <FlexLexer.h>
> -+#include "FlexLexer.h"
> - #endif
> - 
> - // Override the interface for yylex since we namespaced it
> -diff --git a/reginit.yy.cpp b/reginit.yy.cpp
> -index 8422867..ff088f9 100644
> ---- a/reginit.yy.cpp
> -+++ b/reginit.yy.cpp
> -@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
> - 
> - #define yytext_ptr yytext
> - 
> --#include <FlexLexer.h>
> -+#include "FlexLexer.h"
> - 
> - int yyFlexLexer::yywrap() { return 1; }
> - int yyFlexLexer::yylex()
> -diff --git a/reginitscanner.h b/reginitscanner.h
> -index 4e78af9..23177be 100755
> ---- a/reginitscanner.h
> -+++ b/reginitscanner.h
> -@@ -29,7 +29,7 @@
> - 
> - #undef yyFlexLexer
> - #define yyFlexLexer reginitFlexLexer
> --#include <FlexLexer.h>
> -+#include "FlexLexer.h"
> - #endif
> - 
> - // Override the interface for yylex since we namespaced it
> --- 
> -2.30.2
> -
> diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash
> index 5d77c164f3..937509c859 100644
> --- a/package/bootgen/bootgen.hash
> +++ b/package/bootgen/bootgen.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  7e07c75aa3e3965c8e33faefde037877f78130451cebc2056b096db9c66acbb3  bootgen-xilinx_v2022.2.tar.gz
> +sha256  2fda35fac28f5753cfdd9c6d5c07fd2b018d55984681af79415a67ba5372ea8e  bootgen-xilinx_v2023.1.tar.gz
>  sha256  4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3  LICENSE
> diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk
> index 88bc73b604..d83980d925 100644
> --- a/package/bootgen/bootgen.mk
> +++ b/package/bootgen/bootgen.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -BOOTGEN_VERSION = xilinx_v2022.2
> +BOOTGEN_VERSION = xilinx_v2023.1
>  BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION))
>  HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf
>  BOOTGEN_LICENSE = Apache-2.0


-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2023-05-16  4:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-16  4:44 [Buildroot] [PATCH v3 1/1] package/bootgen: bump to xilinx_v2023.1 Neal Frager via buildroot
2023-05-16  4:49 ` Baruch Siach via buildroot [this message]
2023-05-16  5:17   ` Frager, Neal via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=874jocc22f.fsf@tarshish \
    --to=buildroot@buildroot.org \
    --cc=baruch@tkos.co.il \
    --cc=luca.ceresoli@bootlin.com \
    --cc=michal.simek@amd.com \
    --cc=neal.frager@amd.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.