Scripts update

Change-Id: I4693a3e2973762d5751b3b78955a2b459f558c6e
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>

diff --git a/packaging/change_spec b/packaging/change_spec
old mode 100644 (file)
new mode 100755 (executable)
index fb30e13..53b9d2e
--- a/packaging/change_spec
+++ b/packaging/change_spec
@@ -49,12 +49,69 @@ s/@variant@/-64bit/g
 p
 }
 }' >> $outfile
+       if test "$do_optional_compiler_languages" = "0"; then
+       echo '%define building_libjava 1' > libgcj$base_ver.spec
+       sed -e '/^# LIBJAVA-DELETE-BEGIN/,/^# LIBJAVA-DELETE-END/d;s/-n libgcj@base_ver@$//g;s/^Name:[[:space:]]*gcc/Name: libgcj/g' \
+           gcc.spec.in \
+       | sed -e 's%@base_ver@%'$base_ver'%g' \
+       | sed -n -e '{
+/^# PACKAGE-BEGIN/h
+/^# PACKAGE-BEGIN/,/^# PACKAGE-END/H
+/^# PACKAGE-BEGIN/,/^# PACKAGE-END/!p
+/^# PACKAGE-END/{g
+s/@variant@//g
+p
+g
+s/@variant@/-32bit/g
+p
+g
+s/@variant@/-64bit/g
+p
+}
+}' >> libgcj$base_ver.spec
+       echo '%define building_testsuite 0' > gcc$base_ver-testresults.spec
+       echo '%define run_tests 0' >> gcc$base_ver-testresults.spec
+       sed -e '/^# GCC-TESTSUITE-DELETE-BEGIN/,/^# GCC-TESTSUITE-DELETE-END/d;s/-n gcc@base_ver@-testresults$//g;s/^Name:[[:space:]]*gcc@base_ver@/Name: gcc@base_ver@-testresults/g' \
+           gcc.spec.in \
+       | sed -e 's%@base_ver@%'$base_ver'%g' \
+>> gcc$base_ver-testresults.spec
+       echo '%define building_libffi 1' > libffi$base_ver.spec
+       sed -e '/^# LIBFFI-DELETE-BEGIN/,/^# LIBFFI-DELETE-END/d;s/^Name:[[:space:]]*gcc/Name: libffi/g' \
+           gcc.spec.in \
+       | sed -e 's%@base_ver@%'$base_ver'%g' \
+       | sed -n -e '{
+/^# PACKAGE-BEGIN/h
+/^# PACKAGE-BEGIN/,/^# PACKAGE-END/H
+/^# PACKAGE-BEGIN/,/^# PACKAGE-END/!p
+/^# PACKAGE-END/{g
+s/@variant@//g
+p
+g
+s/@variant@/-32bit/g
+p
+g
+s/@variant@/-64bit/g
+p
+}
+}' \
+>> libffi$base_ver.spec
+
+  test -f gcc$base_ver.changes \
+    && ( ln -f gcc$base_ver.changes libgcj$base_ver.changes; \
+        ln -f gcc$base_ver.changes libffi$base_ver.changes; \
+        ln -f gcc$base_ver.changes gcc$base_ver-testresults.changes; )
+    fi
+
+
 
 add_cross() {
   local pkgname="$1"; shift
   local rpmtarget="$1"; shift
   local triplet="$1"; shift
 
+  # Prepare personal cross.spec.in
+  outfile=$pkgname.spec cross_arch=$triplet /bin/bash ./cross.spec.sh > cross.spec.in
+
   exclarch=`echo $rpmtarget | sed -e 's/ppc$/ppc64/'`
   echo "%define pkgname $pkgname" > $pkgname.spec
   echo "%define cross_arch $rpmtarget" >> $pkgname.spec
@@ -67,6 +124,7 @@ add_cross() {
        -e "s/^\(ExclusiveArch.*\) $exclarch /\1 /" \
       >> $pkgname.spec
   test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes $pkgname.changes
+  rm cross.spec.in
 }
 
 # We now support "proper" cross-compilers to suse targets via a
@@ -80,6 +138,11 @@ add_cross cross-aarch64-gcc$base_ver aarch64 aarch64-tizen-linux %define gcc_ice
 add_cross cross-armv7l-gcc$base_ver armv7l armv7l-tizen-linux-gnueabi %define gcc_icecream 1
 add_cross cross-armv7hl-gcc$base_ver armv7hl armv7hl-tizen-linux-gnueabi %define gcc_icecream 1
 add_cross cross-x86_64-gcc$base_ver x86_64 x86_64-tizen-linux %define gcc_icecream 1
+else
+add_cross cross-aarch64-gcc$base_ver aarch64 aarch64-tizen-linux
+add_cross cross-armv7l-gcc$base_ver armv7l armv7l-tizen-linux-gnueabi
+add_cross cross-armv7hl-gcc$base_ver armv7hl armv7hl-tizen-linux-gnueabi
+add_cross cross-x86_64-gcc$base_ver x86_64 x86_64-tizen-linux
 fi
 
 for f in *.spec; do

diff --git a/packaging/check-build.sh b/packaging/check-build.sh
old mode 100644 (file)
new mode 100755 (executable)
index a75c617..5cf5aa7
--- a/packaging/check-build.sh
+++ b/packaging/check-build.sh
@@ -4,7 +4,7 @@
 # Authors: Thorsten Kukuk <kukuk@suse.de>
 #
 # this script use the following variable(s):
-# 
+#
 # - $BUILD_BASENAME
 #
 

diff --git a/packaging/cross.spec.in b/packaging/cross.spec.sh
similarity index 71%
rename from packaging/cross.spec.in
rename to packaging/cross.spec.sh
index eca2eb4..669390e 100644 (file)
--- a/packaging/cross.spec.in
+++ b/packaging/cross.spec.sh
@@ -41,9 +41,6 @@ cat << EOF
 %if %{cross_arch} == "armv5tel"
 %define binutils_target arm
 %endif
-%if %{cross_arch} == "aarch64"
-%define binutils_target arm
-%endif
 %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %if %{binutils_target} == "arm"
 %define canonical_target_abi -gnueabi
@@ -55,6 +52,7 @@ cat << EOF
 
 
 Name:         %{pkgname}
+ExcludeArch:  %{cross_arch}
 BuildRequires: cross-%{binutils_target}-binutils
 BuildRequires: gcc-c++
 BuildRequires: bison
@@ -70,7 +68,6 @@ BuildRequires: zlib-devel
 BuildRequires: cloog-devel
 BuildRequires: ppl-devel
 %endif
-BuildRequires: cross-$cross_arch_cpu-binutils
 %ifarch ia64
 BuildRequires: libunwind-devel
 %endif
@@ -87,8 +84,6 @@ make %{?jobs:-j%jobs}
 make %{?jobs:-j%jobs} all-host
 %endif
 
-%define _prefix /opt/cross
-
 %package -n cross-%cross_arch-gcc@base_ver@-icecream-backend
 Summary: Icecream backend for the GNU C Compiler
 Group: Development/Languages/C and C++
@@ -103,25 +98,25 @@ This package contains the icecream environment for the GNU C Compiler
 cd obj-%{GCCDIST}
 
 # install and fixup host parts
-make DESTDIR=$RPM_BUILD_ROOT install-host
+make DESTDIR=\$RPM_BUILD_ROOT install-host
 # with the present setup fixincludes are for the build includes which
 # is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
+rm -rf \$RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
+rm -f \$RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
-rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
-# remove docs
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -f \$RPM_BUILD_ROOT%{_libdir}/libiberty.a
 
+# remove docs and disable automated generation
+%remove_docs
+%define disable_docs_package 1
 
 # install and fixup target parts
 # ???  don't do this - debugedit is not prepared for this and crashes
 # so expect the sysroot to be populated from natively built binaries
 #%if 0%{?sysroot:1}
-#make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+#make DESTDIR=\$RPM_BUILD_ROOT/%{sysroot} install-target
 #%else
-#make DESTDIR=$RPM_BUILD_ROOT/%{_prefix}/%{gcc_target_arch} install-target
+#make DESTDIR=\$RPM_BUILD_ROOT/%{_prefix}/%{gcc_target_arch} install-target
 #%endif
 
 
@@ -129,40 +124,48 @@ rm -rf $RPM_BUILD_ROOT%{_infodir}
 # The assembler comes from the cross-binutils, and hence is _not_
 # named funnily, not even on ppc, so there we need the original target
 install -s -D %{_prefix}/bin/%{canonical_target}-tizen-linux%{?canonical_target_abi:%canonical_target_abi}-as \
-       $RPM_BUILD_ROOT/env/usr/bin/as
-install -s $RPM_BUILD_ROOT/%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix} \
-       $RPM_BUILD_ROOT/env/usr/bin/g++
-install -s $RPM_BUILD_ROOT/%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} \
-       $RPM_BUILD_ROOT/env/usr/bin/gcc
-
-for back in cc1 cc1plus; do 
-       install -s -D $RPM_BUILD_ROOT/%{targetlibsubdir}/$back \
-               $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back
+       \$RPM_BUILD_ROOT/env/usr/bin/as
+install -s \$RPM_BUILD_ROOT/%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix} \
+       \$RPM_BUILD_ROOT/env/usr/bin/g++
+install -s \$RPM_BUILD_ROOT/%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} \
+       \$RPM_BUILD_ROOT/env/usr/bin/gcc
+
+for back in cc1 cc1plus; do
+       install -s -D \$RPM_BUILD_ROOT/%{targetlibsubdir}/\$back \
+               \$RPM_BUILD_ROOT/env%{targetlibsubdir}/\$back
 done
-if test -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.so; then
-  install -s -D $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.so \
-               $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so
+if test -f \$RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.so; then
+  install -s -D \$RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.so \
+               \$RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so
 fi
 
 # Make sure to also pull in all shared library requirements for the
 # binaries we put into the environment which is operated by chrooting
 # into it and execing the compiler
-libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \
-  ldd $bin | sed -n '\,^[^/]*\(/[^ ]*\).*,{ s//\1/; p; }'  ;\
-done | sort -u `
-for lib in $libs; do
+libs=\`for bin in \$RPM_BUILD_ROOT/env/usr/bin/* \$RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \
+  ldd \$bin | sed -n '\,^[^/]*\(/[^ ]*\).*,{ s//\1/; p; }'  ;\
+done | sort -u\`
+for lib in \$libs; do
   # Check wether the same library also exists in the parent directory,
   # and prefer that on the assumption that it is a more generic one.
-  baselib=`echo "$lib" | sed 's,/[^/]*\(/[^/]*\)$,\1,'`
-  test -f "$baselib" && lib=$baselib
-  install -s -D $lib $RPM_BUILD_ROOT/env$lib
+  baselib=\`echo "\$lib" | sed 's,/[^/]*\(/[^/]*\)\$,\1,'\`
+  test -f "\$baselib" && lib=\$baselib
+  install -s -D \$lib \$RPM_BUILD_ROOT/env\$lib
 done
 
-cd $RPM_BUILD_ROOT/env
+cd \$RPM_BUILD_ROOT/env
+%if 0%{?gcc_icecream:1}
+tar cvzf ../%{name}-icecream-backend_%{_arch}.tar.gz *
+%else
 tar cvzf ../%{name}_%{_arch}.tar.gz *
+%endif
 cd ..
 mkdir -p usr/share/icecream-envs
+%if 0%{?gcc_icecream:1}
+mv %{name}-icecream-backend_%{_arch}.tar.gz usr/share/icecream-envs
+%else
 mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs
+%endif
 rpm -q --changelog glibc >  usr/share/icecream-envs/%{name}_%{_arch}.glibc
 rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env

diff --git a/packaging/gcc.spec.in b/packaging/gcc.spec.in
index 2180a99..136951c 100644 (file)
--- a/packaging/gcc.spec.in
+++ b/packaging/gcc.spec.in
@@ -37,12 +37,14 @@
 %define build_java 0
 %define build_libjava 0
 
-%define build_cp 1
-%define build_fortran 0
+# Also go and objc aren't needed right now
 %define build_objc 0
 %define build_objcp 0
 %define build_go 0
 
+%define build_cp 1
+%define build_fortran !0%{?building_libjava:1}%{?building_libffi:1}
+
 %if %{build_objcp}
 %define build_cp 1
 %define build_objc 1
@@ -235,16 +237,18 @@ Requires: libubsan%{libubsan_sover} >= %{version}-%{release}
 %ifarch %vtv_arch
 Requires: libvtv%{libvtv_sover} >= %{version}-%{release}
 %endif
-Suggests: gcc@base_ver@-info gcc@base_ver@-locale
+Requires: gcc@base_ver@-info gcc@base_ver@-locale
 %endif
 
 # COMMON-BEGIN
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 Source:                gcc-%{version}.tar.bz2
 Source1:       change_spec
-Source2:       gcc49-rpmlintrc
-Source3:       ecj.jar
-Source4:       baselibs.conf
+Source2:       libffi49-rpmlintrc
+Source3:       gcc49-rpmlintrc
+Source4:       ecj.jar
+Source5:       baselibs.conf
+Source6:       libgcj49-rpmlintrc
 
 # GCC-TESTSUITE-DELETE-BEGIN
 # LIBJAVA-DELETE-BEGIN
@@ -420,7 +424,7 @@ option.
 Summary:      The standard C++ shared library
 License:        GPL-3.0-with-GCC-exception
 Group:          Development/Building
-Suggests:      libstdc++%{libstdcxx_sover}-locale
+Requires:      libstdc++%{libstdcxx_sover}-locale
 Provides:      libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release}
 
 %description -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}@variant@
@@ -725,7 +729,7 @@ The runtime library needed to run programs compiled with the
 Summary:      Java Runtime Library for gcc
 License:      GPL-2.0-with-classpath-exception
 Group:        Development/Building
-Recommends:   libgcj@base_ver@-jar = %{version}-%{release}
+Requires:   libgcj@base_ver@-jar = %{version}-%{release}
 Provides: libgcj%{libgcj_sover} = %{version}-%{release}
 Provides: libgij%{libgcj_sover} = %{version}-%{release}
 Provides: libgcj-tools%{libgcj_sover} = %{version}-%{release}
@@ -845,7 +849,7 @@ A foreign function interface is the popular name for the interface that allows c
 # PACKAGE-BEGIN
 %package go@variant@
 Summary:      GNU Go Compiler
-License:        GPL-3.0+ 
+License:        GPL-3.0+
 Group:        Development/Languages
 Requires: gcc@base_ver@@variant@ = %{version}-%{release}
 Requires: libgo%{libgo_sover}@variant@ >= %{version}-%{release}
@@ -1035,8 +1039,8 @@ cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER
 rm -rf obj-%{GCCDIST}
 mkdir obj-%{GCCDIST}
 cd obj-%{GCCDIST}
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE"
-RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-Wmissing-format-attribute//g' -e 's/-fstack-protector//g' -e 's/-ffortify=.//g' -e 's/-Wall//g' -e 's/-m32//g' -e 's/-m64//g' -e 's/-fexceptions//'`
+RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-Wmissing-format-attribute//g' -e 's/-fstack-protector//g' -e 's/-ffortify=.//g' -e 's/-Wall//g' -e 's/-m32//g' -e 's/-m64//g' -e 's/-fexceptions//' -e 's/\([[:space:]]\+.*-D_FORTIFY_SOURCE=\)[[:alnum:]]\+/\10/g'
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D__USE_FORTIFY_LEVEL=0"`
 %ifarch %ix86
 # -mcpu is superceded by -mtune but -mtune is not supported by
 # our bootstrap compiler.  -mcpu gives a warning that stops
@@ -1134,8 +1138,6 @@ export PATH="`pwd`/host-tools/bin:$PATH"
 GCJ_EXTRA_FLAGS="-marm"
 %endif
 
-export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e "s/ -Wp,-D_FORTIFY_SOURCE=2 / /g"`"
-
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \
 TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
 ../configure \
@@ -1149,6 +1151,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
        --enable-ssp \
        --disable-libssp \
+       --disable-bootstrap \
 %if 0%{!?build_libvtv:1}
        --disable-libvtv \
 %endif
@@ -1217,7 +1220,7 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-abi=aapcs-linux \
        --disable-sjlj-exceptions \
 %endif
-%if "%{TARGET_ARCH}" == "armv7l" 
+%if "%{TARGET_ARCH}" == "armv7l"
        --with-arch=armv7-a \
        --with-tune=cortex-a8 \
        --with-float=softfp \
@@ -1293,7 +1296,7 @@ make all-target-libffi $PARALLEL
 %else
 STAGE1_FLAGS="-g"
 # Only run profiled bootstrap on archs where it works and matters
-%ifarch x86_64 ppc64le s390x
+%ifarch ppc64le s390x
 make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL
 %else
 make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL
@@ -1414,7 +1417,7 @@ for i in `find %{GCCDIST}/[36]*/libstdc++-v3/include -name c++config.h 2>/dev/nu
       echo "Urgs?"
       exit 1
     fi
-    
+
     cat > $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_dir_version}/%{GCCDIST}/bits/c++config.h <<EOF
 #ifndef _CPP_CPPCONFIG_WRAPPER
 #define _CPP_CPPCONFIG_WRAPPER 1
@@ -1624,7 +1627,7 @@ for l in `find $RPM_BUILD_ROOT -name '*.la'`; do
 done
 
 # GCC-TESTSUITE-DELETE-END
-%if 0%{?run_tests:1} 
+%if 0%{?run_tests:1}
 cp `find . -name "*.sum"` ../testresults/
 cp `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
 chmod 644 ../testresults/*
@@ -1732,7 +1735,7 @@ mv $RPM_BUILD_ROOT%{_infodir}/libgomp.info $RPM_BUILD_ROOT%{_infodir}/libgomp%{b
 %ifarch %itm_arch
 mv $RPM_BUILD_ROOT%{_infodir}/libitm.info $RPM_BUILD_ROOT%{_infodir}/libitm%{binsuffix}.info
 %endif
-%if %{build_fortran} 
+%if %{build_fortran}
 %ifarch %quadmath_arch
 mv $RPM_BUILD_ROOT%{_infodir}/libquadmath.info $RPM_BUILD_ROOT%{_infodir}/libquadmath%{binsuffix}.info
 %endif
@@ -1744,6 +1747,10 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn.info $RPM_BUILD_ROOT%{_infodir}/gnat_ugn%
 %endif
 %endif
 
+%ifnarch %quadmath_arch
+rm -vf $RPM_BUILD_ROOT%{_infodir}/libquadmath*.info*
+%endif
+
 # LIBJAVA-DELETE-BEGIN
 cd ..
 %find_lang cpplib%{binsuffix}
@@ -1758,7 +1765,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
 %install_info --info-dir=%{_infodir} %{_infodir}/gccint%{binsuffix}.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/gccinstall%{binsuffix}.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/libgomp%{binsuffix}.info.gz
-%if %{build_fortran} 
+%if %{build_fortran}
 %install_info --info-dir=%{_infodir} %{_infodir}/gfortran%{binsuffix}.info.gz
 %ifarch %quadmath_arch
 %install_info --info-dir=%{_infodir} %{_infodir}/libquadmath%{binsuffix}.info.gz