development/grpbuild: Updated for version 25.0.0

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 18 insertions, 61 deletions

diff --git a/development/gprbuild/gpr.gpr b/development/gprbuild/gpr.gpr
deleted file mode 100644
index 99243b2af41b..000000000000
--- a/development/gprbuild/gpr.gpr
+++ /dev/null
@@ -1,40 +0,0 @@
-library project Gpr is
-   type BUILD_KIND is ("static", "relocatable", "static-pic");
-   BUILD : BUILD_KIND := external("LIBRARY_TYPE", "relocatable");
-
-   case BUILD is
-     when "relocatable" =>
-	for Source_Dirs use ("../../include/gpr");
-	for Library_Dir use "../gpr/relocatable";
-	for Library_Kind use "relocatable";
-     when "static" =>
-	for Source_Dirs use ("../../include/gpr");
-	for Library_Dir use "../gpr/static";
-	for Library_Kind use "static";
-     when "static-pic" =>
-	for Source_Dirs use ("../../include/gpr");
-	for Library_Dir use "../gpr/static-pic";
-	for Library_Kind use "static-pic";
-   end case;
-
-   for Library_Name use "gpr";
-
-   package Naming is
-      for dot_replacement use "-";
-      for casing use "lowercase";
-
-      case BUILD is
-         when "relocatable" =>
-            for body_suffix ("ada") use ".adb";
-            for spec_suffix ("ada") use ".ads";
-         when "static" =>
-            for body_suffix ("ada") use ".adb";
-            for spec_suffix ("ada") use ".ads";
-         when "static-pic" =>
-            for body_suffix ("ada") use ".adb";
-            for spec_suffix ("ada") use ".ads";
-      end case;
-   end Naming;
-
-   for Externally_Built use "True";
-end Gpr;
diff --git a/development/gprbuild/gprbuild.SlackBuild b/development/gprbuild/gprbuild.SlackBuild
index d2b6f9db04cd..ad5cc474893a 100644
--- a/development/gprbuild/gprbuild.SlackBuild
+++ b/development/gprbuild/gprbuild.SlackBuild
@@ -22,12 +22,12 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=gprbuild
-VERSION=${VERSION:-24.0.0}
+VERSION=${VERSION:-25.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-KB_VERSION=${KB_VERSION:-24.0.0}
+KB_VERSION=${KB_VERSION:-25.0.0}
 GPRCONFIG_KB=gprconfig_kb-$KB_VERSION
 GPRCONFIG_KB_SRC_DIR=$GPRCONFIG_KB
 
@@ -75,7 +75,7 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components=1
 cd $PRGNAM-$VERSION
 
 mkdir $GPRCONFIG_KB_SRC_DIR
-tar xvf $CWD/$GPRCONFIG_KB.tar.gz -C $GPRCONFIG_KB_SRC_DIR --strip-components=1
+tar xf $CWD/$GPRCONFIG_KB.tar.gz -C $GPRCONFIG_KB_SRC_DIR --strip-components=1
 
 sed -i -e 's/share\/doc/doc/g' \
     -e 's/doc\/gprbuild\/info/info/g' gprbuild.gpr
@@ -89,9 +89,9 @@ if [ "$ARCH" = "x86_64" ]; then
     sed -i 's/\"lib\"/\"lib64\"/g' src/gprinstall.ads
 fi
 
-sed -i -e 's/"19940713"/"20231113"/' \
-       -e 's/"2016"/"2023"/' \
-       -e 's/"18.0w"/"24.0.0"/' \
+sed -i -e 's/"19940713"/"20241007"/' \
+       -e 's/"2016"/"2024"/' \
+       -e 's/"18.0w"/"25.0.0"/' \
        -e 's/:= Gnatpro/:= FSF/' gpr/src/gpr-version.ads
 
 (cd share; ln -sfT ../$GPRCONFIG_KB_SRC_DIR/db gprconfig)
@@ -102,7 +102,7 @@ XMLADA_SRC_NAME=xmlada-$XMLADA_VERSION
 XMLADA=xmlada-$XMLADA_VERSION
 
 mkdir $XMLADA
-tar xvf $CWD/$XMLADA_SRC_NAME.tar.gz -C $XMLADA --strip-components=1
+tar xf $CWD/$XMLADA_SRC_NAME.tar.gz -C $XMLADA --strip-components=1
 
 export CC=gcc
 export CFLAGS=$SLKCFLAGS
@@ -118,7 +118,7 @@ rm gprbuild gprclean gprconfig gprinstall gprls gprname
 # lib for BOOTSTAR_DSTDIR
 (export PATH=$BOOTSTRAP_DSTDIR/bin:$PATH
  cd $XMLADA
- sed -i 's/18.0w/24.0.0/g' configure configure.in
+ sed -i 's/18.0w/25.0.0/g' configure configure.in
  ./configure --prefix=$BOOTSTRAP_DSTDIR --disable-shared
  make prefix=$BOOTSTRAP_DSTDIR static
  make prefix=$BOOTSTRAP_DSTDIR install-static
@@ -128,13 +128,10 @@ rm gprbuild gprclean gprconfig gprinstall gprls gprname
 find -name "*.a" -name "*.ali"
 (export PATH=$BOOTSTRAP_DSTDIR/bin:$PATH
 export GPR_PROJECT_PATH=$BOOTSTRAP_DSTDIR/share/gpr
-make BUILD=production prefix=/usr setup
-make LIBRARY_TYPE=static all
-make build
+make BUILD=production GPRBUILD_OPTIONS="-R"  prefix=/usr setup
+make BUILD=production GPRBUILD_OPTIONS="-R"  LIBRARY_TYPE=static all
+make BUILD=production GPRBUILD_OPTIONS="-R"  build
 make prefix=$PKG/usr install
-cd $PKG/usr/bin
-patchelf --set-rpath "" *
-patchelf --remove-rpath *
 ) 
 
 rm $PKG/usr/doinstall
diff --git a/development/gprbuild/gprbuild.info b/development/gprbuild/gprbuild.info
index ec038095bb2d..bf2e2605a376 100644
--- a/development/gprbuild/gprbuild.info
+++ b/development/gprbuild/gprbuild.info
@@ -1,12 +1,12 @@
 PRGNAM="gprbuild"
-VERSION="24.0.0"
+VERSION="25.0.0"
 HOMEPAGE="https://github.com/adacore/gprbuild"
-DOWNLOAD="https://github.com/AdaCore/gprbuild/archive/v24.0.0/gprbuild-24.0.0.tar.gz \
-	 https://github.com/AdaCore/gprconfig_kb/archive/v24.0.0/gprconfig_kb-24.0.0.tar.gz \
-	 https://github.com/AdaCore/xmlada/archive/v24.0.0/xmlada-24.0.0.tar.gz"
-MD5SUM="dc18909ddcdd3ad217052ca57e29f834 \
-	5e9c0a8e64103af9f708e3085655172a \
-	372209a79f2946cd31ec28e2a88714c9"
+DOWNLOAD="https://github.com/AdaCore/gprbuild/archive/v25.0.0/gprbuild-25.0.0.tar.gz \
+	 https://github.com/AdaCore/gprconfig_kb/archive/v25.0.0/gprconfig_kb-25.0.0.tar.gz \
+	 https://github.com/AdaCore/xmlada/archive/v25.0.0/xmlada-25.0.0.tar.gz"
+MD5SUM="d53e0d7ad721874d0ae4756d2d6b4fae  \
+	34481c051de245954ada5fa1d39eb32b  \
+	ba88734c59e24a2eab8ad1d099bfad7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx sphinx-rtd-theme"