r6519 - in glibc-package/branches/glibc-2.21/debian: . control.in rules.d
Author: sthibault
Date: 2015-09-03 00:43:40 +0000 (Thu, 03 Sep 2015)
New Revision: 6519
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/control
glibc-package/branches/glibc-2.21/debian/control.in/main
glibc-package/branches/glibc-2.21/debian/rules
glibc-package/branches/glibc-2.21/debian/rules.d/build.mk
Log:
port r6518 from trunk: Fix mig detection for cross-stage1
* rules, rules.d/build.mk: Set MIG to gnu-type alias of mig, to fix
cross-stage1.
* control, control.d/main: Bump mig dependency to get the gnu-type alias in
non-cross case too.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-03 00:42:25 UTC (rev 6518)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-03 00:43:40 UTC (rev 6519)
@@ -265,6 +265,10 @@
advertise _POSIX_CLOCK_SELECTION for vlc
* patches/hurd-i386/submitted-bootstrap.diff: New patch to fix crt*.o build
in stage1.
+ * rules, rules.d/build.mk: Set MIG to gnu-type alias of mig, to fix
+ cross-stage1.
+ * control, control.d/main: Bump mig dependency to get the gnu-type alias in
+ non-cross case too.
-- Samuel Thibault <sthibault@debian.org> Sun, 09 Aug 2015 20:00:16 +0000
Modified: glibc-package/branches/glibc-2.21/debian/control
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control 2015-09-03 00:42:25 UTC (rev 6518)
+++ glibc-package/branches/glibc-2.21/debian/control 2015-09-03 00:43:40 UTC (rev 6519)
@@ -5,7 +5,7 @@
autoconf, gawk, debhelper (>= 9.20141010), rdfind, symlinks, netbase,
linux-libc-dev (>= 3.9) [linux-any],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
- mig (>= 1.4-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4+git20141109-1) [hurd-i386],
+ mig (>= 1.5-3) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4+git20141109-1) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
g++-4.9, g++-4.9-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
Modified: glibc-package/branches/glibc-2.21/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/main 2015-09-03 00:42:25 UTC (rev 6518)
+++ glibc-package/branches/glibc-2.21/debian/control.in/main 2015-09-03 00:43:40 UTC (rev 6519)
@@ -5,7 +5,7 @@
autoconf, gawk, debhelper (>= 9.20141010), rdfind, symlinks, netbase,
linux-libc-dev (>= 3.9) [linux-any],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
- mig (>= 1.4-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4+git20141109-1) [hurd-i386],
+ mig (>= 1.5-3) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4+git20141109-1) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
g++-4.9, g++-4.9-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32]
Modified: glibc-package/branches/glibc-2.21/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules 2015-09-03 00:42:25 UTC (rev 6518)
+++ glibc-package/branches/glibc-2.21/debian/rules 2015-09-03 00:43:40 UTC (rev 6519)
@@ -101,6 +101,7 @@
BASE_CC = gcc
BASE_CXX = g++
+BASE_MIG = mig
DEB_GCC_VERSION ?= -4.9
RUN_TESTSUITE = yes
@@ -109,6 +110,7 @@
# change the GNU triplet as it doesn't match the compiler name.
CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION)
CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)$(DEB_GCC_VERSION)
+MIG = $(DEB_HOST_GNU_TYPE)-$(BASE_MIG)
BUILD_CC = $(DEB_BUILD_GNU_TYPE)-$(BASE_CC)
BUILD_CXX = $(DEB_BUILD_GNU_TYPE)-$(BASE_CXX)
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/build.mk 2015-09-03 00:42:25 UTC (rev 6518)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/build.mk 2015-09-03 00:43:40 UTC (rev 6519)
@@ -32,6 +32,7 @@
rm -f $(DEB_BUILDDIR)/configparms
echo "CC = $(call xx,CC)" >> $(DEB_BUILDDIR)/configparms
echo "CXX = $(call xx,CXX)" >> $(DEB_BUILDDIR)/configparms
+ echo "MIG = $(call xx,MIG)" >> $(DEB_BUILDDIR)/configparms
echo "BUILD_CC = $(BUILD_CC)" >> $(DEB_BUILDDIR)/configparms
echo "BUILD_CXX = $(BUILD_CXX)" >> $(DEB_BUILDDIR)/configparms
echo "CFLAGS = $(HOST_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
@@ -78,6 +79,7 @@
cd $(DEB_BUILDDIR) && \
CC="$(call xx,CC)" \
CXX="$(call xx,CXX)" \
+ MIG="$(call xx,MIG)" \
AUTOCONF=false \
MAKEINFO=: \
$(CURDIR)/configure \
Reply to: