Remove:

    Build-conflict with systemtap-sdt-dev on ppc64el.


git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7412 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

3 files changed, 1 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index b43705f..4aeeb69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ gcc-4.9 (4.9.0-5) UNRELEASED; urgency=medium
 
   * Update to SVN 20140527 (r210956) from the gcc-4_9-branch.
   * Limit systemtap-sdt-dev build dependency to enumerated linux architectures.
-    Build-conflict with systemtap-sdt-dev on ppc64el.
   * Build libitm on AArch64, patch taken from the trunk.
   * Update the testsuite to allow more testcases to pass with hardening options
     turned on (Steve Beattie). LP: #1317307.
diff --git a/debian/control b/debian/control
index 256ce5c..25a394d 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mi
   libcloog-isl-dev (>= 0.18), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
   dejagnu [!m68k !hurd-amd64 !hurd-i386 !hurd-alpha !kfreebsd-amd64 !kfreebsd-i386 !kfreebsd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, quilt
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
-Build-Conflicts: systemtap-sdt-dev [ppc64el]
 Homepage: http://gcc.gnu.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.9/
 Vcs-Svn: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-4.9
diff --git a/debian/control.m4 b/debian/control.m4
index b31158b..401f1b5 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -58,7 +58,7 @@ Build-Depends: debhelper (>= 5.0.62),
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any],
   LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP
-  systemtap-sdt-dev [i386 amd64 x32 ia64 s390 powerpc powerpcspe ppc64 armel armhf arm64],
+  systemtap-sdt-dev [i386 amd64 x32 ia64 s390 powerpc powerpcspe ppc64 ppc64el armel armhf arm64],
   SOURCE_BUILD_DEP CROSS_BUILD_DEP
   CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP,
   autogen, zlib1g-dev, gawk, lzma, xz-utils, patchutils,
@@ -80,7 +80,6 @@ Build-Depends: debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP
   CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, quilt
 Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP
 ')dnl
-Build-Conflicts: systemtap-sdt-dev [ppc64el]
 ifelse(regexp(SRCNAME, `gnat'),0,`dnl
 Homepage: http://gcc.gnu.org/
 ', regexp(SRCNAME, `gdc'),0,`dnl