Преглед изворни кода

Dpkg::Shlibs: Remove support for GCC_TARGET environment variable

This was a temporary workaround for very old gcc toolchains.

See: #453267
Guillem Jover пре 11 година
родитељ
комит
9a005b87fc
2 измењених фајлова са 2 додато и 4 уклоњено
  1. 2 0
      debian/changelog
  2. 0 4
      scripts/Dpkg/Shlibs.pm

+ 2 - 0
debian/changelog

@@ -28,6 +28,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Check perl code compilation, warnings and strictness.
     - Check perl code compilation, warnings and strictness.
   * Assume in Dpkg::Arch that the abitable is always present, and bump
   * Assume in Dpkg::Arch that the abitable is always present, and bump
     libdpkg-perl Depends on dpkg to 1.16.3, the version introducing the file.
     libdpkg-perl Depends on dpkg to 1.16.3, the version introducing the file.
+  * Remove support for GCC_TARGET environment variable from Dpkg::Shlibs.
+    This was a temporary workaround for very old gcc toolchains. See #453267.
 
 
  -- Guillem Jover <guillem@debian.org>  Tue, 09 Dec 2014 23:53:18 +0100
  -- Guillem Jover <guillem@debian.org>  Tue, 09 Dec 2014 23:53:18 +0100
 
 

+ 0 - 4
scripts/Dpkg/Shlibs.pm

@@ -80,10 +80,6 @@ sub setup_library_paths {
     my ($crossprefix, $multiarch);
     my ($crossprefix, $multiarch);
 
 
     # Detect cross compiler builds.
     # Detect cross compiler builds.
-    if ($ENV{GCC_TARGET}) {
-        $crossprefix = debarch_to_gnutriplet($ENV{GCC_TARGET});
-        $multiarch = debarch_to_multiarch($ENV{GCC_TARGET});
-    }
     if ($ENV{DEB_TARGET_GNU_TYPE} and
     if ($ENV{DEB_TARGET_GNU_TYPE} and
         ($ENV{DEB_TARGET_GNU_TYPE} ne $ENV{DEB_BUILD_GNU_TYPE}))
         ($ENV{DEB_TARGET_GNU_TYPE} ne $ENV{DEB_BUILD_GNU_TYPE}))
     {
     {