All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] bison: remove the parallel build patch
@ 2020-09-14  8:35 Yu, Mingli
  2020-09-14 16:58 ` [OE-core] " Andre McCurdy
  0 siblings, 1 reply; 3+ messages in thread
From: Yu, Mingli @ 2020-09-14  8:35 UTC (permalink / raw)
  To: openembedded-core

From: Mingli Yu <mingli.yu@windriver.com>

Remove the parallel build patch as the issue have already been
fixed in bison 3.7.2(f7b642cf build: fix incorrect dependencies).

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../0001-bison-fix-the-parallel-build.patch   | 63 -------------------
 meta/recipes-devtools/bison/bison_3.7.2.bb    |  1 -
 2 files changed, 64 deletions(-)
 delete mode 100644 meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch

diff --git a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
deleted file mode 100644
index c3be91a109..0000000000
--- a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Thu, 14 May 2020 15:23:16 +0800
-Subject: [PATCH] bison: fix the parallel build
-
-Explicitly make the BUILT_SOURCES which
-are the generated headers such as stdio.h,
-fcntl.h and etc to be the dependencies of
-the gl_LIBOBJS such as libbison_a-sprintf.o,
-libbison_a-printf.o and etc to guarantee the
-BUILT_SOURCES is generated before begin to
-compile EXTRA_lib_libbison_a_SOURCES such as
-fprintf.c in parallel builid, otherwise there
-may come below error:
- | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
-
-It does the same for src_bison_OBJECTS and
-lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
-generated before begin to compile src_bison_SOURCES
-which contains AnnotationList.c and etc.
-
-BTW, the MOSTLYCLEANFILES also contains the
-generated header needs to be created early
-in the build process, so add it also in to
-avoid below error:
- | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
-
-Upstream-Status: Submitted [bison-patches@gnu.org maillist]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- lib/gnulib.mk | 2 ++
- src/local.mk  | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index c21c656..27fb3dc 100644
---- a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -120,6 +120,8 @@ lib_libbison_a_SOURCES =
- lib_libbison_a_LIBADD = $(gl_LIBOBJS)
- lib_libbison_a_DEPENDENCIES = $(gl_LIBOBJS)
- EXTRA_lib_libbison_a_SOURCES =
-+$(lib_libbison_a_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
-+$(gl_LIBOBJS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
- 
- lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"
- 
-diff --git a/src/local.mk b/src/local.mk
-index 61dc573..b5b9079 100644
---- a/src/local.mk
-+++ b/src/local.mk
-@@ -24,6 +24,7 @@ if RELOCATABLE_VIA_LD
-   src_bison_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
- endif
- 
-+$(src_bison_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
- src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
- src_bison_SOURCES =                             \
-   src/AnnotationList.c                          \
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/bison/bison_3.7.2.bb b/meta/recipes-devtools/bison/bison_3.7.2.bb
index f7bf70fff3..efc426376d 100644
--- a/meta/recipes-devtools/bison/bison_3.7.2.bb
+++ b/meta/recipes-devtools/bison/bison_3.7.2.bb
@@ -11,7 +11,6 @@ DEPENDS = "bison-native flex-native"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
            file://add-with-bisonlocaledir.patch \
-           file://0001-bison-fix-the-parallel-build.patch \
            "
 SRC_URI[sha256sum] = "7948d193104d979c0fb0294a1854c73c89d72ae41acfc081826142578a78a91b"
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [OE-core] [PATCH] bison: remove the parallel build patch
  2020-09-14  8:35 [PATCH] bison: remove the parallel build patch Yu, Mingli
@ 2020-09-14 16:58 ` Andre McCurdy
  2020-09-16  2:41   ` [PATCH v2] " Yu, Mingli
  0 siblings, 1 reply; 3+ messages in thread
From: Andre McCurdy @ 2020-09-14 16:58 UTC (permalink / raw)
  To: Yu, Mingli; +Cc: OE Core mailing list

On Mon, Sep 14, 2020 at 1:35 AM Yu, Mingli <mingli.yu@windriver.com> wrote:
>
> From: Mingli Yu <mingli.yu@windriver.com>
>
> Remove the parallel build patch as the issue have already been
> fixed in bison 3.7.2(f7b642cf build: fix incorrect dependencies).

If parallel make issues have been fixed upstream then this workaround
should be removed from the recipe too:

 # Reset any loadavg set via environment, it breaks parallel build
 # | ../bison-3.5.2/lib/uniwidth/width.c:21:10: fatal error:
uniwidth.h: No such file or directory
 # |  #include "uniwidth.h"
 # |           ^~~~~~~~~~~~
 EXTRA_OEMAKE_append = " -l"

> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>  .../0001-bison-fix-the-parallel-build.patch   | 63 -------------------
>  meta/recipes-devtools/bison/bison_3.7.2.bb    |  1 -
>  2 files changed, 64 deletions(-)
>  delete mode 100644 meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
>
> diff --git a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
> deleted file mode 100644
> index c3be91a109..0000000000
> --- a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001
> -From: Mingli Yu <mingli.yu@windriver.com>
> -Date: Thu, 14 May 2020 15:23:16 +0800
> -Subject: [PATCH] bison: fix the parallel build
> -
> -Explicitly make the BUILT_SOURCES which
> -are the generated headers such as stdio.h,
> -fcntl.h and etc to be the dependencies of
> -the gl_LIBOBJS such as libbison_a-sprintf.o,
> -libbison_a-printf.o and etc to guarantee the
> -BUILT_SOURCES is generated before begin to
> -compile EXTRA_lib_libbison_a_SOURCES such as
> -fprintf.c in parallel builid, otherwise there
> -may come below error:
> - | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
> -
> -It does the same for src_bison_OBJECTS and
> -lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
> -generated before begin to compile src_bison_SOURCES
> -which contains AnnotationList.c and etc.
> -
> -BTW, the MOSTLYCLEANFILES also contains the
> -generated header needs to be created early
> -in the build process, so add it also in to
> -avoid below error:
> - | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
> -
> -Upstream-Status: Submitted [bison-patches@gnu.org maillist]
> -
> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ----
> - lib/gnulib.mk | 2 ++
> - src/local.mk  | 1 +
> - 2 files changed, 3 insertions(+)
> -
> -diff --git a/lib/gnulib.mk b/lib/gnulib.mk
> -index c21c656..27fb3dc 100644
> ---- a/lib/gnulib.mk
> -+++ b/lib/gnulib.mk
> -@@ -120,6 +120,8 @@ lib_libbison_a_SOURCES =
> - lib_libbison_a_LIBADD = $(gl_LIBOBJS)
> - lib_libbison_a_DEPENDENCIES = $(gl_LIBOBJS)
> - EXTRA_lib_libbison_a_SOURCES =
> -+$(lib_libbison_a_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
> -+$(gl_LIBOBJS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
> -
> - lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"
> -
> -diff --git a/src/local.mk b/src/local.mk
> -index 61dc573..b5b9079 100644
> ---- a/src/local.mk
> -+++ b/src/local.mk
> -@@ -24,6 +24,7 @@ if RELOCATABLE_VIA_LD
> -   src_bison_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
> - endif
> -
> -+$(src_bison_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
> - src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
> - src_bison_SOURCES =                             \
> -   src/AnnotationList.c                          \
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-devtools/bison/bison_3.7.2.bb b/meta/recipes-devtools/bison/bison_3.7.2.bb
> index f7bf70fff3..efc426376d 100644
> --- a/meta/recipes-devtools/bison/bison_3.7.2.bb
> +++ b/meta/recipes-devtools/bison/bison_3.7.2.bb
> @@ -11,7 +11,6 @@ DEPENDS = "bison-native flex-native"
>
>  SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
>             file://add-with-bisonlocaledir.patch \
> -           file://0001-bison-fix-the-parallel-build.patch \
>             "
>  SRC_URI[sha256sum] = "7948d193104d979c0fb0294a1854c73c89d72ae41acfc081826142578a78a91b"
>
> --
> 2.17.1
>
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] bison: remove the parallel build patch
  2020-09-14 16:58 ` [OE-core] " Andre McCurdy
@ 2020-09-16  2:41   ` Yu, Mingli
  0 siblings, 0 replies; 3+ messages in thread
From: Yu, Mingli @ 2020-09-16  2:41 UTC (permalink / raw)
  To: openembedded-core

From: Mingli Yu <mingli.yu@windriver.com>

Remove the parallel build patch and related fix for parallel
build as the issue have already been fixed in bison 3.7.2
(f7b642cf build: fix incorrect dependencies).

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../0001-bison-fix-the-parallel-build.patch   | 63 -------------------
 meta/recipes-devtools/bison/bison_3.7.2.bb    |  7 ---
 2 files changed, 70 deletions(-)
 delete mode 100644 meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch

diff --git a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
deleted file mode 100644
index c3be91a109..0000000000
--- a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Thu, 14 May 2020 15:23:16 +0800
-Subject: [PATCH] bison: fix the parallel build
-
-Explicitly make the BUILT_SOURCES which
-are the generated headers such as stdio.h,
-fcntl.h and etc to be the dependencies of
-the gl_LIBOBJS such as libbison_a-sprintf.o,
-libbison_a-printf.o and etc to guarantee the
-BUILT_SOURCES is generated before begin to
-compile EXTRA_lib_libbison_a_SOURCES such as
-fprintf.c in parallel builid, otherwise there
-may come below error:
- | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
-
-It does the same for src_bison_OBJECTS and
-lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
-generated before begin to compile src_bison_SOURCES
-which contains AnnotationList.c and etc.
-
-BTW, the MOSTLYCLEANFILES also contains the
-generated header needs to be created early
-in the build process, so add it also in to
-avoid below error:
- | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
-
-Upstream-Status: Submitted [bison-patches@gnu.org maillist]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- lib/gnulib.mk | 2 ++
- src/local.mk  | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index c21c656..27fb3dc 100644
---- a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -120,6 +120,8 @@ lib_libbison_a_SOURCES =
- lib_libbison_a_LIBADD = $(gl_LIBOBJS)
- lib_libbison_a_DEPENDENCIES = $(gl_LIBOBJS)
- EXTRA_lib_libbison_a_SOURCES =
-+$(lib_libbison_a_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
-+$(gl_LIBOBJS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
- 
- lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"
- 
-diff --git a/src/local.mk b/src/local.mk
-index 61dc573..b5b9079 100644
---- a/src/local.mk
-+++ b/src/local.mk
-@@ -24,6 +24,7 @@ if RELOCATABLE_VIA_LD
-   src_bison_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
- endif
- 
-+$(src_bison_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
- src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
- src_bison_SOURCES =                             \
-   src/AnnotationList.c                          \
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/bison/bison_3.7.2.bb b/meta/recipes-devtools/bison/bison_3.7.2.bb
index f7bf70fff3..ace4ea5c3f 100644
--- a/meta/recipes-devtools/bison/bison_3.7.2.bb
+++ b/meta/recipes-devtools/bison/bison_3.7.2.bb
@@ -11,19 +11,12 @@ DEPENDS = "bison-native flex-native"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
            file://add-with-bisonlocaledir.patch \
-           file://0001-bison-fix-the-parallel-build.patch \
            "
 SRC_URI[sha256sum] = "7948d193104d979c0fb0294a1854c73c89d72ae41acfc081826142578a78a91b"
 
 # No point in hardcoding path to m4, just use PATH
 EXTRA_OECONF += "M4=m4"
 
-# Reset any loadavg set via environment, it breaks parallel build
-# | ../bison-3.5.2/lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
-# |  #include "uniwidth.h"
-# |           ^~~~~~~~~~~~
-EXTRA_OEMAKE_append = " -l"
-
 inherit autotools gettext texinfo
 
 # The automatic m4 path detection gets confused, so force the right value
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-16  2:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-14  8:35 [PATCH] bison: remove the parallel build patch Yu, Mingli
2020-09-14 16:58 ` [OE-core] " Andre McCurdy
2020-09-16  2:41   ` [PATCH v2] " Yu, Mingli

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.