diff options
Diffstat (limited to 'debian/rules.d/binary-gcc.mk')
| -rw-r--r-- | debian/rules.d/binary-gcc.mk | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk index 25ddbd8..284e376 100644 --- a/debian/rules.d/binary-gcc.mk +++ b/debian/rules.d/binary-gcc.mk @@ -27,7 +27,7 @@ endif # but it becomes difficult to name all these files ... dirs_gcc = \ - $(docdir)/$(p_xbase)/{gcc,libssp,gomp,itm,quadmath,sanitizer,cilkrts,mpx} \ + $(docdir)/$(p_xbase)/{gcc,libssp,gomp,itm,quadmath,sanitizer} \ $(PF)/bin \ $(gcc_lexec_dir) \ $(gcc_lib_dir)/{include,include-fixed} \ @@ -44,9 +44,12 @@ files_gcc = \ ifeq ($(with_libcc1_plugin),yes) files_gcc += \ - $(gcc_lib_dir)/plugin/libcc1plugin.so{,.0,.0.0.0} + $(gcc_lib_dir)/plugin/libc[cp]1plugin.so{,.0,.0.0.0} endif +files_gcc += \ + $(gcc_lexec_dir)/liblto_plugin.so{,.0,.0.0.0} + ifeq ($(DEB_STAGE),stage1) files_gcc += \ $(gcc_lib_dir)/include \ @@ -117,16 +120,6 @@ ifeq ($(with_asan),yes) cp -p $(srcdir)/libsanitizer/ChangeLog \ $(d_gcc)/$(docdir)/$(p_xbase)/sanitizer/changelog endif -ifeq ($(with_cilkrts),yes) - mv $(d)/$(usr_lib)/libcilkrts.spec $(d_gcc)/$(gcc_lib_dir)/ - cp -p $(srcdir)/libcilkrts/ChangeLog \ - $(d_gcc)/$(docdir)/$(p_xbase)/cilkrts/changelog -endif -ifeq ($(with_mpx),yes) - mv $(d)/$(usr_lib)/libmpx.spec $(d_gcc)/$(gcc_lib_dir)/ - cp -p $(srcdir)/libmpx/ChangeLog \ - $(d_gcc)/$(docdir)/$(p_xbase)/mpx/changelog -endif ifeq ($(with_cc1),yes) rm -f $(d)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libcc1.so dh_link -p$(p_gcc) \ @@ -175,13 +168,21 @@ endif true; \ fi -ifeq ($(GFDL_INVARIANT_FREE),yes) mkdir -p $(d_gcc)/usr/share/lintian/overrides + echo '$(p_gcc) binary: hardening-no-pie' \ + > $(d_gcc)/usr/share/lintian/overrides/$(p_gcc) +ifeq ($(GFDL_INVARIANT_FREE),yes) echo '$(p_gcc) binary: binary-without-manpage' \ >> $(d_gcc)/usr/share/lintian/overrides/$(p_gcc) endif debian/dh_rmemptydirs -p$(p_gcc) +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS))) + $(DWZ) \ + $(d_gcc)/$(gcc_lexec_dir)/lto1 \ + $(d_gcc)/$(gcc_lexec_dir)/lto-wrapper \ + $(d_gcc)/$(gcc_lexec_dir)/collect2 +endif dh_strip -p$(p_gcc) \ $(if $(unstripped_exe),-X/lto1) dh_shlibdeps -p$(p_gcc) @@ -227,6 +228,9 @@ $(binary_stamp)-gcc-plugindev: $(install_dependencies) debian/dh_rmemptydirs -p$(p_pld) dh_strip -p$(p_pld) dh_shlibdeps -p$(p_pld) + mkdir -p $(d_pld)/usr/share/lintian/overrides + echo '$(p_pld) binary: hardening-no-pie' \ + > $(d_pld)/usr/share/lintian/overrides/$(p_pld) echo $(p_pld) >> debian/arch_binaries trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) |