Author: sthibault Date: 2015-09-03 00:42:25 +0000 (Thu, 03 Sep 2015) New Revision: 6518
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/control glibc-package/trunk/debian/control.in/main glibc-package/trunk/debian/rules glibc-package/trunk/debian/rules.d/build.mk Log: 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/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2015-09-03 00:25:45 UTC (rev 6517) +++ glibc-package/trunk/debian/changelog 2015-09-03 00:42:25 UTC (rev 6518) @@ -20,6 +20,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. [ Aurelien Jarno ] * Update from upstream stable branch: Modified: glibc-package/trunk/debian/control =================================================================== --- glibc-package/trunk/debian/control 2015-09-03 00:25:45 UTC (rev 6517) +++ glibc-package/trunk/debian/control 2015-09-03 00:42:25 UTC (rev 6518) @@ -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.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] Modified: glibc-package/trunk/debian/control.in/main =================================================================== --- glibc-package/trunk/debian/control.in/main 2015-09-03 00:25:45 UTC (rev 6517) +++ glibc-package/trunk/debian/control.in/main 2015-09-03 00:42:25 UTC (rev 6518) @@ -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.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] Modified: glibc-package/trunk/debian/rules =================================================================== --- glibc-package/trunk/debian/rules 2015-09-03 00:25:45 UTC (rev 6517) +++ glibc-package/trunk/debian/rules 2015-09-03 00:42:25 UTC (rev 6518) @@ -101,6 +101,7 @@ BASE_CC = gcc BASE_CXX = g++ +BASE_MIG = mig DEB_GCC_VERSION ?= -4.8 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/trunk/debian/rules.d/build.mk =================================================================== --- glibc-package/trunk/debian/rules.d/build.mk 2015-09-03 00:25:45 UTC (rev 6517) +++ glibc-package/trunk/debian/rules.d/build.mk 2015-09-03 00:42:25 UTC (rev 6518) @@ -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 \