* [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches
@ 2020-09-05 12:42 Fabrice Fontaine
2020-09-05 12:42 ` [Buildroot] [PATCH 2/2] package/mongrel2: fix build with gcc 10 Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2020-09-05 12:42 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../{0002-Do-not-run-tests.patch => 0001-Do-not-run-tests.patch} | 0
...ation.patch => 0002-Fix-Makefiles-for-cross-compilation.patch} | 0
...onflict.patch => 0003-Rename-symbol-to-prevent-conflict.patch} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename package/mongrel2/{0002-Do-not-run-tests.patch => 0001-Do-not-run-tests.patch} (100%)
rename package/mongrel2/{0003-Fix-Makefiles-for-cross-compilation.patch => 0002-Fix-Makefiles-for-cross-compilation.patch} (100%)
rename package/mongrel2/{0004-Rename-symbol-to-prevent-conflict.patch => 0003-Rename-symbol-to-prevent-conflict.patch} (100%)
diff --git a/package/mongrel2/0002-Do-not-run-tests.patch b/package/mongrel2/0001-Do-not-run-tests.patch
similarity index 100%
rename from package/mongrel2/0002-Do-not-run-tests.patch
rename to package/mongrel2/0001-Do-not-run-tests.patch
diff --git a/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch b/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch
similarity index 100%
rename from package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch
rename to package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch
diff --git a/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch b/package/mongrel2/0003-Rename-symbol-to-prevent-conflict.patch
similarity index 100%
rename from package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch
rename to package/mongrel2/0003-Rename-symbol-to-prevent-conflict.patch
--
2.28.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/2] package/mongrel2: fix build with gcc 10
2020-09-05 12:42 [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Fabrice Fontaine
@ 2020-09-05 12:42 ` Fabrice Fontaine
2020-09-09 20:39 ` Peter Korsgaard
2020-09-06 7:50 ` [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Yann E. MORIN
2020-09-09 20:39 ` Peter Korsgaard
2 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2020-09-05 12:42 UTC (permalink / raw)
To: buildroot
Fixes:
- http://autobuild.buildroot.org/results/858488774503c6cc6a5489bc1e080562f5fc6461
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...ition-error-when-building-with-gcc10.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 package/mongrel2/0004-fix-multiple-definition-error-when-building-with-gcc10.patch
diff --git a/package/mongrel2/0004-fix-multiple-definition-error-when-building-with-gcc10.patch b/package/mongrel2/0004-fix-multiple-definition-error-when-building-with-gcc10.patch
new file mode 100644
index 0000000000..e1b5788494
--- /dev/null
+++ b/package/mongrel2/0004-fix-multiple-definition-error-when-building-with-gcc10.patch
@@ -0,0 +1,25 @@
+From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001
+From: Andrew Sun <adsun701@gmail.com>
+Date: Sat, 18 Jul 2020 09:11:11 -0400
+Subject: [PATCH] fix multiple definition error when building with gcc10
+
+[Retrieved from:
+https://github.com/mongrel2/mongrel2/pull/343/commits/c51815b10c39c6e802bd1b56549f1d479b480fcc]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/unixy.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixy.h b/src/unixy.h
+index 045e7c28..4225220c 100644
+--- a/src/unixy.h
++++ b/src/unixy.h
+@@ -38,7 +38,7 @@
+ #include <bstring.h>
+ #include <unistd.h>
+
+-char *m2program;
++extern char *m2program;
+
+ int Unixy_chroot(bstring path);
+
--
2.28.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches
2020-09-05 12:42 [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Fabrice Fontaine
2020-09-05 12:42 ` [Buildroot] [PATCH 2/2] package/mongrel2: fix build with gcc 10 Fabrice Fontaine
@ 2020-09-06 7:50 ` Yann E. MORIN
2020-09-09 20:39 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2020-09-06 7:50 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-09-05 14:42 +0200, Fabrice Fontaine spake thusly:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Both patches applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> .../{0002-Do-not-run-tests.patch => 0001-Do-not-run-tests.patch} | 0
> ...ation.patch => 0002-Fix-Makefiles-for-cross-compilation.patch} | 0
> ...onflict.patch => 0003-Rename-symbol-to-prevent-conflict.patch} | 0
> 3 files changed, 0 insertions(+), 0 deletions(-)
> rename package/mongrel2/{0002-Do-not-run-tests.patch => 0001-Do-not-run-tests.patch} (100%)
> rename package/mongrel2/{0003-Fix-Makefiles-for-cross-compilation.patch => 0002-Fix-Makefiles-for-cross-compilation.patch} (100%)
> rename package/mongrel2/{0004-Rename-symbol-to-prevent-conflict.patch => 0003-Rename-symbol-to-prevent-conflict.patch} (100%)
>
> diff --git a/package/mongrel2/0002-Do-not-run-tests.patch b/package/mongrel2/0001-Do-not-run-tests.patch
> similarity index 100%
> rename from package/mongrel2/0002-Do-not-run-tests.patch
> rename to package/mongrel2/0001-Do-not-run-tests.patch
> diff --git a/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch b/package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch
> similarity index 100%
> rename from package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch
> rename to package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch
> diff --git a/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch b/package/mongrel2/0003-Rename-symbol-to-prevent-conflict.patch
> similarity index 100%
> rename from package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch
> rename to package/mongrel2/0003-Rename-symbol-to-prevent-conflict.patch
> --
> 2.28.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches
2020-09-05 12:42 [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Fabrice Fontaine
2020-09-05 12:42 ` [Buildroot] [PATCH 2/2] package/mongrel2: fix build with gcc 10 Fabrice Fontaine
2020-09-06 7:50 ` [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Yann E. MORIN
@ 2020-09-09 20:39 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2020-09-09 20:39 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-09 20:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-05 12:42 [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Fabrice Fontaine
2020-09-05 12:42 ` [Buildroot] [PATCH 2/2] package/mongrel2: fix build with gcc 10 Fabrice Fontaine
2020-09-09 20:39 ` Peter Korsgaard
2020-09-06 7:50 ` [Buildroot] [PATCH 1/2] package/mongrel2: renumber patches Yann E. MORIN
2020-09-09 20:39 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox