- Move /lib/cpp to /usr/lib/cpp for the usr merge. [bsc#1191060]
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=111
This commit is contained in:
parent
fdc3716827
commit
e89494725c
@ -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>
|
||||
|
||||
|
12
gcc.spec
12
gcc.spec
@ -446,9 +446,15 @@ done
|
||||
for info in cpp gcc gfortran ; do
|
||||
ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
|
||||
done
|
||||
# Provide the traditional /lib/cpp that only handles C
|
||||
# Provide the traditional /usr/lib/cpp that only handles C
|
||||
%if !0%{?usrmerged}
|
||||
cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT/lib/
|
||||
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
|
||||
ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++
|
||||
ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
|
||||
@ -500,7 +506,11 @@ fi
|
||||
|
||||
%files -n cpp
|
||||
%defattr(-,root,root)
|
||||
%if !0%{?usrmerged}
|
||||
/lib/cpp
|
||||
%else
|
||||
%{_prefix}/lib/cpp
|
||||
%endif
|
||||
%{_prefix}/bin/cpp
|
||||
%doc %{_mandir}/man1/cpp.1.gz
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user