Merge branch 'rosa2019.1' of abf.io:import/glibc into rosa2019.1

glibc.spec

@@ -1231,9 +1231,9 @@ function BuildGlibc() {
 
   # FIXME drop -j1 if the Makefiles ever get fixed for parallel build
   if [ "$BuildAltArch" = "yes" ]; then
-    %make_build -j1 -r all subdir_stubs LIBGD=no
+    %make -j1 -r all subdir_stubs LIBGD=no
   else
-    %make_build -j1 -r all subdir_stubs
+    %make -j1 -r all subdir_stubs
   fi
   cd -
 
@@ -1304,7 +1304,7 @@ for i in %{targets}; do
 	# We set CXX to empty to prevent links-dso-program from being built
 	# (it may not work -- if we're using a bootstrap version of gcc,
 	# there's no libstdc++ or libgcc_s)
-	%make_build CXX="" LIBGD=no
+	%make CXX="" LIBGD=no
 	cd ..
 done
 %endif
@@ -1381,7 +1381,7 @@ for i in %{long_targets}; do
 	fi
 	echo "===== Installing %{_target_platform} -> $i cross libc ====="
 	cd obj-${i}
-	%make_install
+	%makeinstall_std
 	cd ..
 	# We don't need all the bits and pieces with a crosscompiler
 	rm -rf %{buildroot}%{_prefix}/$i/bin %{buildroot}%{_prefix}/$i/sbin %{buildroot}%{_prefix}/$i/var %{buildroot}%{_prefix}/$i/share %{buildroot}%{_prefix}/$i/etc
@@ -1408,7 +1408,7 @@ make install_root=%{buildroot} install -C build-%{target_cpu}-linux
     %endif
     for ALT_ARCH in $ALT_ARCHES; do
 	mkdir -p %{buildroot}/$ALT_ARCH
-	%make_build install_root=%{buildroot}/$ALT_ARCH LIBGD=no -C build-$ALT_ARCH \
+	%make install_root=%{buildroot}/$ALT_ARCH LIBGD=no -C build-$ALT_ARCH \
 		install
 
 	# Dispatch */lib only