* [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/
@ 2020-11-10 15:49 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2020-11-10 15:49 UTC (permalink / raw
To: gentoo-commits
commit: b97c59e62c6ea7ebc5a5c8f032b65420b8e75ff3
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 15:33:29 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 15:49:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97c59e6
sys-apps/flashrom-1.2-r3: support building without bitbang_spi back-end
In meson.build, config_bitbang_spi would be set to true in the event of
the user having enabled any of the programmers requiring it - but *left
undefined* otherwise. Initialise it to false so that even when no such
programmers are enable, the 'if config_bitbang_spi' test does not
produce an error.
Bug: https://bugs.gentoo.org/720210
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../flashrom/files/flashrom-1.2_meson-fixes.patch | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
index 84dec173676..03612fb71ad 100644
--- a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
@@ -8,17 +8,18 @@
config_linux_mtd = get_option('config_linux_mtd')
config_linux_spi = get_option('config_linux_spi')
config_mstarddc_spi = get_option('config_mstarddc_spi')
-@@ -67,6 +68,9 @@
+@@ -67,6 +68,10 @@
deps = []
srcs = []
++config_bitbang_spi = false
+need_libftdi = false
+need_libpci = false
+need_libusb = false
need_raw_access = false
need_serial = false
-@@ -81,24 +85,24 @@
+@@ -81,24 +86,24 @@
add_project_arguments('-DHAVE_UTSNAME=1', language : 'c')
endif
@@ -55,7 +56,7 @@
config_atahpt = false
config_atapromise = false
config_atavia = false
-@@ -121,14 +125,17 @@
+@@ -121,14 +126,17 @@
# set defines for configured programmers
if config_atahpt
srcs += 'atahpt.c'
@@ -73,7 +74,7 @@
cargs += '-DCONFIG_ATAVIA=1'
endif
if config_buspirate_spi
-@@ -138,22 +145,27 @@
+@@ -138,22 +146,27 @@
endif
if config_ch341a_spi
srcs += 'ch341a_spi.c'
@@ -101,7 +102,7 @@
cargs += '-DCONFIG_DRKAISER=1'
endif
if config_dummy
-@@ -162,12 +174,13 @@
+@@ -162,12 +175,13 @@
endif
if config_ft2232_spi
srcs += 'ft2232_spi.c'
@@ -116,7 +117,7 @@
cargs += '-DCONFIG_GFXNVIDIA=1'
endif
if config_internal
-@@ -186,6 +199,7 @@
+@@ -186,6 +200,7 @@
srcs += 'sb600spi.c'
srcs += 'wbsio_spi.c'
endif
@@ -124,7 +125,7 @@
config_bitbang_spi = true
cargs += '-DCONFIG_INTERNAL=1'
if get_option('config_internal_dmi')
-@@ -195,6 +209,7 @@
+@@ -195,6 +210,7 @@
endif
if config_it8212
srcs += 'it8212.c'
@@ -132,7 +133,7 @@
cargs += '-DCONFIG_IT8212=1'
endif
if config_linux_mtd
-@@ -211,36 +226,44 @@
+@@ -211,36 +227,44 @@
endif
if config_nic3com
srcs += 'nic3com.c'
@@ -177,7 +178,7 @@
cargs += '-DCONFIG_PICKIT2_SPI=1'
endif
if config_pony_spi
-@@ -252,15 +275,18 @@
+@@ -252,15 +276,18 @@
if config_rayer_spi
srcs += 'rayer_spi.c'
config_bitbang_spi = true
@@ -196,7 +197,7 @@
cargs += '-DCONFIG_SATASII=1'
endif
if config_serprog
-@@ -270,12 +296,19 @@
+@@ -270,12 +297,19 @@
endif
if config_usbblaster_spi
srcs += 'usbblaster_spi.c'
@@ -216,7 +217,7 @@
# bitbanging SPI infrastructure
if config_bitbang_spi
-@@ -296,6 +329,25 @@
+@@ -296,6 +330,25 @@
srcs += 'serial.c'
endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/
@ 2020-11-10 16:26 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2020-11-10 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 46619bab75eea621eae5dba53d0c5e11c0263c3b
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 16:20:29 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 16:26:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46619bab
sys-apps/flashrom-1.2-r3: fix raw-access dependencies
This should allow Meson to successfully build flashrom without
rayer-spi support but with any of the other drivers requiring raw access
to hardware.
Bug: https://bugs.gentoo.org/720210
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../flashrom/files/flashrom-1.2_meson-fixes.patch | 34 ++++++++++++++++------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
index 03612fb71ad..a60e4030fca 100644
--- a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
@@ -56,25 +56,28 @@
config_atahpt = false
config_atapromise = false
config_atavia = false
-@@ -121,14 +126,17 @@
+@@ -121,14 +126,20 @@
# set defines for configured programmers
if config_atahpt
srcs += 'atahpt.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_ATAHPT=1'
endif
if config_atapromise
srcs += 'atapromise.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_ATAPROMISE=1'
endif
if config_atavia
srcs += 'atavia.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_ATAVIA=1'
endif
if config_buspirate_spi
-@@ -138,22 +146,27 @@
+@@ -138,22 +149,28 @@
endif
if config_ch341a_spi
srcs += 'ch341a_spi.c'
@@ -99,10 +102,11 @@
if config_drkaiser
srcs += 'drkaiser.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_DRKAISER=1'
endif
if config_dummy
-@@ -162,12 +175,13 @@
+@@ -162,12 +179,14 @@
endif
if config_ft2232_spi
srcs += 'ft2232_spi.c'
@@ -114,62 +118,72 @@
if config_gfxnvidia
srcs += 'gfxnvidia.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_GFXNVIDIA=1'
endif
if config_internal
-@@ -186,6 +200,7 @@
+@@ -186,6 +205,8 @@
srcs += 'sb600spi.c'
srcs += 'wbsio_spi.c'
endif
+ need_libpci = true
++ need_raw_access = true
config_bitbang_spi = true
cargs += '-DCONFIG_INTERNAL=1'
if get_option('config_internal_dmi')
-@@ -195,6 +210,7 @@
+@@ -195,6 +216,8 @@
endif
if config_it8212
srcs += 'it8212.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_IT8212=1'
endif
if config_linux_mtd
-@@ -211,36 +227,44 @@
+@@ -211,36 +234,51 @@
endif
if config_nic3com
srcs += 'nic3com.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_NIC3COM=1'
endif
if config_nicintel
srcs += 'nicintel.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_NICINTEL=1'
endif
if config_nicintel_eeprom
srcs += 'nicintel_eeprom.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_NICINTEL_EEPROM=1'
endif
if config_nicintel_spi
srcs += 'nicintel_spi.c'
+ need_libpci = true
++ need_raw_access = true
config_bitbang_spi = true
cargs += '-DCONFIG_NICINTEL_SPI=1'
endif
if config_nicnatsemi
srcs += 'nicnatsemi.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_NICNATSEMI=1'
endif
if config_nicrealtek
srcs += 'nicrealtek.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_NICREALTEK=1'
endif
if config_ogp_spi
config_bitbang_spi = true
srcs += 'ogp_spi.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_OGP_SPI=1'
endif
if config_pickit2_spi
@@ -178,7 +192,7 @@
cargs += '-DCONFIG_PICKIT2_SPI=1'
endif
if config_pony_spi
-@@ -252,15 +276,18 @@
+@@ -252,15 +290,20 @@
if config_rayer_spi
srcs += 'rayer_spi.c'
config_bitbang_spi = true
@@ -189,15 +203,17 @@
if config_satamv
srcs += 'satamv.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_SATAMV=1'
endif
if config_satasii
srcs += 'satasii.c'
+ need_libpci = true
++ need_raw_access = true
cargs += '-DCONFIG_SATASII=1'
endif
if config_serprog
-@@ -270,12 +297,19 @@
+@@ -270,12 +313,19 @@
endif
if config_usbblaster_spi
srcs += 'usbblaster_spi.c'
@@ -217,7 +233,7 @@
# bitbanging SPI infrastructure
if config_bitbang_spi
-@@ -296,6 +330,25 @@
+@@ -296,6 +346,25 @@
srcs += 'serial.c'
endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/
@ 2020-11-11 12:47 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2020-11-11 12:47 UTC (permalink / raw
To: gentoo-commits
commit: f3188587b9239347c58e9662ab903b2d929038b2
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 12:27:23 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 12:46:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3188587
sys-apps/flashrom-1.2-r3: meson: change c_std to from c99 to gnu99
Required on ppc64 (at least) due to the use of asm() in raw-hw-access code.
Interestingly enough, there is no mention of either gnu99 or c99 anywhere
in the Makefile so it might have worked by pure chance there.
Closes: https://bugs.gentoo.org/720210
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
index a60e4030fca..bb185fae822 100644
--- a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
@@ -1,5 +1,14 @@
--- a/meson.build
+++ b/meson.build
+@@ -2,7 +2,7 @@
+ version : run_command('util/getversion.sh', '-v').stdout().strip(),
+ license : 'GPL-2.0',
+ meson_version : '>=0.47.0',
+- default_options : ['warning_level=2', 'c_std=c99'],
++ default_options : ['warning_level=2', 'c_std=gnu99'],
+ )
+
+ # libtool versioning
@@ -44,6 +44,7 @@
config_gfxnvidia = get_option('config_gfxnvidia')
config_internal = get_option('config_internal')
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/
@ 2021-05-17 13:25 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-05-17 13:25 UTC (permalink / raw
To: gentoo-commits
commit: cd39544d0a52fff69c1a1c9bd95d5c21aec4a785
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 13:25:09 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon May 17 13:25:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd39544d
sys-apps/flashrom: cosmetic change to flashrom-9999_meson-fixes.patch
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
index 64d2cebff54..63c2e2ef755 100644
--- a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
@@ -242,14 +242,6 @@
# raw memory, MSR or PCI port I/O access
if need_raw_access
srcs += 'hwaccess.c'
-@@ -335,6 +381,7 @@ if need_serial
- srcs += 'serial.c'
- endif
-
-+
- prefix = get_option('prefix')
- sbindir = join_paths(prefix, get_option('sbindir'))
- libdir = join_paths(prefix, get_option('libdir'))
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,6 @@
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-17 13:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-11 12:47 [gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2021-05-17 13:25 Marek Szuba
2020-11-10 16:26 Marek Szuba
2020-11-10 15:49 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox