diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-02-26 18:30:15 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-02-26 18:30:15 +0000 |
| commit | 1911bfe6e8c84de3afac1385c5321e65c12f7227 (patch) | |
| tree | 1ac0ee54ee877ae2137d12933aef2b7d5bc02459 /debian/rules.d | |
| parent | 4749f1476cfab11bd502b88a9feeedd5191efc4f (diff) | |
| download | gcc-5-1911bfe6e8c84de3afac1385c5321e65c12f7227.tar.gz | |
* Remove the support to build empty libsanitizer packages on powerpc
and ppc64; libsanitizer should be stable on these architectures.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7854 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.d')
| -rw-r--r-- | debian/rules.d/binary-gcc.mk | 2 | ||||
| -rw-r--r-- | debian/rules.d/binary-libasan.mk | 3 | ||||
| -rw-r--r-- | debian/rules.d/binary-libgcc.mk | 2 | ||||
| -rw-r--r-- | debian/rules.d/binary-libubsan.mk | 3 |
4 files changed, 2 insertions, 8 deletions
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk index c730b44..56a8574 100644 --- a/debian/rules.d/binary-gcc.mk +++ b/debian/rules.d/binary-gcc.mk @@ -102,11 +102,9 @@ ifeq ($(with_qmath),yes) $(d_gcc)/$(docdir)/$(p_xbase)/quadmath/changelog endif ifeq ($(with_asan),yes) - ifneq ($(empty_sanitizer_packages),yes) mv $(d)/$(usr_lib)/libsanitizer*.spec $(d_gcc)/$(gcc_lib_dir)/ cp -p $(srcdir)/libsanitizer/ChangeLog \ $(d_gcc)/$(docdir)/$(p_xbase)/sanitizer/changelog - endif endif ifeq ($(with_cilkrts),yes) mv $(d)/$(usr_lib)/libcilkrts.spec $(d_gcc)/$(gcc_lib_dir)/ diff --git a/debian/rules.d/binary-libasan.mk b/debian/rules.d/binary-libasan.mk index 95f0a02..8822034 100644 --- a/debian/rules.d/binary-libasan.mk +++ b/debian/rules.d/binary-libasan.mk @@ -25,8 +25,7 @@ define __do_asan rm -rf $(d_l) $(d_d) dh_installdirs -p$(p_l) $(usr_lib$(2)) - $(if $(empty_sanitizer_packages),, \ - DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libasan.so.* ) + DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libasan.so.* debian/dh_doclink -p$(p_l) $(p_base) debian/dh_doclink -p$(p_d) $(p_base) diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk index a2c78bb..2d17710 100644 --- a/debian/rules.d/binary-libgcc.mk +++ b/debian/rules.d/binary-libgcc.mk @@ -237,7 +237,6 @@ define __do_gcc_devels2 $(if $(filter yes, $(with_atomic)), $(call install_gcc_lib,libatomic,$(ATOMIC_SONAME),$(1),$(2)) ) - $(if $(empty_sanitizer_packages),, $(if $(filter yes, $(with_asan)), $(call install_gcc_lib,libasan,$(ASAN_SONAME),$(1),$(2)) mv $(4)/libasan_preinit.o debian/$(2)/$(3)/; @@ -251,7 +250,6 @@ define __do_gcc_devels2 $(if $(filter yes, $(with_ubsan)), $(call install_gcc_lib,libubsan,$(UBSAN_SONAME),$(1),$(2)) ) - ) $(if $(filter yes, $(with_vtv)), $(call install_gcc_lib,libvtv,$(VTV_SONAME),$(1),$(2)) ) diff --git a/debian/rules.d/binary-libubsan.mk b/debian/rules.d/binary-libubsan.mk index 278ee49..f6a2c49 100644 --- a/debian/rules.d/binary-libubsan.mk +++ b/debian/rules.d/binary-libubsan.mk @@ -25,8 +25,7 @@ define __do_ubsan rm -rf $(d_l) $(d_d) dh_installdirs -p$(p_l) $(usr_lib$(2)) - $(if $(empty_sanitizer_packages),, \ - DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libubsan.so.* ) + DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libubsan.so.* debian/dh_doclink -p$(p_l) $(p_base) debian/dh_doclink -p$(p_d) $(p_base) |