- Remove broken libffi build support.
- Remove more Java remanents. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=3
This commit is contained in:
Richard Biener
Git OBS Bridge
parent
68ed6fc949
commit
9ff42027cd
30
change_spec
30
change_spec
@ -2,8 +2,7 @@
|
||||
|
||||
do_crosses=0
|
||||
do_optional_compiler_languages=0
|
||||
do_libffi=0
|
||||
rm -f libffi*.spec libffi*.changes gcc*-testresults.spec gcc*-testresults.changes gcc*.spec cross*.spec cross*.changes
|
||||
rm -f gcc*-testresults.spec gcc*-testresults.changes gcc*.spec cross*.spec cross*.changes
|
||||
|
||||
# Default is to generate the normal gcc package
|
||||
# unless a parameter is given. In case that it is '-*',
|
||||
@ -50,33 +49,6 @@ p
|
||||
}
|
||||
}' >> $outfile
|
||||
|
||||
if test "$do_libffi" = "1"; then
|
||||
|
||||
echo '%define building_libffi 1' > libffi-gcc$base_ver.spec
|
||||
sed -e '/^# LIBFFI-DELETE-BEGIN/,/^# LIBFFI-DELETE-END/d;s/^Name:[[:space:]]*gcc/Name: libffi-gcc/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-gcc$base_ver.spec
|
||||
test -f gcc$base_ver.changes \
|
||||
&& ( ln -f gcc$base_ver.changes libffi-gcc$base_ver.changes; )
|
||||
|
||||
fi
|
||||
|
||||
echo '%define building_testsuite 1' > gcc$base_ver-testresults.spec
|
||||
echo '%define run_tests 1' >> 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' \
|
||||
|
||||
42
gcc.spec.in
42
gcc.spec.in
@ -32,7 +32,7 @@
|
||||
%endif
|
||||
|
||||
%ifarch %ada_arch
|
||||
%define build_ada !0%{?building_libffi:1}
|
||||
%define build_ada 1
|
||||
%else
|
||||
%define build_ada 0
|
||||
%endif
|
||||
@ -53,10 +53,10 @@
|
||||
%endif
|
||||
|
||||
%define build_cp 1
|
||||
%define build_fortran !0%{?building_libffi:1}
|
||||
%define build_objc !0%{?building_libffi:1}
|
||||
%define build_objcp !0%{?building_libffi:1}
|
||||
%define build_go !0%{?building_libffi:1}
|
||||
%define build_fortran 1
|
||||
%define build_objc 1
|
||||
%define build_objcp 1
|
||||
%define build_go 1
|
||||
|
||||
%if %{build_objcp}
|
||||
%define build_cp 1
|
||||
@ -94,7 +94,6 @@
|
||||
%define libgcc_s 1
|
||||
%endif
|
||||
%endif
|
||||
%define libffi_sover 7
|
||||
%define libgomp_sover 1
|
||||
%define libgomp_plugin_hsa_sover 1
|
||||
%define libstdcxx_sover 6
|
||||
@ -128,7 +127,6 @@
|
||||
%define plv() %{expand:%%{!?itsme%{expand:%%{!?product_libs_gcc_ver_%{1}%{2}:%%{plv_}}%%{?product_libs_gcc_ver_%{1}%{2}}}:-gcc@base_ver@}}
|
||||
|
||||
%define libgcc_s_suffix %{plv libgcc_s %{libgcc_s}}
|
||||
%define libffi_suffix %{plv libffi %{libffi_sover}}
|
||||
%define libgomp_suffix %{plv libgomp %{libgomp_sover}}
|
||||
%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}}
|
||||
%define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}}
|
||||
@ -193,9 +191,6 @@ BuildRequires: gcc-ada
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
%endif
|
||||
%if 0%{?building_libffi:1}
|
||||
BuildRequires: pkg-config
|
||||
%endif
|
||||
%ifarch ia64
|
||||
BuildRequires: libunwind-devel
|
||||
%endif
|
||||
@ -246,7 +241,7 @@ Release: 1
|
||||
%define binsuffix -@base_ver@
|
||||
# COMMON-END
|
||||
|
||||
%if !0%{?building_libffi:1}%{?building_testsuite:1}
|
||||
%if !0%{?building_testsuite:1}
|
||||
Requires: binutils glibc-devel
|
||||
Requires: cpp@base_ver@ = %{version}-%{release}
|
||||
Requires: libgcc_s%{libgcc_s} >= %{version}-%{release}
|
||||
@ -286,7 +281,6 @@ Suggests: gcc@base_ver@-info gcc@base_ver@-locale
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: gcc-%{gcc_version}%{gcc_snapshot_revision}.tar.bz2
|
||||
Source1: change_spec
|
||||
Source2: libffi-gcc7-rpmlintrc
|
||||
Source3: gcc7-rpmlintrc
|
||||
Source4: README.First-for.SuSE.packagers
|
||||
|
||||
@ -310,7 +304,6 @@ Patch61: gcc44-rename-info-files.patch
|
||||
|
||||
|
||||
# GCC-TESTSUITE-DELETE-BEGIN
|
||||
# LIBJAVA-DELETE-BEGIN
|
||||
Group: Development/Languages/C and C++
|
||||
Summary: The GNU C Compiler and Support Files
|
||||
License: GPL-3.0+
|
||||
@ -322,7 +315,6 @@ frontend.
|
||||
Language frontends other than C are split to different sub-packages,
|
||||
namely gcc-ada, gcc-c++, gcc-fortran, gcc-objc and
|
||||
gcc-obj-c++.
|
||||
# LIBFFI-DELETE-BEGIN
|
||||
|
||||
|
||||
|
||||
@ -1434,8 +1426,6 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# LIBFFI-DELETE-BEGIN
|
||||
# LIBJAVA-DELETE-BEGIN
|
||||
%if %{build_cp}
|
||||
# Merge multilib c++config.h to allow omitting the duplicate and
|
||||
# identical other arch specific headers
|
||||
@ -1481,7 +1471,6 @@ if ! test -z "$dir_ml"; then
|
||||
ln -s . $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_dir_version}/%{GCCDIST}/$dir_ml
|
||||
fi
|
||||
%endif
|
||||
# LIBJAVA-DELETE-END
|
||||
|
||||
# move shared libs from versionspecific dir to main libdir
|
||||
for libname in \
|
||||
@ -1576,7 +1565,6 @@ sed -i -e '/^libdir/s/\/gcc\/%{GCCDIST}\/%{gcc_dir_version}//g' $RPM_BUILD_ROOT%
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# LIBJAVA-DELETE-BEGIN
|
||||
# Move libgcc_s around
|
||||
if test -L $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so; then
|
||||
rm -f $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so
|
||||
@ -1608,9 +1596,6 @@ chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# LIBJAVA-DELETE-END
|
||||
# LIBFFI-DELETE-END
|
||||
|
||||
%if %{build_ada}
|
||||
mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir}
|
||||
ln -sf %{_libdir}/libgnarl%{binsuffix}.so $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so
|
||||
@ -1653,15 +1638,6 @@ cp `find . -name "*.log" \! -name "config.log" | grep -v 'acats.\?/tests' ` ../
|
||||
chmod 644 ../testresults/*
|
||||
%endif
|
||||
# GCC-TESTSUITE-DELETE-BEGIN
|
||||
# LIBFFI-DELETE-BEGIN
|
||||
%if %{build_cp}
|
||||
# Find C++ and Java headers
|
||||
find $RPM_BUILD_ROOT%{_prefix}/include/c++ \
|
||||
-regex ".*/\(org\|gnu\\)" -prune \
|
||||
-o \( -type d -printf "%%%%dir " , \
|
||||
-printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers
|
||||
%endif
|
||||
# LIBFFI-DELETE-END
|
||||
# Remove files that we do not need to clean up filelist
|
||||
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-*
|
||||
rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools
|
||||
@ -1696,7 +1672,6 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/liblto_plugin.la
|
||||
rm $RPM_BUILD_ROOT%{_infodir}/gccgo.info*
|
||||
%endif
|
||||
|
||||
# LIBFFI-DELETE-BEGIN
|
||||
# For regular build, some info files do not get renamed properly.
|
||||
# Do so here.
|
||||
mv $RPM_BUILD_ROOT%{_infodir}/libgomp.info $RPM_BUILD_ROOT%{_infodir}/libgomp%{binsuffix}.info
|
||||
@ -1715,7 +1690,6 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn.info $RPM_BUILD_ROOT%{_infodir}/gnat_ugn%
|
||||
%endif
|
||||
|
||||
|
||||
# LIBJAVA-DELETE-BEGIN
|
||||
cd ..
|
||||
%find_lang cpplib%{binsuffix}
|
||||
%find_lang gcc%{binsuffix}
|
||||
@ -2073,12 +2047,13 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
|
||||
%biarchlib libstdc++.so.%{libstdcxx_sover}*
|
||||
%endif
|
||||
|
||||
%files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix} -f c++-headers
|
||||
%files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
|
||||
%defattr(-,root,root)
|
||||
%versmainlib libstdc++.a
|
||||
%versmainlib libstdc++fs.a
|
||||
%versmainlib libstdc++.so
|
||||
%versmainlib libsupc++.a
|
||||
%{_prefix}/include/c++
|
||||
%dir %{_datadir}/gdb
|
||||
%dir %{_datadir}/gdb/auto-load
|
||||
%dir %{_datadir}/gdb/auto-load%{_prefix}
|
||||
@ -2442,7 +2417,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
|
||||
%biarchlib libgnat-*.so
|
||||
%endif
|
||||
%endif
|
||||
# LIBJAVA-DELETE-END
|
||||
|
||||
%if %{build_go}
|
||||
%files go
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 28 10:43:45 UTC 2016 - rguenther@suse.com
|
||||
|
||||
- Remove broken libffi build support.
|
||||
- Remove more Java remanents.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 25 08:30:28 UTC 2016 - mliska@suse.cz
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
%endif
|
||||
|
||||
%ifarch %ada_arch
|
||||
%define build_ada !0%{?building_libffi:1}
|
||||
%define build_ada 1
|
||||
%else
|
||||
%define build_ada 0
|
||||
%endif
|
||||
@ -69,10 +69,10 @@
|
||||
%endif
|
||||
|
||||
%define build_cp 1
|
||||
%define build_fortran !0%{?building_libffi:1}
|
||||
%define build_objc !0%{?building_libffi:1}
|
||||
%define build_objcp !0%{?building_libffi:1}
|
||||
%define build_go !0%{?building_libffi:1}
|
||||
%define build_fortran 1
|
||||
%define build_objc 1
|
||||
%define build_objcp 1
|
||||
%define build_go 1
|
||||
|
||||
%if %{build_objcp}
|
||||
%define build_cp 1
|
||||
@ -110,7 +110,6 @@
|
||||
%define libgcc_s 1
|
||||
%endif
|
||||
%endif
|
||||
%define libffi_sover 7
|
||||
%define libgomp_sover 1
|
||||
%define libgomp_plugin_hsa_sover 1
|
||||
%define libstdcxx_sover 6
|
||||
@ -144,7 +143,6 @@
|
||||
%define plv() %{expand:%%{!?itsme%{expand:%%{!?product_libs_gcc_ver_%{1}%{2}:%%{plv_}}%%{?product_libs_gcc_ver_%{1}%{2}}}:-gcc7}}
|
||||
|
||||
%define libgcc_s_suffix %{plv libgcc_s %{libgcc_s}}
|
||||
%define libffi_suffix %{plv libffi %{libffi_sover}}
|
||||
%define libgomp_suffix %{plv libgomp %{libgomp_sover}}
|
||||
%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}}
|
||||
%define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}}
|
||||
@ -206,9 +204,6 @@ BuildRequires: gcc-ada
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
%endif
|
||||
%if 0%{?building_libffi:1}
|
||||
BuildRequires: pkg-config
|
||||
%endif
|
||||
%ifarch ia64
|
||||
BuildRequires: libunwind-devel
|
||||
%endif
|
||||
@ -257,7 +252,7 @@ Release: 0
|
||||
%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
|
||||
%define binsuffix -7
|
||||
|
||||
%if !0%{?building_libffi:1}%{?building_testsuite:1}
|
||||
%if !0%{?building_testsuite:1}
|
||||
Requires: binutils
|
||||
Requires: cpp7 = %{version}-%{release}
|
||||
Requires: glibc-devel
|
||||
@ -297,7 +292,6 @@ Suggests: gcc7-info gcc7-locale
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: gcc-%{gcc_version}%{gcc_snapshot_revision}.tar.bz2
|
||||
Source1: change_spec
|
||||
Source2: libffi-gcc7-rpmlintrc
|
||||
Source3: gcc7-rpmlintrc
|
||||
Source4: README.First-for.SuSE.packagers
|
||||
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 28 10:43:45 UTC 2016 - rguenther@suse.com
|
||||
|
||||
- Remove broken libffi build support.
|
||||
- Remove more Java remanents.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 25 08:30:28 UTC 2016 - mliska@suse.cz
|
||||
|
||||
|
||||
28
gcc7.spec
28
gcc7.spec
@ -30,7 +30,7 @@
|
||||
%endif
|
||||
|
||||
%ifarch %ada_arch
|
||||
%define build_ada !0%{?building_libffi:1}
|
||||
%define build_ada 1
|
||||
%else
|
||||
%define build_ada 0
|
||||
%endif
|
||||
@ -51,10 +51,10 @@
|
||||
%endif
|
||||
|
||||
%define build_cp 1
|
||||
%define build_fortran !0%{?building_libffi:1}
|
||||
%define build_objc !0%{?building_libffi:1}
|
||||
%define build_objcp !0%{?building_libffi:1}
|
||||
%define build_go !0%{?building_libffi:1}
|
||||
%define build_fortran 1
|
||||
%define build_objc 1
|
||||
%define build_objcp 1
|
||||
%define build_go 1
|
||||
|
||||
%if %{build_objcp}
|
||||
%define build_cp 1
|
||||
@ -92,7 +92,6 @@
|
||||
%define libgcc_s 1
|
||||
%endif
|
||||
%endif
|
||||
%define libffi_sover 7
|
||||
%define libgomp_sover 1
|
||||
%define libgomp_plugin_hsa_sover 1
|
||||
%define libstdcxx_sover 6
|
||||
@ -126,7 +125,6 @@
|
||||
%define plv() %{expand:%%{!?itsme%{expand:%%{!?product_libs_gcc_ver_%{1}%{2}:%%{plv_}}%%{?product_libs_gcc_ver_%{1}%{2}}}:-gcc7}}
|
||||
|
||||
%define libgcc_s_suffix %{plv libgcc_s %{libgcc_s}}
|
||||
%define libffi_suffix %{plv libffi %{libffi_sover}}
|
||||
%define libgomp_suffix %{plv libgomp %{libgomp_sover}}
|
||||
%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}}
|
||||
%define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}}
|
||||
@ -188,9 +186,6 @@ BuildRequires: gcc-ada
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
%endif
|
||||
%if 0%{?building_libffi:1}
|
||||
BuildRequires: pkg-config
|
||||
%endif
|
||||
%ifarch ia64
|
||||
BuildRequires: libunwind-devel
|
||||
%endif
|
||||
@ -239,7 +234,7 @@ Release: 0
|
||||
%define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
|
||||
%define binsuffix -7
|
||||
|
||||
%if !0%{?building_libffi:1}%{?building_testsuite:1}
|
||||
%if !0%{?building_testsuite:1}
|
||||
Requires: binutils
|
||||
Requires: cpp7 = %{version}-%{release}
|
||||
Requires: glibc-devel
|
||||
@ -279,7 +274,6 @@ Suggests: gcc7-info gcc7-locale
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: gcc-%{gcc_version}%{gcc_snapshot_revision}.tar.bz2
|
||||
Source1: change_spec
|
||||
Source2: libffi-gcc7-rpmlintrc
|
||||
Source3: gcc7-rpmlintrc
|
||||
Source4: README.First-for.SuSE.packagers
|
||||
|
||||
@ -2332,13 +2326,6 @@ cp `find . -name "*.sum"` ../testresults/
|
||||
cp `find . -name "*.log" \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
|
||||
chmod 644 ../testresults/*
|
||||
%endif
|
||||
%if %{build_cp}
|
||||
# Find C++ and Java headers
|
||||
find $RPM_BUILD_ROOT%{_prefix}/include/c++ \
|
||||
-regex ".*/\(org\|gnu\\)" -prune \
|
||||
-o \( -type d -printf "%%%%dir " , \
|
||||
-printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers
|
||||
%endif
|
||||
# Remove files that we do not need to clean up filelist
|
||||
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-*
|
||||
rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools
|
||||
@ -2746,12 +2733,13 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc7-locale.lang
|
||||
%biarchlib libstdc++.so.%{libstdcxx_sover}*
|
||||
%endif
|
||||
|
||||
%files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix} -f c++-headers
|
||||
%files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
|
||||
%defattr(-,root,root)
|
||||
%versmainlib libstdc++.a
|
||||
%versmainlib libstdc++fs.a
|
||||
%versmainlib libstdc++.so
|
||||
%versmainlib libsupc++.a
|
||||
%{_prefix}/include/c++
|
||||
%dir %{_datadir}/gdb
|
||||
%dir %{_datadir}/gdb/auto-load
|
||||
%dir %{_datadir}/gdb/auto-load%{_prefix}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user