diff options
Diffstat (limited to 'dev-libs/cyberjack')
| -rw-r--r-- | dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild | 8 | ||||
| -rw-r--r-- | dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild index 53d0aee2a30f..0f367ddb0929 100644 --- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild +++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild @@ -31,13 +31,7 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P/_/-}" CONFIG_CHECK="~USB_SERIAL_CYBERJACK" - -pkg_setup() { - # Add workaround for GCC-10, - # by defining narrowing as warning like GCC-9 did. - # Upstream is working on that. - append-cxxflags -Wno-narrowing -} +PATCHES="${FILESDIR}/${P}-gcc10.patch" src_prepare() { default diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch new file mode 100644 index 000000000000..a91ee2e2ba42 --- /dev/null +++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p14-gcc10.patch @@ -0,0 +1,13 @@ +Fixes compilation with GCC10. + +--- a/ifd/ifd.cpp ++++ b/ifd/ifd.cpp +@@ -958,7 +958,7 @@ + else + l_atrLength=0; + rj=r->IfdPower(mode, Atr, &l_atrLength); +- switch (rj) { ++ switch (static_cast<NTSTATUS>(rj)) { + case STATUS_SUCCESS: + DEBUGLUN(Lun, DEBUG_MASK_IFD, "Success (ATR: %d bytes)\n", (int)l_atrLength); + rc=IFD_SUCCESS; |