Merge pull request #1 from import/lcc:rosa2021.1

Backports and update

.abf.yml

@@ -1,3 +1,3 @@
 sources:
-  lcc-libs_1.25.22-vd6u42_e2k-8c.deb: 1b5b9f17e2d5c3c9ea5fdb0e80b65cfbb01bdc99
-  lcc_1.25.22-vd6u2_e2k-8c.deb: 803aa994c3c83ea630d420b0d848d0313b77715b
+  lcc-libs_1.25.26-vd6u42_e2k-8c.deb: 1ad7951cb506938074162235d21c31f8c96cbc22
+  lcc_1.25.26-vd6u2_e2k-8c.deb: f58f9907bfb2034aea1d4c0677f63ca118dbb219

c89

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+fl="-std=c89"
+for opt; do
+  case "$opt" in
+    -ansi|-std=c89|-std=iso9899:1990) fl="";;
+    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}

c99

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+fl="-std=c99"
+for opt; do
+  case "$opt" in
+    -std=c99|-std=iso9899:1999) fl="";;
+    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	    exit 1;;
+  esac
+done
+exec gcc $fl ${1+"$@"}

lcc.spec

@@ -16,16 +16,21 @@
 
 Summary:        lcc from mcst repository binaries
 Name:           lcc
-Version:        1.25.22
+Version:        1.25.26
 Release:        1
 License:        GPLv2+
 Group:          System/Base
+# https://storage.mcst.ru/repo/pdk/sp/1.25/
 Source0:        lcc_%{version}-vd6u2_e2k-8c.deb
 Source1:        lcc-libs_%{version}-vd6u42_e2k-8c.deb
+Source2:	c89
+Source3:	c99
 Source100:	lcc.rpmlintrc
 Provides:	gcc
 Provides:	gcc(e2k-64)
 Provides:	gcc-c++
+Provides:	gcc-cpp
+Provides:	gcc-gfortran
 Requires:	lcc-kit-devel
 
 Requires:   %{libomp_static_devel} >= %{EVRD}
@@ -253,6 +258,7 @@ This package contains Fortran 95 shared library which is needed to
 compile Fortran 95 programs.
 
 %files -n %{liblfortran_devel}
+%{_libdir}/libgfortran.so
 %{_libdir}/liblfortran.so
 %{_libdir}/liblfortran.spec
 
@@ -330,6 +336,7 @@ Group:		Development/C
 Requires:	%{name} = %{EVRD}
 Requires:	%{libomp} = %{EVRD}
 Provides:	libomp-devel = %{EVRD}
+Provides:	libgomp-devel = %{EVRD}
 Provides:	gomp-devel = %{EVRD}
 Provides:   omp-devel = %{EVRD}
 
@@ -415,6 +422,8 @@ rm -fv data.tar.* control.tar*
 
 %install
 cp -frax opt usr var %{buildroot}
+install -m755 %{SOURCE2} %{buildroot}%{_bindir}
+install -m755 %{SOURCE3} %{buildroot}%{_bindir}
 %if %{without bundled_libs}
 
 rm -fv %{buildroot}/%{_libdir}/libstdc*
@@ -439,13 +448,18 @@ cp -fvp opt/mcst/lcc-home/%{version}/e2k-v4-linux/lib64/libeprof.a %{buildroot}/
 ln -s libeprof.so.%{eprof_major} %{buildroot}/%{_libdir}/libeprof.so
 unlink %{buildroot}/%{_prefix}/lib
 
+# compat symlink for cpp
+mkdir -p %{buildroot}/lib
+ln -s %{_bindir}/cpp %{buildroot}/lib/cpp
+
 %if %{with bundled_libs}
 mkdir -p %{buildroot}/%{_libdir}
 # fortran
 cp -fvp opt/mcst/lcc-home/%{version}/e2k-v4-linux/lib64/liblfortran.a %{buildroot}/%{_libdir}
 cp -fvp opt/mcst/lcc-home/%{version}/e2k-v4-linux/lib64/liblfortran.spec %{buildroot}/%{_libdir}
-# backward compat for omp libs
+# backward compat for fortran libs
 ln -s liblfortran.so.%{gfortran_major} %{buildroot}/%{_libdir}/liblfortran.so
+ln -s %{_libdir}/liblfortran.so %{buildroot}/%{_libdir}/libgfortran.so
 # quadmath
 cp -fvp opt/mcst/lcc-home/%{version}/e2k-v4-linux/lib64/libquadmath.a %{buildroot}/%{_libdir}
 ln -s libquadmath.so.%{quadmath_major} %{buildroot}/%{_libdir}/libquadmath.so
@@ -472,6 +486,8 @@ cp -fvr opt/mcst/lcc-home/%{version}/e2k-v4-linux/include/c++/ %{buildroot}/%{_i
 %{_bindir}/cpp
 %{_bindir}/g++
 %{_bindir}/gcc
+%{_bindir}/c89
+%{_bindir}/c99
 %{_bindir}/gfortran
 
 /opt/mcst/lcc-home/%{version}/e2k-v4-linux/bin/*
@@ -480,7 +496,7 @@ cp -fvr opt/mcst/lcc-home/%{version}/e2k-v4-linux/include/c++/ %{buildroot}/%{_i
 /opt/mcst/bin/lcc
 /opt/mcst/bin/ldis
 /opt/mcst/bin/lfortran
-
+/lib/cpp
 
 
 /var/log/build/lcc-%{version}-libs.build.ident