pool/gcc
SHA256
3
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 922193 from devel:gcc

Browse Source 
- Move /lib/cpp to /usr/lib/cpp for the usr merge.  [bsc#1191060]

OBS-URL: https://build.opensuse.org/request/show/922193
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcc?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2021-10-04 16:39:14 +00:00 committed by Git OBS Bridge
commit 10f768c74a
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 29 13:02:30 UTC 2021 - Richard Biener <rguenther@suse.com>
- Move /lib/cpp to /usr/lib/cpp for the usr merge. [bsc#1191060]
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 27 17:41:23 UTC 2021 - Andreas Schwab <schwab@suse.de> Fri Aug 27 17:41:23 UTC 2021 - Andreas Schwab <schwab@suse.de>

13
gcc.spec
View File

@ -446,9 +446,16 @@ done
for info in cpp gcc gfortran ; do for info in cpp gcc gfortran ; do
ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
done done
# Provide the traditional /lib/cpp that only handles C # Provide the traditional /lib/cpp (as /usr/lib/cpp on usrmerged systems)
# that only handles C
%if 0%{?suse_version} < 1550
cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT/lib/ cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT/lib/
chmod 755 $RPM_BUILD_ROOT/lib/cpp chmod 755 $RPM_BUILD_ROOT/lib/cpp
%else
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT%{_prefix}/lib/
chmod 755 $RPM_BUILD_ROOT%{_prefix}/lib/cpp
%endif
# Provide extra symlinks # Provide extra symlinks
ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++ ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++
ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
@ -500,7 +507,11 @@ fi
%files -n cpp %files -n cpp
%defattr(-,root,root) %defattr(-,root,root)
%if 0%{?suse_version} < 1550
/lib/cpp /lib/cpp
%else
%{_prefix}/lib/cpp
%endif
%{_prefix}/bin/cpp %{_prefix}/bin/cpp
%doc %{_mandir}/man1/cpp.1.gz %doc %{_mandir}/man1/cpp.1.gz