1 |
commit: 59f83e4a05fb899f95a296cdfe5c2954050969d2 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 7 19:10:40 2020 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 9 18:25:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f83e4a |
7 |
|
8 |
dev-embedded/arduino: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17457 |
13 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
14 |
|
15 |
.../files/arduino-1.8.5-avr-platform.txt.patch | 26 ------------------ |
16 |
.../arduino/files/arduino-1.8.5-build.xml.patch | 31 ---------------------- |
17 |
2 files changed, 57 deletions(-) |
18 |
|
19 |
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch |
20 |
deleted file mode 100644 |
21 |
index 9903da46dc4..00000000000 |
22 |
--- a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch |
23 |
+++ /dev/null |
24 |
@@ -1,26 +0,0 @@ |
25 |
-diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt |
26 |
-index f7fb447c1..8ae8b73d9 100644 |
27 |
---- a/hardware/arduino/avr/platform.txt |
28 |
-+++ b/hardware/arduino/avr/platform.txt |
29 |
-@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall |
30 |
- compiler.warning_flags.all=-Wall -Wextra |
31 |
- |
32 |
- # Default "compiler.path" is correct, change only if you want to override the initial value |
33 |
--compiler.path={runtime.tools.avr-gcc.path}/bin/ |
34 |
-+compiler.path=/usr/bin/ |
35 |
- compiler.c.cmd=avr-gcc |
36 |
- compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects |
37 |
- compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections |
38 |
-@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} { |
39 |
- # AVR Uploader/Programmers tools |
40 |
- # ------------------------------ |
41 |
- |
42 |
--tools.avrdude.path={runtime.tools.avrdude.path} |
43 |
--tools.avrdude.cmd.path={path}/bin/avrdude |
44 |
--tools.avrdude.config.path={path}/etc/avrdude.conf |
45 |
-+tools.avrdude.path=/usr |
46 |
-+tools.avrdude.cmd.path=/usr/bin/avrdude |
47 |
-+tools.avrdude.config.path=/etc/avrdude.conf |
48 |
- |
49 |
- tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA |
50 |
- |
51 |
|
52 |
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch |
53 |
deleted file mode 100644 |
54 |
index 59d796ca5a7..00000000000 |
55 |
--- a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch |
56 |
+++ /dev/null |
57 |
@@ -1,31 +0,0 @@ |
58 |
-diff --git a/build/build.xml b/build/build.xml |
59 |
-index d95f8def6..13ba60286 100644 |
60 |
---- a/build/build.xml |
61 |
-+++ b/build/build.xml |
62 |
-@@ -641,7 +641,7 @@ |
63 |
- </chmod> |
64 |
- </target> |
65 |
- |
66 |
-- <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch"> |
67 |
-+ <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never"> |
68 |
- <antcall target="unzip"> |
69 |
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" /> |
70 |
- <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" /> |
71 |
-@@ -666,7 +666,7 @@ |
72 |
- |
73 |
- </target> |
74 |
- |
75 |
-- <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM"> |
76 |
-+ <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never"> |
77 |
- <antcall target="unzip"> |
78 |
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" /> |
79 |
- <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" /> |
80 |
-@@ -1186,7 +1186,7 @@ |
81 |
- depends="linux-clean, windows-clean, macosx-clean, subprojects-clean"> |
82 |
- </target> |
83 |
- |
84 |
-- <target name="avr-toolchain-bundle" unless="light_bundle"> |
85 |
-+ <target name="avr-toolchain-bundle" if="never"> |
86 |
- <!-- Unzip AVR tools --> |
87 |
- <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/> |
88 |
- |