Skip to contentSkip to conversation

package/mongrel2: renumber patches

PATCH New Fabrice Fontaine 3 participants 5 messages Sep 5, 2020 – Sep 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/mongrel2: renumber patches

---
 .../{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%)
package/mongrel2/0001-Do-not-run-tests.patch renamed from package/mongrel2/0002-Do-not-run-tests.patch +0 -0
similarity index 100%
rename from package/mongrel2/0002-Do-not-run-tests.patch
rename to package/mongrel2/0001-Do-not-run-tests.patch
package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch renamed from package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch +0 -0
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
package/mongrel2/0003-Rename-symbol-to-prevent-conflict.patch renamed from package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch +0 -0
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
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 package/mongrel2: fix build with gcc 10

Fixes:
- http://autobuild.buildroot.org/results/858488774503c6cc6a5489bc1e080562f5fc6461

---
 ...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
package/mongrel2/0004-fix-multiple-definition-error-when-building-with-gcc10.patch new file +25 -0
new file mode 100644
index 0000000000..e1b5788494
@@ -0,0 +1,25 @@
+From c51815b10c39c6e802bd1b56549f1d479b480fcc Mon Sep 17 00:00:00 2001
+From: Andrew Sun <[email protected]>
+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 <[email protected]>
+---
+ 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);
+ 
Signature · 1 line
2.28.0
#3 lore raw

PATCH 1/2 package/mongrel2: renumber patches

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-09-05 14:42 +0200, Fabrice Fontaine spake thusly:

Quoted 1 line

Both patches applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 28 lines
---
 .../{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%)
package/mongrel2/0001-Do-not-run-tests.patch renamed from package/mongrel2/0002-Do-not-run-tests.patch +0 -0
similarity index 100%
rename from package/mongrel2/0002-Do-not-run-tests.patch
rename to package/mongrel2/0001-Do-not-run-tests.patch
package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch renamed from package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch +0 -0
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
package/mongrel2/0003-Rename-symbol-to-prevent-conflict.patch renamed from package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch +0 -0
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
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'