diff options
| author | SammysHP | 2022-02-19 18:49:02 +0100 |
|---|---|---|
| committer | SammysHP | 2022-02-19 18:49:02 +0100 |
| commit | a8644a376775dcd022d4ce6e6c5ffb69bd64ea47 (patch) | |
| tree | 70ee64d1e56807ed67274f63bf2b454be9f74938 | |
| parent | 24993522e81a07244af14608042459253a29a9c7 (diff) | |
| download | aur-a8644a376775dcd022d4ce6e6c5ffb69bd64ea47.tar.gz | |
Use official repository
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 69 | ||||
| -rw-r--r-- | gtest-flags.patch | 13 |
4 files changed, 59 insertions, 50 deletions
@@ -1,15 +1,21 @@ pkgbase = simulavr-git - pkgdesc = A simulator for the Atmel AVR family of microcontrollers. - pkgver = r890.a12e85f - pkgrel = 2 - url = https://github.com/Traumflug/simulavr + pkgdesc = A simulator for the Atmel AVR family of microcontrollers + pkgver = 1.1.0.r5.g32985f7 + pkgrel = 1 + url = https://www.nongnu.org/simulavr/ arch = x86_64 - arch = i686 license = GPL2 - source = simulavr-git::git+https://github.com/Traumflug/simulavr#branch=traumflug - source = gtest-flags.patch + makedepends = cmake + makedepends = git + makedepends = help2man + makedepends = iverilog + makedepends = python + makedepends = swig + makedepends = tcl + makedepends = texinfo + provides = simulavr + conflicts = simulavr + source = simulavr-git::git+https://git.savannah.nongnu.org/git/simulavr.git sha256sums = SKIP - sha256sums = a016162419acd85baff083d5380394da0add0b5b0297cc37ba3bddbb641b148c pkgname = simulavr-git - diff --git a/.gitignore b/.gitignore index 4d27b09a7053..2928b7849809 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ src pkg simulavr-git -*pkg.tar.xz -tags +*pkg.tar.* @@ -1,42 +1,59 @@ -# Maintainer: Tony Lambiris <tony@libpcap.net> +# Maintainer: Sven Karsten Greiner <sven@sammyshp.de> +# Contributor: Tony Lambiris <tony@libpcap.net> pkgname=simulavr-git -pkgver=r890.a12e85f -pkgrel=2 -pkgdesc="A simulator for the Atmel AVR family of microcontrollers." -url="https://github.com/Traumflug/simulavr" -arch=('x86_64' 'i686') +pkgver=1.1.0.r5.g32985f7 +pkgrel=1 +pkgdesc='A simulator for the Atmel AVR family of microcontrollers' +arch=('x86_64') +url='https://www.nongnu.org/simulavr/' license=('GPL2') -source=("${pkgname}::git+https://github.com/Traumflug/simulavr#branch=traumflug" - "gtest-flags.patch") -sha256sums=('SKIP' - 'a016162419acd85baff083d5380394da0add0b5b0297cc37ba3bddbb641b148c') +depends=() +# Required dependencies for ... +# core: cmake git python +# doc: help2man texinfo +# tcl: tcl swig +# python: python swig +# verilog: iverilog +# +# Full documentation requires also: +# doxygen dot python-sphinx rst2pdf python-beautifulsoup4 python-requests +# +# To run tests: avr-gcc avr-libc valgrind +makedepends=('cmake' 'git' 'help2man' 'iverilog' 'python' 'swig' 'tcl' 'texinfo') +provides=('simulavr') +conflicts=('simulavr') +source=("${pkgname}::git+https://git.savannah.nongnu.org/git/simulavr.git") +sha256sums=('SKIP') pkgver() { - cd "${srcdir}/${pkgname}" - - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare() { - cd "${srcdir}/${pkgname}" - - patch -p1 -i "${srcdir}/gtest-flags.patch" + cd "${srcdir}/${pkgname}" + git describe --long --tags --match 'release-*' | sed 's/^release-//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}" - ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var #--disable-doxygen-doc --enable-dependency-tracking + cmake -S . -B build \ + -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/" \ + -DBUILD_TCL=ON \ + -DBUILD_PYTHON=ON \ + -DBUILD_VERILOG=ON - make + make -j1 -C build + make -j1 -C build progdoc } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}/build" + + make -j1 install - make DESTDIR="$pkgdir" install + mv "${pkgdir}/usr/share/doc/common" "${pkgdir}/usr/share/doc/simulavr" - install -Dm644 "doc/license.rst" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Headers are moved into their own subdirectory to prevent conflicts. + # Might cause issues when using them. + mv "${pkgdir}/usr/include" "${pkgdir}/usr/include-simulavr" + mkdir "${pkgdir}/usr/include" + mv "${pkgdir}/usr/include-simulavr" "${pkgdir}/usr/include/simulavr" } diff --git a/gtest-flags.patch b/gtest-flags.patch deleted file mode 100644 index e3faf34c69e3..000000000000 --- a/gtest-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/regress/gtest/Makefile.am b/regress/gtest/Makefile.am -index 37743a5..5a943df 100644 ---- a/regress/gtest/Makefile.am -+++ b/regress/gtest/Makefile.am -@@ -7,7 +7,7 @@ GTEST_OBJS = gtest-1.6.0/src/gtest-all.cc - - GTEST_INCLUDE = -Igtest-1.6.0/include/gtest -Igtest-1.6.0/include -Igtest-1.6.0 - --GTEST_CXXFLAGS = -Dprivate=public -Dprotected=public -+#GTEST_CXXFLAGS = -Dprivate=public -Dprotected=public - - GTEST_EXTRA_FILES = gtest-1.6.0/src/gtest-internal-inl.h \ - gtest-1.6.0/src/gtest-filepath.cc \ |