diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2021-10-03 12:32:07 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2021-10-04 08:18:25 +0200 |
| commit | a95affc10d5cab023284bb3a48c706694d4d253a (patch) | |
| tree | e43a78cdba8091d5633a561a3122f22f76dce3ac /testing/openocd-git/APKBUILD | |
| parent | 008668ff4156d2324e5443872c2da4706805c54b (diff) | |
| download | aports-a95affc10d5cab023284bb3a48c706694d4d253a.tar.gz aports-a95affc10d5cab023284bb3a48c706694d4d253a.tar.bz2 aports-a95affc10d5cab023284bb3a48c706694d4d253a.tar.xz | |
testing/openocd-git: use packaged versions of jimtcl and libjaylink
OpenOCD vendors version 0.80 of jimtcl and version 0.2 of libjaylink
both of these are available as binary packages. As such, it makes more
sense to just use the packages instead.
Diffstat (limited to 'testing/openocd-git/APKBUILD')
| -rw-r--r-- | testing/openocd-git/APKBUILD | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/testing/openocd-git/APKBUILD b/testing/openocd-git/APKBUILD index 1807668e5d..4bc0a4bd36 100644 --- a/testing/openocd-git/APKBUILD +++ b/testing/openocd-git/APKBUILD @@ -2,32 +2,26 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> _pkgname=openocd _commit=28c91b8f80937e6ec6521496f363038d9a5f9a04 -_jimtcl_commit=fb923fab4f0cf276c336d98692d00df6a943791d -_libjaylink_commit=9aa7a5957c07bb6e862fc1a6d3153d109c7407e4 pkgname=$_pkgname-git pkgver=20210702 -pkgrel=0 +pkgrel=1 pkgdesc="Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" url="http://openocd.org/" arch="all" license="GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only" -makedepends="libftdi1-dev libusb-dev hidapi-dev libtool autoconf automake" +makedepends="libftdi1-dev libusb-dev hidapi-dev jimtcl-dev + libjaylink-dev libtool autoconf automake" provides="openocd" subpackages="$pkgname-dev $pkgname-doc" # Note: Using a github mirror here as sourceforge git snapshots have changing checksums source="$_pkgname-$_commit.tar.gz::https://github.com/ntfreak/openocd/archive/$_commit.tar.gz - jimtcl-$_jimtcl_commit.tar.gz::https://github.com/msteveb/jimtcl/archive/$_jimtcl_commit.tar.gz - libjaylink-$_libjaylink_commit.tar.gz::https://repo.or.cz/libjaylink.git/snapshot/$_libjaylink_commit.tar.gz - " + fix-jimtcl-link.patch + fix-dynamic-linking.patch" builddir="$srcdir/$_pkgname-$_commit" prepare() { default_prepare - rmdir jimtcl - ln -s ../jimtcl-$_jimtcl_commit jimtcl - rmdir src/jtag/drivers/libjaylink - ln -s "../../../../libjaylink-${_libjaylink_commit:0:7}" src/jtag/drivers/libjaylink - ./bootstrap + ./bootstrap nosubmodule } build() { @@ -41,7 +35,9 @@ build() { --disable-werror \ --enable-cmsis-dap \ --enable-sysfsgpio \ - --enable-bcm2835gpio + --enable-bcm2835gpio \ + --disable-internal-jimtcl \ + --disable-internal-libjaylink make } @@ -55,6 +51,6 @@ package() { sha512sums=" c1f02277262ec3cc168b18a71d436a123f08e5246e35f94e37c922618c9d91e34b8ca525eed1f93a2ce37315f23c6d9a6a8f88ca4c2bc16bc3e432127ffcd70d openocd-28c91b8f80937e6ec6521496f363038d9a5f9a04.tar.gz -faa6a1e490715da83bac3f7e5115d53803a50401689b4e36f7694598470d263e4ce8744647d11e6c2b2d8e10eae08d6213f31b0b883848b67659ef93cb8f3ed9 jimtcl-fb923fab4f0cf276c336d98692d00df6a943791d.tar.gz -bf7f342033e79fde5a023661b90deb2b9b7de4ba94fa79cca8b0ae00c6f335ed4b14554dbef8bfcf87b69484508ad7ac9aab8d35b1e3028ad00e2ac29e948fe9 libjaylink-9aa7a5957c07bb6e862fc1a6d3153d109c7407e4.tar.gz +6fd2fbe11917bb7f181ba67812f63e75d51bcd19e4df6a7e22e1abb8f36a4f4bdc9202e815f560476ec184d54d84df8ae4dceb17f2429b9dc1d9503804dacb03 fix-jimtcl-link.patch +a0980806af54bafd759c2e329cd11eabf0eb352f7f823966ab0f4a60508559fb7abd41072c0a882da0906ddf086ee139115deca04bb1a70ab915b50a1d3fc2e7 fix-dynamic-linking.patch " |