Updates for CentOS8

autotools.spec

@@ -6,27 +6,29 @@
 %define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
 %define libtool_version 2.4.6
 %define m4_version 1.4.18
-%define gettext_version 0.19.8.1
+%define gettext_version 0.20.1
 %define pkgconfig_version 0.29.2
 Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
 Source1: http://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
 Source2: http://ftp.gnu.org/gnu/libtool/libtool-%{libtool_version}.tar.gz
 Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.bz2
 Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{gettext_version}.tar.gz
 Source5: http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
+Patch0: m4-centos8
 
 %prep
 %setup -D -T -b 0 -n autoconf-%{autoconf_version}
 %setup -D -T -b 1 -n automake-%{automake_version}
 %setup -D -T -b 2 -n libtool-%{libtool_version}
 %setup -D -T -b 3 -n m4-%{m4_version}
+%patch0 -p1
 %setup -D -T -b 4 -n gettext-%{gettext_version}
 %setup -D -T -b 5 -n pkg-config-%{pkgconfig_version}
 
 # Update config.{guess,sub} scripts
 rm -f %{_tmppath}/config.{sub,guess}
-curl -L -k -s -o %{_tmppath}/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-curl -L -k -s -o %{_tmppath}/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
+%get_config_guess %{_tmppath}/config.guess
+%get_config_sub %{_tmppath}/config.sub
 for CONFIG_GUESS_FILE in $(find $RPM_BUILD_DIR -name 'config.guess')
 do
   rm -f $CONFIG_GUESS_FILE

bazel.spec

@@ -8,6 +8,7 @@ BuildRequires: java-env
 
 %setup -q -n bazel-%{realversion}
 sed -i -e 's|^## Release 0.11.1|## Release 0.9.0|' CHANGELOG.md
+sed -i -e 's|^\( *\)supports_gold_linker *=.*|\1supports_gold_linker = False|' ./tools/cpp/unix_cc_configure.bzl
 
 %build
 bash ./compile.sh

blackhat.spec

@@ -7,7 +7,7 @@ Patch2: blackhat-no_warnings
 Patch3: blackhat-0.9.9-default-arg-at-first-decl
 Patch4: blackhat-0.9.9-gcc600
 
-Requires: qd python openssl
+Requires: qd python
 %prep
 %setup -n blackhat-%{realversion}
 
@@ -20,11 +20,11 @@ sed -i -e 's|else return Cached_OLHA_user_normal|else return new Cached_OLHA_use
 
 # Update to detect aarch64 and ppc64le
 rm -f ./config.{sub,guess}
-curl -L -k -s -o ./config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
-curl -L -k -s -o ./config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
+%get_config_sub ./config.sub
+%get_config_guess ./config.guess
 chmod +x ./config.{sub,guess}
 
-./configure --prefix=%i --with-QDpath=$QD_ROOT CXXFLAGS="-Wno-deprecated -I$OPENSSL_ROOT/include" LDFLAGS="-L$OPENSSL_ROOT/lib"
+./configure --prefix=%i --with-QDpath=$QD_ROOT CXXFLAGS="-Wno-deprecated"
 # The following hack insures that the bins with the library linked explicitly
 # rather than indirectly, as required by the gold linker
 %build

boost.spec

@@ -73,18 +73,3 @@ for l in $(find %{i}/lib -name "*.${so}.*")
 do
   ln -s $(basename ${l}) $(echo ${l} | sed -e "s|[.]${so}[.].*|.${so}|")
 done
-
-# Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
-mkdir -p %{i}/etc/profile.d
-: > %{i}/etc/profile.d/dependencies-setup.sh
-: > %{i}/etc/profile.d/dependencies-setup.csh
-for tool in $(echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'); do
-  root=$(echo $tool | tr a-z- A-Z_)_ROOT; eval r=\$$root
-  if [ X"$r" != X ] && [ -r "$r/etc/profile.d/init.sh" ]; then
-    echo "test X\$$root != X || . $r/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
-    echo "test \$?$root != 0 || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
-  fi
-done
-
-%post
-%{relocateConfig}etc/profile.d/dependencies-setup.*sh

bootstrap-bundle.spec

@@ -1,29 +1,24 @@
-### RPM external bootstrap-bundle 1.7
+### RPM external bootstrap-bundle 2.0
 ## INITENV +PATH PATH %{i}/bin
+## INITENV SET MAGIC %{i}/share/misc/magic.mgc
 ## NOCOMPILER
 
 BuildRequires: gcc
-BuildRequires: db6-bootstrap lua-bootstrap
-BuildRequires: openssl-bootstrap xz-bootstrap libarchive-bootstrap
+BuildRequires: db6-bootstrap lua-bootstrap file-bootstrap
+BuildRequires: xz-bootstrap libarchive-bootstrap
 
 %define keep_archives true
-%define is64bit %(case %{cmsplatf} in (*_amd64_*|*_mic_*|*_aarch64_*|*_ppc64le_*|*_ppc64_*) echo 1 ;; (*) echo 0 ;; esac)
-%define ismac   %(case %{cmsplatf} in (osx*) echo 1 ;; (*) echo 0 ;; esac)
 
+%define libdir lib64
 %define soname so
-%if %ismac
+%ifos darwin
 %define soname dylib
 %endif
 
-%define libdir lib
-%if %is64bit
-%define libdir lib64
-%endif
-
 %prep
 %build
 %install
-mkdir %{i}/bin %{i}/lib %{i}/include %{i}/share %{i}/tmp
+mkdir -p %{i}/bin %{i}/lib %{i}/include %{i}/share %{i}/tmp %{i}/etc/profile.d
 for tool in `echo %{buildrequiredtools} | tr ' ' '\n' | grep '\-bootstrap$'`; do
   toolcap=`echo $tool | tr a-z- A-Z_`
   toolbase=`eval echo \\$${toolcap}_ROOT`
@@ -32,15 +27,19 @@ for tool in `echo %{buildrequiredtools} | tr ' ' '\n' | grep '\-bootstrap$'`; do
     rsync -r --links --ignore-existing ${toolbase}/${sdir}/ %{i}/${sdir}/
   done
 done
+mkdir %{i}/share/misc
+cp ${FILE_BOOTSTRAP_ROOT}/share/misc/magic.mgc  %{i}/share/misc/magic.mgc
 rm -f %{i}/bin/xml2-config %{i}/lib/xml2Conf.sh
 
 #Bundle libstd and libgcc_s and libelf
-%if %ismac
+%ifos darwin
 cp -P $GCC_ROOT/lib/lib{stdc++,gcc_s}*.%{soname} %{i}/lib
 %else
 cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s}.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf-*.%{soname} %{i}/lib
+cp -P $GCC_ROOT/lib/libdw.%{soname}* %{i}/lib
+cp -P $GCC_ROOT/lib/libdw-*.%{soname} %{i}/lib
 %endif
 
 find %{i}/bin -type f -writable -exec %{strip} {} \;
@@ -56,3 +55,8 @@ mv %{i}/lib/lib{lua,archive}.a %{i}/tmp
 rm -f %{i}/lib/*.{l,}a
 mv %{i}/tmp/lib* %{i}/lib/
 rm -rf %{i}/tmp
+
+touch %{i}/etc/profile.d/dependencies-setup.sh  %{i}/etc/profile.d/dependencies-setup.csh
+
+%post
+rm -f $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/dependencies-setup.*