r6240 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2014-08-14 23:42:51 +0000 (Thu, 14 Aug 2014)
New Revision: 6240
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules
Log:
* debian/rules: drop the i486 to i586 GNU triplet conversion.
* debian/control.in/main: build-depends on dpkg-dev (>= 1.17.1) and
gcc-4.8 (>= 4.8.3-8) to make sure to get the new i586 GNU triplet on
i386, hurd-i386 and kfreebsd-i386.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-08-14 18:17:55 UTC (rev 6239)
+++ glibc-package/trunk/debian/changelog 2014-08-14 23:42:51 UTC (rev 6240)
@@ -1,9 +1,10 @@
glibc (2.19-10) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
- * debian/rules: change the GNU triplet from i586 to i486 when computing
- the compiler name, as the name provided by dpkg (i586-linux-gnu)
- doesn't match the gcc name (i486-linux-gnu-gcc-4.8).
+ * debian/rules: drop the i486 to i586 GNU triplet conversion.
+ * debian/control.in/main: build-depends on dpkg-dev (>= 1.17.1) and
+ gcc-4.8 (>= 4.8.3-8) to make sure to get the new i586 GNU triplet on
+ i386, hurd-i386 and kfreebsd-i386.
-- Aurelien Jarno <aurel32@debian.org> Thu, 14 Aug 2014 18:26:45 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2014-08-14 18:17:55 UTC (rev 6239)
+++ glibc-package/trunk/debian/control 2014-08-14 23:42:51 UTC (rev 6240)
@@ -1,14 +1,14 @@
Source: glibc
Section: libs
Priority: required
-Build-Depends: gettext, dpkg-dev (>= 1.16.0), xz-utils, file, quilt,
+Build-Depends: gettext, dpkg-dev (>= 1.17.1), xz-utils, file, quilt,
autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks, netbase,
linux-libc-dev (>= 3.9) [linux-any],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.8, g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
+ g++-4.8 (>= 4.8.3-8), g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2014-08-14 18:17:55 UTC (rev 6239)
+++ glibc-package/trunk/debian/control.in/main 2014-08-14 23:42:51 UTC (rev 6240)
@@ -1,14 +1,14 @@
Source: glibc
Section: libs
Priority: required
-Build-Depends: gettext, dpkg-dev (>= 1.16.0), xz-utils, file, quilt,
+Build-Depends: gettext, dpkg-dev (>= 1.17.1), xz-utils, file, quilt,
autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks, netbase,
linux-libc-dev (>= 3.9) [linux-any],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.8, g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
+ g++-4.8 (>= 4.8.3-8), g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2014-08-14 18:17:55 UTC (rev 6239)
+++ glibc-package/trunk/debian/rules 2014-08-14 23:42:51 UTC (rev 6240)
@@ -110,22 +110,21 @@
# Set cross and native compiler names, including version. On *i386 we need to
# change the GNU triplet as it doesn't match the compiler name.
-CC = $(subst i586,i486,$(DEB_HOST_GNU_TYPE))-$(BASE_CC)$(DEB_GCC_VERSION)
-CXX = $(subst i586,i486,$(DEB_HOST_GNU_TYPE))-$(BASE_CXX)$(DEB_GCC_VERSION)
-BUILD_CC = $(subst i586,i486,$(DEB_BUILD_GNU_TYPE))-$(BASE_CC)
-BUILD_CXX = $(subst i586,i486,$(DEB_BUILD_GNU_TYPE))-$(BASE_CXX)
+CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION)
+CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)$(DEB_GCC_VERSION)
+BUILD_CC = $(DEB_BUILD_GNU_TYPE)-$(BASE_CC)
+BUILD_CXX = $(DEB_BUILD_GNU_TYPE)-$(BASE_CXX)
BUILD_CFLAGS = -O2 -g
HOST_CFLAGS = -pipe -O2 -g $(call xx,extra_cflags)
-# This subst can go away when dpkg-dev starts reporting i586 instead of i486
-configure_target := $(subst i486,i586,$(DEB_HOST_GNU_TYPE))
+configure_target := $(DEB_HOST_GNU_TYPE)
# Normally we'll just use this for --build. If the architecture requires
# that build daemons be able to run a particular optimized library, then
# they can set the --build to match --host for that optimized build.
# Among other things this lets tests run.
-configure_build := $(subst i486,i586,$(DEB_BUILD_GNU_TYPE))
+configure_build := $(DEB_BUILD_GNU_TYPE)
log_build = $(build-tree)/log-build-$(call xx,configure_target)-$(curpass)
log_test = $(build-tree)/log-test-$(call xx,configure_target)-$(curpass)
Reply to: