| Message ID | 20190521065529.41647-2-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [oe,meta-oe,V2,1/2] libnfc: Fix build with musl | expand |
On Mon, May 20, 2019 at 11:55:29PM -0700, Khem Raj wrote: >... > +Fixes > +| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] > +| #define PAGE_SIZE 4096 > +| ^ > +| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu > +de/limits.h:89:9: note: previous definition is here > +| #define PAGE_SIZE PAGESIZE >... > +--- a/src/flash/nor/esirisc_flash.c > ++++ b/src/flash/nor/esirisc_flash.c > +@@ -92,7 +92,9 @@ > + #endif > + > + #define CONTROL_TIMEOUT 5000 /* 5s */ > ++#ifndef PAGE_SIZE > + #define PAGE_SIZE 4096 > ++#endif > + #define PB_MAX 32 >... Are you sure this is correct? This looks like two completely unrelated defines that just happen to have the same name. And it worked by chance since they have the same value on x86_64. Renaming to something like ESIRISC_PAGE_SIZE would be a proper fix. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
On Tue, May 21, 2019 at 12:19 AM Adrian Bunk <bunk@stusta.de> wrote: > > On Mon, May 20, 2019 at 11:55:29PM -0700, Khem Raj wrote: > >... > > +Fixes > > +| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] > > +| #define PAGE_SIZE 4096 > > +| ^ > > +| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu > > +de/limits.h:89:9: note: previous definition is here > > +| #define PAGE_SIZE PAGESIZE > >... > > +--- a/src/flash/nor/esirisc_flash.c > > ++++ b/src/flash/nor/esirisc_flash.c > > +@@ -92,7 +92,9 @@ > > + #endif > > + > > + #define CONTROL_TIMEOUT 5000 /* 5s */ > > ++#ifndef PAGE_SIZE > > + #define PAGE_SIZE 4096 > > ++#endif > > + #define PB_MAX 32 > >... > > Are you sure this is correct? > This looks like two completely unrelated defines that just happen to > have the same name. > And it worked by chance since they have the same value on x86_64. > > Renaming to something like ESIRISC_PAGE_SIZE would be a proper fix. > yes, upstream clarified that too. v2 is on cards. > cu > Adrian > > -- > > "Is there not promise of rain?" Ling Tan asked suddenly out > of the darkness. There had been need of rain for many days. > "Only a promise," Lao Er said. > Pearl S. Buck - Dragon Seed > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch new file mode 100644 index 0000000000..6fe5b27891 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch @@ -0,0 +1,37 @@ +From 531c96b4fd99ea046750591af36c5b3f92479fa6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2019 23:24:26 -0700 +Subject: [PATCH] esirisc_flash: Define PAGE_SIZE if its not already defined + +Fixes +| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] +| #define PAGE_SIZE 4096 +| ^ +| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu +de/limits.h:89:9: note: previous definition is here +| #define PAGE_SIZE PAGESIZE + +Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/] +--- + src/flash/nor/esirisc_flash.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c +index 4e33b9429..90661b77b 100644 +--- a/src/flash/nor/esirisc_flash.c ++++ b/src/flash/nor/esirisc_flash.c +@@ -92,7 +92,9 @@ + #endif + + #define CONTROL_TIMEOUT 5000 /* 5s */ ++#ifndef PAGE_SIZE + #define PAGE_SIZE 4096 ++#endif + #define PB_MAX 32 + + #define NUM_NS_PER_S 1000000000ULL +-- +2.21.0 + diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 9a8a09a913..9054e69b6c 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,6 +9,7 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ + file://0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch \ " SRCREV_FORMAT = "openocd"
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...fine-PAGE_SIZE-if-its-not-already-de.patch | 37 +++++++++++++++++++ .../recipes-devtools/openocd/openocd_git.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Define-PAGE_SIZE-if-its-not-already-de.patch -- 2.21.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel