X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id 36D125C51BF for ; Tue, 10 Jul 2018 07:56:25 +0000 (GMT) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 8A8BA40064 for ; Tue, 10 Jul 2018 09:56:23 +0200 (CEST) Received: from localhost.localdomain (unknown [193.175.2.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 45D664005F; Tue, 10 Jul 2018 09:56:23 +0200 (CEST) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [alpine-aports] [PATCH 1/2] testing/avarice: New aport Date: Tue, 10 Jul 2018 09:56:20 +0200 Message-Id: <20180710075621.32342-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.18.0 X-PMX-Version: 6.4.4.2767743, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2018.7.10.75116, AntiVirus-Engine: 5.50.0, AntiVirus-Data: 2018.7.9.5500002 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, RDNS_NXDOMAIN 0, RDNS_SUSP 0, RDNS_SUSP_GENERIC 0, __ANY_URI 0, __C230066_P5 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __INVOICE_MULTILINGUAL 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS , __URI_WITHOUT_PATH 0' X-Spam-Score: Gauge=IIIIIIII X-PMX-consideredAsSpam: no X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: AVaRICE interfaces with GDB and allows debugging of AVR MCUs http://avarice.sourceforge.net/ --- testing/avarice/APKBUILD | 38 +++++++++++++++++++++++++++ testing/avarice/fix_return_type.patch | 11 ++++++++ testing/avarice/pragma_gcc6.patch | 38 +++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 testing/avarice/APKBUILD create mode 100644 testing/avarice/fix_return_type.patch create mode 100644 testing/avarice/pragma_gcc6.patch diff --git a/testing/avarice/APKBUILD b/testing/avarice/APKBUILD new file mode 100644 index 0000000000..1e3816b397 --- /dev/null +++ b/testing/avarice/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Marian Buschsieweke +pkgname=avarice +pkgver=2.13 +pkgrel=0 +pkgdesc="AVaRICE interfaces with GDB and allows debugging of AVR MCUs" +url="http://avarice.sourceforge.net/" +arch="all" +license="GPL2" +makedepends="binutils-dev" +depends="gdb-avr" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + pragma_gcc6.patch + fix_return_type.patch" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="fa67e46061e32ec9db10bed961484ee050b219e92c2e9900ad35861b3c45161cc6ea6f2a9e63b0303242ef9992193cd963ac5871583db434409c10995b420b5f avarice-2.13.tar.bz2 +20ea177e6d6e476e0b46e4a827271ffb54658499ad0e80ce1462aaaaeebfe2dc1de0ae5b4d919296e34f361361322e93095a31e57b46cae36d9793b163e0780c pragma_gcc6.patch +976bcdd80bebe3e3f68e1f22f6cdc683a6daff3d4486f8be2c567ce4349001ec30bcddde1279aba06cccfe7a602a003a393e34dd68cd70d6889911da119181e8 fix_return_type.patch" diff --git a/testing/avarice/fix_return_type.patch b/testing/avarice/fix_return_type.patch new file mode 100644 index 0000000000..389e5b88fd --- /dev/null +++ b/testing/avarice/fix_return_type.patch @@ -0,0 +1,11 @@ +--- a/src/jtagrw.cc ++++ b/src/jtagrw.cc +@@ -131,7 +131,7 @@ + else + numLocations = (numBytes + 1) / 2; + if (numLocations > 256) +- return false; ++ return NULL; + + command[1] = whichSpace; + command[2] = numLocations - 1; diff --git a/testing/avarice/pragma_gcc6.patch b/testing/avarice/pragma_gcc6.patch new file mode 100644 index 0000000000..3f4cb3da99 --- /dev/null +++ b/testing/avarice/pragma_gcc6.patch @@ -0,0 +1,38 @@ +--- a/src/pragma.h ++++ b/src/pragma.h +@@ -26,32 +26,8 @@ + /* + * Evaluate which diagnostic pragmas can be used. + */ +-#if defined(__GNUC__) +-# if __GNUC__ > 4 +-# define PRAGMA_DIAG_PUSH _Pragma(GCC diagnostic push) +-# define PRAGMA_DIAG_POP _Pragma(GCC diagnostic pop) +-# define PRAGMA_DIAG_IGNORED(x) _Pragma(GCC diagnostic ignored x) +-# elif __GNUC__ == 4 +-# if __GNUC_MINOR__ >= 6 +-# define PRAGMA_DIAG_PUSH _Pragma("GCC diagnostic push") +-# define PRAGMA_DIAG_POP _Pragma("GCC diagnostic pop") +-# define PRAGMA_(x) _Pragma(#x) +-# define PRAGMA_DIAG_IGNORED(x) PRAGMA_(GCC diagnostic ignored x) +-# else +-# define PRAGMA_DIAG_PUSH +-# define PRAGMA_DIAG_POP +-# define PRAGMA_(x) _Pragma(#x) +-# define PRAGMA_DIAG_IGNORED(x) PRAGMA_(GCC diagnostic ignored x) +-# endif /* GCC 4.x */ +-# else /* too old */ +-# define PRAGMA_DIAG_PUSH +-# define PRAGMA_DIAG_POP +-# define PRAGMA_DIAG_IGNORED(x) +-# endif +-#else /* not GCC */ +-# define PRAGMA_DIAG_PUSH +-# define PRAGMA_DIAG_POP +-# define PRAGMA_DIAG_IGNORED(x) +-#endif ++#define PRAGMA_DIAG_PUSH ++#define PRAGMA_DIAG_POP ++#define PRAGMA_DIAG_IGNORED(x) + + #endif -- 2.18.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---