diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0002-Makefile-add-GPRBUILD_FLAGS-variable.patch | 60 | ||||
| -rw-r--r-- | 0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch | 60 | ||||
| -rw-r--r-- | PKGBUILD | 67 | ||||
| -rw-r--r-- | workaround-gnat-bug.patch | 13 |
5 files changed, 169 insertions, 55 deletions
@@ -1,17 +1,19 @@ pkgbase = libadalang-tools - pkgdesc = Libadalang-based tools: gnatpp, gnatmetric and gnatstub - pkgver = 2018 - pkgrel = 2 + pkgdesc = Libadalang-based tools for Ada: gnatpp, gnatmetric and gnatstub. + pkgver = 24.0w + pkgrel = 1 + epoch = 1 url = https://github.com/AdaCore/libadalang-tools arch = i686 arch = x86_64 - license = GPL - makedepends = gprbuild>=2018 - depends = libadalang>=2018 - source = http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 - source = workaround-gnat-bug.patch - sha1sums = 034e5443a94336f6aca020c916ddf8f30598f8bf - sha1sums = 366bc80b768bbb15993b3e896c7aa28ee6f8b2da + license = GPL3 + makedepends = gprbuild + makedepends = gpr + makedepends = which + depends = libadalang + depends = templates_parser + depends = libvss + source = https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/libadalang-tools-24.0w-20230324-166A6-src.tar.gz + sha256sums = 13837105dcb3e474ff96bcb530590e7404b87948c98ea33e05fa5a505eff76a5 pkgname = libadalang-tools - diff --git a/0002-Makefile-add-GPRBUILD_FLAGS-variable.patch b/0002-Makefile-add-GPRBUILD_FLAGS-variable.patch new file mode 100644 index 000000000000..c551c675746e --- /dev/null +++ b/0002-Makefile-add-GPRBUILD_FLAGS-variable.patch @@ -0,0 +1,60 @@ +From e29b65259c26215749b13f1c44d3d840a6731f25 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +Date: Tue, 13 Jul 2021 15:04:14 +0200 +Subject: [PATCH 2/3] Makefile: add GPRBUILD_FLAGS variable + +--- + Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 68f738f2..5e75e50c 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,6 +5,7 @@ BUILD_MODE ?= dev + LIBRARY_TYPE ?= static + LALTOOLS_SET ?= all + PROCESSORS ?= 0 ++GPRBUILD_FLAGS ?= + + ALL_LIBRARY_TYPES = static static-pic relocatable + +@@ -37,7 +38,7 @@ lib: + gprbuild -v -k \ + -XLIBRARY_TYPE=$$kind \ + -XBUILD_MODE=$(BUILD_MODE) \ +- -P $$proj -p -j$(PROCESSORS) ; \ ++ -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ + done ; \ + done + +@@ -51,7 +52,7 @@ bin: + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ + -XLALTOOLS_SET=$(LALTOOLS_SET) \ +- -P $$proj -p -j$(PROCESSORS) ; \ ++ -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ + done + + .PHONY: testsuite_drivers +@@ -64,7 +65,7 @@ testsuite_drivers: + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ + -XLALTOOLS_SET=$(LALTOOLS_SET) \ +- -P $$proj -p -j$(PROCESSORS) ; \ ++ -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ + done + + .PHONY: all +@@ -77,7 +78,7 @@ all: + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ + -XLALTOOLS_SET=$(LALTOOLS_SET) \ +- -P $$proj -p -j$(PROCESSORS) ; \ ++ -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ + done + + +-- +2.32.0 + diff --git a/0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch b/0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch new file mode 100644 index 000000000000..6657cf7fc582 --- /dev/null +++ b/0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch @@ -0,0 +1,60 @@ +From 7f35a68f9d72fa266ed1b5ffa93037c96ed5fe77 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +Date: Tue, 13 Jul 2021 15:21:19 +0200 +Subject: [PATCH 3/3] Makefile: don't force -j to be passed to gprbuild + +--- + Makefile | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 5e75e50c..66604550 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,6 @@ + BUILD_MODE ?= dev + LIBRARY_TYPE ?= static + LALTOOLS_SET ?= all +-PROCESSORS ?= 0 + GPRBUILD_FLAGS ?= + + ALL_LIBRARY_TYPES = static static-pic relocatable +@@ -38,7 +37,7 @@ lib: + gprbuild -v -k \ + -XLIBRARY_TYPE=$$kind \ + -XBUILD_MODE=$(BUILD_MODE) \ +- -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ ++ -P $$proj -p $(GPRBUILD_FLAGS) ; \ + done ; \ + done + +@@ -52,7 +51,7 @@ bin: + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ + -XLALTOOLS_SET=$(LALTOOLS_SET) \ +- -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ ++ -P $$proj -p $(GPRBUILD_FLAGS) ; \ + done + + .PHONY: testsuite_drivers +@@ -65,7 +64,7 @@ testsuite_drivers: + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ + -XLALTOOLS_SET=$(LALTOOLS_SET) \ +- -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ ++ -P $$proj -p $(GPRBUILD_FLAGS) ; \ + done + + .PHONY: all +@@ -78,7 +77,7 @@ all: + -XXMLADA_BUILD=$(LIBRARY_TYPE) \ + -XBUILD_MODE=$(BUILD_MODE) \ + -XLALTOOLS_SET=$(LALTOOLS_SET) \ +- -P $$proj -p -j$(PROCESSORS) $(GPRBUILD_FLAGS) ; \ ++ -P $$proj -p $(GPRBUILD_FLAGS) ; \ + done + + +-- +2.32.0 + @@ -1,47 +1,52 @@ -# Maintainer: Rod Kay <charlie5 on #ada at freenode.net> +# Maintainer: Rod Kay <rodakay5 at gmail dot com> # Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net> pkgname=libadalang-tools -pkgver=2018 -pkgrel=2 +pkgdesc='Libadalang-based tools for Ada: gnatpp, gnatmetric and gnatstub.' +pkgver=24.0w +pkgrel=1 +epoch=1 -pkgdesc="Libadalang-based tools: gnatpp, gnatmetric and gnatstub" -url='https://github.com/AdaCore/libadalang-tools' -arch=('i686' 'x86_64') -license=('GPL') +url=https://github.com/AdaCore/libadalang-tools +arch=(i686 x86_64) +license=(GPL3) -depends=('libadalang>=2018') -makedepends=("gprbuild>=2018") +depends=(libadalang templates_parser libvss) +makedepends=(gprbuild gpr which) -source=('http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59' - 'workaround-gnat-bug.patch') -sha1sums=('034e5443a94336f6aca020c916ddf8f30598f8bf' - '366bc80b768bbb15993b3e896c7aa28ee6f8b2da') +source=(https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/$pkgname-$pkgver-20230324-166A6-src.tar.gz) +sha256sums=(13837105dcb3e474ff96bcb530590e7404b87948c98ea33e05fa5a505eff76a5) -prepare() -{ - cd "$srcdir/libadalang-tools-src" - patch -Np0 -i "$srcdir/workaround-gnat-bug.patch" -} -build() +build() { - cd "$srcdir/libadalang-tools-src" + cd $srcdir/$pkgname-$pkgver-20230428-1627A-src - # In order to build the generated library, Langkit expects the QUEX_PATH to - # be set. - source /etc/profile.d/quex.sh + export BUILD_MODE=prod + make lib - make -j1 BUILD_MODE=prod LIBRARY_TYPE=relocatable + LIBRARY_TYPE=relocatable \ + make bin } + package() { - cd "$srcdir/libadalang-tools-src" + cd $srcdir/$pkgname-$pkgver-20230428-1627A-src - mkdir -p "$pkgdir/usr/bin" - for program in gnatpp gnatmetric gnatstub - do - install -m755 bin/$program "$pkgdir/usr/bin/" - done -} + export DESTDIR=$pkgdir/usr + export BUILD_MODE=prod + + make install-lib + make install-bin-strip + + # Install the licenses. + # + install -D -m644 \ + LICENSE \ + $pkgdir/usr/share/licenses/$pkgname/LICENSE + + install -D -m644 \ + COPYING3 \ + $pkgdir/usr/share/licenses/$pkgname/COPYING3 +}
\ No newline at end of file diff --git a/workaround-gnat-bug.patch b/workaround-gnat-bug.patch deleted file mode 100644 index bd4326016e18..000000000000 --- a/workaround-gnat-bug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/pp-formatting.adb src/pp-formatting.adb -index c4539a77..5da22b54 100644 ---- src/pp-formatting.adb -+++ src/pp-formatting.adb -@@ -60,7 +60,8 @@ package body Pp.Formatting is - - subtype Ada_Node is Libadalang.Analysis.Ada_Node; - use type Ada_Node; -- function Is_Null (Tree : Ada_Node) return Boolean is (Tree.Is_Null); -+ function Is_Null (Tree : Ada_Node) return Boolean is -+ (Libadalang.Analysis.Is_Null (Tree)); - function T_Img (Tree : Ada_Node) return String is - (Libadalang.Analysis.Short_Image (Tree)); |