diff options
| author | Rod Kay | 2023-10-18 10:50:08 +1100 |
|---|---|---|
| committer | Rod Kay | 2023-10-18 10:52:12 +1100 |
| commit | bac524c76cd59c68fb91ef4dfcbe427357b9f850 (patch) | |
| tree | e5933b5e0dcf32334f4ac794a64702678415317b | |
| parent | 3d8af8a6ec00ffe3468bec5afa31e128457ab1de (diff) | |
| download | aur-gprbuild.tar.gz | |
Rename 'libgpr.so' to 'libgpr-gnat.so' to prevent name clash with the 'grpc' package.
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | gpr.gpr-patch | 11 |
3 files changed, 20 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = gprbuild pkgdesc = Builder for multi-language systems. pkgver = 24.0w - pkgrel = 5 + pkgrel = 6 epoch = 1 url = https://github.com/AdaCore/gprbuild/ arch = i686 @@ -15,14 +15,15 @@ pkgbase = gprbuild source = https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/gprbuild-24.0w-20230324-1649D-src.tar.gz source = https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/gprconfig-kb-24.0w-20230324-16644-src.tar.gz source = 0001-Makefile-build-relocatable-instead-of-static-binary.patch + source = gpr.gpr-patch sha256sums = efeb12ab26ca687a000ca781f3bce0e4ec2d4efd62b996116f2f505e50239b4f sha256sums = 7de5388f05168fb32577556989f0bc0f4f4d615cbd6a79ad544127a090aba5f4 sha256sums = 6ebbea41d4b8b516d0646438338fb228ea907600a2ad2c594bab41a7e1c3680c + sha256sums = b4a31b4f23c1a040eebad26aff6c771d04afe0b9d7da19c97ef9fde9bceed3db pkgname = libgpr pkgdesc = Ada library to handle Gnat project files. depends = xmlada - conflicts = grpc pkgname = gprbuild depends = libgpr @@ -7,7 +7,7 @@ pkgbase=gprbuild pkgdesc="Builder for multi-language systems." pkgname=(libgpr gprbuild gprtools gprname gprslave) pkgver=24.0w -pkgrel=5 +pkgrel=6 epoch=1 arch=(i686 x86_64) @@ -19,11 +19,13 @@ makedepends=(gprbuild python-sphinx) source=(https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/gprbuild-$pkgver-20230324-1649D-src.tar.gz https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/gprconfig-kb-$pkgver-20230324-16644-src.tar.gz - 0001-Makefile-build-relocatable-instead-of-static-binary.patch) + 0001-Makefile-build-relocatable-instead-of-static-binary.patch + gpr.gpr-patch) sha256sums=(efeb12ab26ca687a000ca781f3bce0e4ec2d4efd62b996116f2f505e50239b4f 7de5388f05168fb32577556989f0bc0f4f4d615cbd6a79ad544127a090aba5f4 - 6ebbea41d4b8b516d0646438338fb228ea907600a2ad2c594bab41a7e1c3680c) + 6ebbea41d4b8b516d0646438338fb228ea907600a2ad2c594bab41a7e1c3680c + b4a31b4f23c1a040eebad26aff6c771d04afe0b9d7da19c97ef9fde9bceed3db) _gprbuild_src=gprbuild-$pkgver-20230430-16222-src _gprconfig_kb_src=gprconfig-kb-$pkgver-20230428-16586-src @@ -33,6 +35,7 @@ prepare() { cd $srcdir/$_gprbuild_src patch -Np1 -i $srcdir/0001-Makefile-build-relocatable-instead-of-static-binary.patch + patch -Np0 -i $srcdir/gpr.gpr-patch # Rename 'libgpr.so' to 'libgpr-gnat.so' to prevent name clash with the 'grpc' package. ln -sfT $srcdir/gprconfig_kb-$pkgver/db/ share/gprconfig @@ -93,10 +96,6 @@ package_libgpr() pkgdesc="Ada library to handle Gnat project files." depends=(xmlada) - # Both provide /usr/lib/libgpr.so - # - conflicts=(grpc) - cd $srcdir/$_gprbuild_src make prefix=$pkgdir/usr libgpr.install diff --git a/gpr.gpr-patch b/gpr.gpr-patch new file mode 100644 index 000000000000..f0f105d32d2a --- /dev/null +++ b/gpr.gpr-patch @@ -0,0 +1,11 @@ +--- gpr/gpr.gpr 2023-04-27 11:26:41.635112300 +1000 ++++ gpr/gpr.gpr-new 2023-10-18 09:33:01.782042032 +1100 +@@ -37,7 +37,7 @@ + + for Source_Dirs use ("src"); + +- for Library_Name use "gpr"; ++ for Library_Name use "gpr-gnat"; + for Object_Dir use "libobj/" & Bld & "/" & Gnat_Lib_Type; + for Library_Dir use "lib/" & Bld & "/" & Gnat_Lib_Type; + |