update to match current GCC 7.3.0

qunying · Feb 1, 2018 · 348d600 · 348d600
1 parent f6cd5d9
commit 348d600
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 26 deletions.
diff --git a/README b/README
@@ -19,7 +19,7 @@ The build order will be
 * gnatmem
 * adactl
 
-It has been updated for Slackware current, GCC 7.2.0 and gnat GPL 2017
+It has been updated for Slackware current, GCC 7.3.0 and gnat GPL 2017
 
 For gnatmem, you also need the binutils source and build the binutils first.
 

diff --git a/adacontrol/adactl.SlackBuild b/adacontrol/adactl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=adactl			# replace with name of program
-VERSION=${VERSION:-1.18r9}	# replace with version of program
+VERSION=${VERSION:-1.19r10}	# replace with version of program
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}		# the "_SBo" is required
 
@@ -73,6 +73,7 @@ find . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
+patch -p1 < $CWD/adactl_fix.patch
 
 make build
 sed -i 's/gprinstall/gprinstall --prefix=${PREFIX} -p/' Makefile

diff --git a/adacontrol/adactl.info b/adacontrol/adactl.info
@@ -1,7 +1,7 @@
 PRGNAM="adactl"
-VERSION="1.18r9"
+VERSION="1.19r10"
 HOMEPAGE="http://adalog.fr/en/adacontrol.html"
-DOWNLOAD="https://sourceforge.net/projects/adacontrol/files/adactl-1.18r9-src.tgz"
+DOWNLOAD="https://sourceforge.net/projects/adacontrol/files/adactl-1.19r10-src.tgz"
 MD5SUM="9e4c6fc2266a3cef4a07f1c08c1cb9ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""

diff --git a/adacontrol/adactl_fix.patch b/adacontrol/adactl_fix.patch
@@ -0,0 +1,32 @@
+--- adactl-1.19r10/Makefile	2017-12-14 11:35:01.000000000 -0800
++++ adactl-1.19r10-new/Makefile	2018-02-01 10:34:08.598013854 -0800
+@@ -24,6 +24,7 @@
+ 	@echo "--              | adactl     -- build adactl                 --"
+ 	@echo "--              | ptree      -- build ptree                  --"
+ 	@echo "--              | pfni       -- build pfni                   --"
++	@echo "--              | adactl_fix -- build adactl_fix             --"
+ 	@echo "--              | install    -- install everything           --"
+ 	@echo "--              | clean      -- delete object files          --"
+ 	@echo "--              | veryclean  -- clean + delete executable    --"
+@@ -31,7 +32,7 @@
+ 	@echo "---------------------------------------------------------------"
+
+
+-build : adactl ptree pfni;
++build : adactl ptree pfni adactl_fix
+
+ adactl :
+ 	gprbuild build.gpr adactl ${GARGS} -cargs ${CARGS} -bargs ${BARGS} -largs ${LARGS}
+@@ -42,8 +43,11 @@
+ pfni :
+ 	gprbuild build.gpr pfni   ${GARGS} -cargs ${CARGS} -bargs ${BARGS} -largs ${LARGS}
+
++adactl_fix:
++	gprbuild build.gpr adactl_fix ${GARGS} -cargs ${CARGS} -bargs ${BARGS} -largs ${LARGS}
++
+ install :
+-	gprinstall build.gpr -f
++	gprinstall --prefix=${PREFIX} -p build.gpr -f
+
+ clean :
+ 	gprclean -c build.gpr
diff --git a/gnat-env/gnat-env.SlackBuild b/gnat-env/gnat-env.SlackBuild
@@ -24,7 +24,7 @@
 
 PKGNAM=gnat-env
 # should have the same version of the GCC one
-VERSION=${VERSION:-7.2.0}
+VERSION=${VERSION:-7.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 OUTPUT=${OUTPUT:-/tmp}

diff --git a/gnat_rm/gnat_rm.SlackBuild b/gnat_rm/gnat_rm.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnat_rm # replace with name of program
-VERSION=${VERSION:-7.2.0}	# replace with version of program
+VERSION=${VERSION:-7.3.0}	# replace with version of program
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}		# the "_SBo" is required
 

diff --git a/gnat_rm/gnat_rm.info b/gnat_rm/gnat_rm.info
@@ -1,8 +1,8 @@
 PRGNAM="gnat-rm"
-VERSION="7.2.0"
+VERSION="7.3.0"
 HOMEPAGE="https://gcc.gnu.org/onlinedocs"
-DOWNLOAD="https://gcc.gnu.org/onlinedocs/gcc-7.2.0/gnat_rm-html.tar.gz"
-MD5SUM="2026838d40cc20b99d9668f1f1c4461d"
+DOWNLOAD="https://gcc.gnu.org/onlinedocs/gcc-7.3.0/gnat_rm-html.tar.gz"
+MD5SUM="83b2b39bfe75639ba6aa6df572a2b22c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""

diff --git a/gnat_ugn/gnat_ugn.SlackBuild b/gnat_ugn/gnat_ugn.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnat_ugn # replace with name of program
-VERSION=${VERSION:-7.2.0}	# replace with version of program
+VERSION=${VERSION:-7.3.0}	# replace with version of program
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}		# the "_SBo" is required
 

diff --git a/gnat_ugn/gnat_ugn.info b/gnat_ugn/gnat_ugn.info
@@ -1,8 +1,8 @@
 PRGNAM="gnat-ugn"
-VERSION="7.2.0"
+VERSION="7.3.0"
 HOMEPAGE="https://gcc.gnu.org/onlinedocs"
-DOWNLOAD="https://gcc.gnu.org/onlinedocs/gcc-7.2.0/gnat_ugn-html.tar.gz"
-MD5SUM="b1970829c5df7c6aa3cd4fecee788332"
+DOWNLOAD="https://gcc.gnu.org/onlinedocs/gcc-7.3.0/gnat_ugn-html.tar.gz"
+MD5SUM="4b1f054f94803da6be3db1b3f29847d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""

diff --git a/gnat_util/gnat_util.SlackBuild b/gnat_util/gnat_util.SlackBuild
@@ -21,10 +21,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnat_util
-VERSION=${VERSION:-5.1.0}
+VERSION=${VERSION:-7.3.0} # same version as GCC
+HG_REP_VERSION=c013843f0ace361ac462f773353b762870c0d548
+SRC_PREFIX=gnatutil-code-$HG_REP_VERSION
 BUILD=${BUILD:-1}
 TAG=${TAG-_SBo}
-GCC_VERSION=${GCC_VERSION:-7.2.0}
+GCC_VERSION=${GCC_VERSION:-$VERSION}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -64,10 +66,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $SRC_PREFIX
+unzip $CWD/$SRC_PREFIX.zip
 
-cd $PRGNAM-$VERSION
+#tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+
+#cd $PRGNAM-$VERSION
+
+cd $SRC_PREFIX
 
 chown -R root:root .
 find . \
@@ -96,5 +102,5 @@ cp README COPYING3 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
 cd $PKG
 
 mkdir -p $PKG/install
-cp $CWD/slack-desc $PKG/install
+sed "s/GCC_VERSION/$GCC_VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$GCC_VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
diff --git a/gnat_util/gnat_util.info b/gnat_util/gnat_util.info
@@ -1,8 +1,8 @@
 PRGNAM="gnat_util"
-VERSION="5.1.0"
+VERSION="7.1.0"
 HOMEPAGE="http://sourceforge.net/projects/gnatutil/"
-DOWNLOAD="http://sourceforge.net/projects/gnatutil/files/5.1.0/gnat_util-5.1.0.tar.gz"
-MD5SUM="4a7a6642bc5c3dfe67bfacf2d14206cc"
+DOWNLOAD="https://sourceforge.net/code-snapshots/hg/g/gn/gnatutil/code/gnatutil-code-c013843f0ace361ac462f773353b762870c0d548.zip"
+MD5SUM="b9132e2c58300b367b8c2c82c0d86f96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gprbuild"

diff --git a/gnat_util/slack-desc b/gnat_util/slack-desc
@@ -12,8 +12,8 @@ gnat_util: gnat_util contains components from the GNAT FSF compiler.
 gnat_util:
 gnat_util: At least for ASIS, the components used to build it must match the
 gnat_util: components in the compiler, so if building ASIS for use with
-gnat_util: (for example) FSF GCC 6.2.0 a version of GNAT Util is needed which
-gnat_util: contains components from FSF GCC 6.2.0.
+gnat_util: (for example) FSF GCC GCC_VERSION a version of GNAT Util is needed which
+gnat_util: contains components from FSF GCC GCC_VERSION.
 gnat_util:
 gnat_util: This project provides such a library.
 gnat_util:

diff --git a/gnatmem/gnatmem.SlackBuild b/gnatmem/gnatmem.SlackBuild
@@ -25,7 +25,7 @@ VERSION=${VERSION:-2017}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BINUTIL_BUILD_TREE="/tmp/binutils-2.29"
+BINUTIL_BUILD_TREE="/tmp/binutils-2.30"
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in

diff --git a/gps/gps.SlackBuild b/gps/gps.SlackBuild
@@ -105,7 +105,7 @@ sed -i "s/Mode'Image/Mode'Img/" ./vsearch/src/vsearch.adb
 
 ln -s ../gnatcoll-gnatcoll-$GNATCOLL_VERSION gnatlib
 
-make -j 2 Build=Production OS=unix
+make Build=Production OS=unix
 
 make -C docs