From 4f135b9ddb5e99e7beede94396756b4b66ff0a3a Mon Sep 17 00:00:00 2001
From: Alexei Takaseev <taf@altlinux.org>
Date: Sun, 22 Apr 2018 12:07:17 +0800
Subject: Build with gcc-6


diff --git a/bootstrap b/bootstrap
index 0aee383..43ccea0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,9 +10,9 @@ BINDIR="$BOOTSTRAPDIR"/bin
 WORKDIR="$BOOTSTRAPDIR"/work
 CROSSROOT="$WORKDIR"/cross
 ROOTFS="$WORKDIR"/root
-SRPMLIST="${SRPMLIST:-/ALT/Sisyphus/files/list/src.list}"
-BRPMLIST="${BRPMLIST:-/ALT/Sisyphus/files/list/bin.list}"
-SRPMDIR="${SRPMDIR:-/ALT/Sisyphus/files/SRPMS}"
+SRPMLIST="${SRPMLIST:-/mnt/sdc5/Sisyphus/files/list/src.list}"
+BRPMLIST="${BRPMLIST:-/mnt/sdc5/Sisyphus/files/list/bin.list}"
+SRPMDIR="${SRPMDIR:-/mnt/sdc5/Sisyphus/files/SRPMS}"
 SOURCEDIR="$WORKDIR"/source
 SPECDIR="$WORKDIR"/specs
 PKGDIR="$WORKDIR"/packages
@@ -74,6 +74,9 @@ case "$TARGET" in
 	s390*)
 		KARCH=s390
 		;;
+	powerpc64**)
+		KARCH=powerpc
+		;;
 esac
 [ -n "$KARCH" ] || fatal "failed to deduce kernel arch for $TARGET target"
 
diff --git a/generate-stage1-package b/generate-stage1-package
index 9094b7b..7e7b99b 100755
--- a/generate-stage1-package
+++ b/generate-stage1-package
@@ -16,7 +16,7 @@ export LC_COLLATE=C
 
 sed -r -n 's/PNAME=(..*)/\1/p' stage0.d/*.recipe.sh stage1.d/*.recipe.sh |
 	sort -u > "$tmpdir"/pkglist
-altdirectory='/ALT/Sisyphus/files'
+altdirectory='/mnt/sdc5/Sisyphus/files'
 join "$tmpdir"/pkglist "$altdirectory"/list/src.list -o 2.3 \
 	> "$tmpdir"/pkgfilelist
 
diff --git a/stage0.d/binutils.recipe.sh b/stage0.d/binutils.recipe.sh
index 4da7722..075249e 100644
--- a/stage0.d/binutils.recipe.sh
+++ b/stage0.d/binutils.recipe.sh
@@ -12,13 +12,13 @@ r_build() {
 	uspec "$PNAME" "$spec"
 	[ -n "$BP" ] || fatal '$BP empty'
 	cd $BP
-	./configure \
+	GCC_VERSION=6 ./configure \
 		--prefix="$CROSSROOT" \
 		--with-sysroot="$ROOTFS" \
 		--target="$TARGET" \
 		--enable-64-bit-bfd \
 	#
-	make "${nprocs:+-j$nprocs}"
+	GCC_VERSION=6 make "${nprocs:+-j$nprocs}"
 }
 
 r_install() {
diff --git a/stage0.d/gcc-compiler.recipe.sh b/stage0.d/gcc-compiler.recipe.sh
index d40e2fc..1dd9789 100644
--- a/stage0.d/gcc-compiler.recipe.sh
+++ b/stage0.d/gcc-compiler.recipe.sh
@@ -16,7 +16,7 @@ r_build() {
 	echo 'lt_cv_shlibpath_overrides_runpath=no' > config.cache
 	echo 'gcc_cv_libc_provides_ssp=yes' > config.cache
 
-	../configure \
+	GCC_VERSION=6 ../configure \
 		--prefix="$CROSSROOT" \
 		--with-sysroot="$ROOTFS" \
 		--target="$TARGET" \
@@ -25,7 +25,7 @@ r_build() {
 		--cache-file=config.cache \
 		--disable-multilib \
 	#
-	make "${nprocs:+-j$nprocs}" all-gcc
+	GCC_VERSION=6 make "${nprocs:+-j$nprocs}" all-gcc
 }
 
 r_install() {
diff --git a/stage0.d/gcc-libgcc.recipe.sh b/stage0.d/gcc-libgcc.recipe.sh
index 1e5a581..342f0fe 100644
--- a/stage0.d/gcc-libgcc.recipe.sh
+++ b/stage0.d/gcc-libgcc.recipe.sh
@@ -16,7 +16,7 @@ r_build() {
 	echo 'lt_cv_shlibpath_overrides_runpath=no' > config.cache
 	echo 'gcc_cv_libc_provides_ssp=yes' > config.cache
 
-	../configure \
+	GCC_VERSION=6 ../configure \
 		--prefix="$CROSSROOT" \
 		--with-sysroot="$ROOTFS" \
 		--with-headers=$ROOTFS/usr/include \
@@ -26,7 +26,7 @@ r_build() {
 		--cache-file=config.cache \
 		--disable-multilib \
 	#
-	make "${nprocs:+-j$nprocs}" all-target-libgcc
+	GCC_VERSION=6 make "${nprocs:+-j$nprocs}" all-target-libgcc
 }
 
 r_install() {
diff --git a/stage0.d/gcc.recipe.sh b/stage0.d/gcc.recipe.sh
index 859e8e5..a41f28e 100644
--- a/stage0.d/gcc.recipe.sh
+++ b/stage0.d/gcc.recipe.sh
@@ -16,7 +16,7 @@ r_build() {
 	echo 'lt_cv_shlibpath_overrides_runpath=no' > config.cache
 	echo 'gcc_cv_libc_provides_ssp=yes' > config.cache
 
-	../configure \
+	GCC_VERSION=6 ../configure \
 		--prefix="$CROSSROOT" \
 		--with-sysroot="$ROOTFS" \
 		--with-headers=$ROOTFS/usr/include \
@@ -26,7 +26,7 @@ r_build() {
 		--cache-file=config.cache \
 		--disable-multilib \
 	#
-	make "${nprocs:+-j$nprocs}"
+	GCC_VERSION=6 make "${nprocs:+-j$nprocs}"
 }
 
 r_install() {
diff --git a/stage0.d/glibc-startfiles.recipe.sh b/stage0.d/glibc-startfiles.recipe.sh
index 98f4b22..2198ef8 100644
--- a/stage0.d/glibc-startfiles.recipe.sh
+++ b/stage0.d/glibc-startfiles.recipe.sh
@@ -18,7 +18,7 @@ r_build() {
 	echo libc_cv_ssp=no >> config.cache
 	echo libc_cv_gcc_builtin_expect=yes >> config.cache
 
-	../configure \
+	GCC_VERSION=6 ../configure \
 		--with-headers=$ROOTFS/usr/include \
 		--build="$MACHTYPE" \
 		--host="$TARGET" \
@@ -29,7 +29,7 @@ r_build() {
 		--with-__thread \
 		--disable-build-nscd \
 	#
-	make "${nprocs:+-j$nprocs}" csu/subdir_lib
+	GCC_VERSION=6 make "${nprocs:+-j$nprocs}" csu/subdir_lib
 }
 
 r_install() {
diff --git a/stage0.d/glibc.recipe.sh b/stage0.d/glibc.recipe.sh
index 260c24f..be631c1 100644
--- a/stage0.d/glibc.recipe.sh
+++ b/stage0.d/glibc.recipe.sh
@@ -20,7 +20,7 @@ r_build() {
 	echo libc_cv_ssp=no >> config.cache
 	echo libc_cv_gcc_builtin_expect=yes >> config.cache
 
-	../configure \
+	GCC_VERSION=6 ../configure \
 		--with-headers=$ROOTFS/usr/include \
 		--build="$MACHTYPE" \
 		--host="$TARGET" \
@@ -32,7 +32,7 @@ r_build() {
 		--enable-obsolete-rpc \
 		--disable-build-nscd \
 	#
-	make "${nprocs:+-j$nprocs}" cross-compiling=yes
+	GCC_VERSION=6 make "${nprocs:+-j$nprocs}" cross-compiling=yes
 }
 
 r_install() {
diff --git a/stage0.d/kernel-headers.recipe.sh b/stage0.d/kernel-headers.recipe.sh
index 556cc61..a682fbc 100644
--- a/stage0.d/kernel-headers.recipe.sh
+++ b/stage0.d/kernel-headers.recipe.sh
@@ -9,7 +9,7 @@ r_build() {
 
 r_install() {
 	cd $BP/kernel-source-*
-	make ARCH=$KARCH INSTALL_HDR_PATH="$ROOTFS"/usr/include/linux-default headers_install
+	GCC_VERSION=6 make ARCH=$KARCH INSTALL_HDR_PATH="$ROOTFS"/usr/include/linux-default headers_install
 	(
 		cd "$ROOTFS"/usr/include/linux-default/include
 		for i in asm asm-generic drm linux mtd sound video; do