commit: 45de522eb99a6a1cc619ffb1f69b748133da347b Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Dec 28 14:15:33 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 28 14:15:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45de522e
dev-embedded/openocd: Fix build with gcc-10 * Drop unused eclasses Closes: https://bugs.gentoo.org/722640 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../openocd/files/openocd-0.10.0-fno-common.patch | 11 ++ dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 125 +++++++-------------- 2 files changed, 52 insertions(+), 84 deletions(-) diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch new file mode 100644 index 00000000000..c924b2f8fec --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -35,7 +35,7 @@ struct bitbang_interface { + void (*swdio_drive)(bool on); + }; + +-const struct swd_driver bitbang_swd; ++extern const struct swd_driver bitbang_swd; + + extern bool swd_mode; + diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 1934a0ba1a0..14fbf084e90 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; + EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -36,9 +35,10 @@ RDEPEND=" ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) PATCHES=( "${FILESDIR}/${P}-gcc10.patch" @@ -47,99 +47,56 @@ PATCHES=( src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use jlink; then - myconf+=( - --enable-jlink - ) - else - myconf+=( - --disable-jlink - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb-blaster - --enable-openjtag - --enable-presto - ) - else - myconf+=( - --disable-openjtag - --disable-presto - --disable-usb-blaster - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_install() { default dostrip /usr/bin - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules } pkg_postinst() {
