diff -Nru cross-toolchain-base-25ubuntu6/debian/changelog cross-toolchain-base-26ubuntu0.1/debian/changelog --- cross-toolchain-base-25ubuntu6/debian/changelog 2018-04-20 06:14:33.000000000 +0000 +++ cross-toolchain-base-26ubuntu0.1/debian/changelog 2018-09-17 13:39:55.000000000 +0000 @@ -1,3 +1,25 @@ +cross-toolchain-base (26ubuntu0.1) bionic-proposed; urgency=medium + + * SRU: LP: #1769657. + - Fix ARM32 multilib installations. + - Fix binutils installation in the build chroot. + + -- Matthias Klose Mon, 17 Sep 2018 15:39:55 +0200 + +cross-toolchain-base (26ubuntu1) cosmic; urgency=medium + + * Still build using linux 4.15. + + -- Matthias Klose Thu, 10 May 2018 20:43:12 +0200 + +cross-toolchain-base (26) unstable; urgency=medium + + * Build using linux 4.16. + * Fix ARM32 multilib installations. + * Fix binutils installation in the build chroot. + + -- Matthias Klose Thu, 10 May 2018 13:26:11 +0200 + cross-toolchain-base (25ubuntu6) bionic; urgency=medium * Fix binutils installation in the build chroot. diff -Nru cross-toolchain-base-25ubuntu6/debian/patches/gcc/updates.diff cross-toolchain-base-26ubuntu0.1/debian/patches/gcc/updates.diff --- cross-toolchain-base-25ubuntu6/debian/patches/gcc/updates.diff 2018-04-20 06:14:33.000000000 +0000 +++ cross-toolchain-base-26ubuntu0.1/debian/patches/gcc/updates.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Index: debian/rules2 -=================================================================== ---- gcc/debian/rules2 (revision 10143) -+++ gcc/debian/rules2 (working copy) -@@ -174,6 +174,13 @@ - - docdir = usr/share/doc - -+binutils_prefix = /usr/bin -+ifneq (,$(with_build_sysroot)) -+ #ifneq ($(DEB_HOST_ARCH),$(DEB_TARGET_ARCH)) -+ binutils_prefix = $(with_build_sysroot)/usr/bin -+ #endif -+endif -+ - CONFARGS = -v \ - --with-pkgversion='$(distribution)$(if $(with_linaro_branch),/Linaro)$(if $(with_ibm_branch),/IBM)___$(DEB_VERSION)' \ - --with-bugurl='file:///usr/share/doc/$(PKGSOURCE)/README.Bugs' -@@ -182,8 +189,8 @@ - --enable-languages=$(subst $(SPACE),$(COMMA),$(enabled_languages)) \ - --prefix=/$(PF) \ - --with-gcc-major-version-only \ -- --with-as=/usr/bin/$(DEB_TARGET_GNU_TYPE)-as \ -- --with-ld=/usr/bin/$(DEB_TARGET_GNU_TYPE)-ld -+ --with-as=$(binutils_prefix)/$(DEB_TARGET_GNU_TYPE)-as \ -+ --with-ld=$(binutils_prefix)/$(DEB_TARGET_GNU_TYPE)-ld - - ifeq ($(versioned_packages),yes) - CONFARGS += --program-suffix=-$(BASE_VERSION) diff -Nru cross-toolchain-base-25ubuntu6/debian/rules cross-toolchain-base-26ubuntu0.1/debian/rules --- cross-toolchain-base-25ubuntu6/debian/rules 2018-04-20 06:14:33.000000000 +0000 +++ cross-toolchain-base-26ubuntu0.1/debian/rules 2018-05-11 11:42:42.000000000 +0000 @@ -22,6 +22,7 @@ DEB_SVER_ACT := $(shell dpkg-parsechangelog| sed -n 's/^Version: \(.*\)/\1/p') DEB_VER_ACT := $(shell /bin/sh debian/new_cross_version.sh $(if $(filter $(DEB_NAME_ACT), cross-toolchain-base),ppc64el,ppc64)) CROSS_EXT := cross$(DEB_VER_ACT) +CROSS_EXT := cross1.$(shell expr $(DEB_VER_ACT) - 1) HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -118,6 +119,8 @@ @echo "Built using information:" @echo ' linux: $(LINUX_BUILT_USING)' @echo ' glibc: $(GLIBC_BUILT_USING)' + @echo + @echo "New versions: $(DEB_LINUX_GLIBC)$(CROSS_EXT) / $(DEB_VER_GLIBC)$(CROSS_EXT)" $(stamp)init-dirs: @@ -237,11 +240,11 @@ if [ -n "$$(grep -v '^\#' ${CURDIR}/debian/patches/gcc/series)" ]; then \ QUILT_PATCHES=${CURDIR}/debian/patches/gcc quilt --quiltrc /dev/null push -a ; \ fi; - set -ex; \ - if dpkg --compare-versions $(DEB_VER_GCC) le 7.3.0-16ubuntu3; then \ - cd gcc; \ - patch -p1 < ../debian/patches/gcc/updates.diff; \ - fi +# set -ex; \ +# if dpkg --compare-versions $(DEB_VER_GCC) le 7.3.0-18; then \ +# cd gcc; \ +# patch -p1 < ../debian/patches/gcc/updates.diff; \ +# fi touch $@ $(stamp)build-gcc1.%: $(stamp)init-gcc $(stamp)install-binutils.% @@ -439,7 +442,7 @@ QUILT_PATCHES=${GLIBC_PATCHES} quilt --quiltrc /dev/null push -a && \ rm -rf .pc/ # set -ex; \ -# if dpkg --compare-versions $(DEB_VER_GLIBC) le 2.27-0ubuntu2; then \ +# if dpkg --compare-versions $(DEB_VER_GLIBC) le 2.27-3; then \ # cd glibc-${VER_GLIBC}; \ # patch -p1 < ../debian/patches/glibc/ubuntu/updates.diff; \ # debian/rules debian/control || true; \ @@ -838,16 +841,34 @@ if [ 'libc6-ppc64-powerpc-cross' = $$pkgname ]; then \ sed -i -e'/^Depends/d' $$tmp/DEBIAN/control; \ fi; \ - if [ 'libc6-dev-armel-cross' = $$pkgname ]; then \ + if [ 'libc6-armel-cross' = $$pkgname ] && [ -n "$(ARM32_MULTILIBS)" ]; then \ + install -d $$tmp/usr/arm-linux-gnueabihf/libsf; \ + for i in $$(ls $$tmp/usr/arm-linux-gnueabi/lib); do \ + ln -sf ../../arm-linux-gnueabi/lib/$$i $$tmp/usr/arm-linux-gnueabihf/libsf/$$i; \ + done; \ install -d $$tmp/usr/arm-linux-gnueabihf/lib; \ - ln -sf ../../arm-linux-gnueabi/lib $$tmp/usr/arm-linux-gnueabihf/lib/sf; \ - ln -sf ../arm-linux-gnueabi/lib $$tmp/usr/arm-linux-gnueabihf/libsf; \ + ln -sf ../libsf $$tmp/usr/arm-linux-gnueabihf/lib/sf; \ + fi; \ + if [ 'libc6-dev-armel-cross' = $$pkgname ] && [ -n "$(ARM32_MULTILIBS)" ]; then \ + install -d $$tmp/usr/arm-linux-gnueabihf/libsf; \ + for i in $$(ls $$tmp/usr/arm-linux-gnueabi/lib); do \ + ln -sf ../../arm-linux-gnueabi/lib/$$i $$tmp/usr/arm-linux-gnueabihf/libsf/$$i; \ + done; \ cp -p debian/tmp.armhf/usr/include/arm-linux-gnueabihf/gnu/stubs-hard.h $$tmp/usr/arm-linux-gnueabi/include/gnu/; \ fi; \ - if [ 'libc6-dev-armhf-cross' = $$pkgname ] && [ "$(ARM32_MULTILIBS)" = dummy ]; then \ + if [ 'libc6-armhf-cross' = $$pkgname ] && [ -n "$(ARM32_MULTILIBS)" ]; then \ + install -d $$tmp/usr/arm-linux-gnueabi/libhf; \ + for i in $$(ls $$tmp/usr/arm-linux-gnueabihf/lib); do \ + ln -sf ../../arm-linux-gnueabihf/lib/$$i $$tmp/usr/arm-linux-gnueabi/libhf/$$i; \ + done; \ install -d $$tmp/usr/arm-linux-gnueabi/lib; \ - ln -sf ../../arm-linux-gnueabihf/lib $$tmp/usr/arm-linux-gnueabi/lib/hf; \ - ln -sf ../arm-linux-gnueabihf/lib $$tmp/usr/arm-linux-gnueabi/libhf; \ + ln -sf ../libhf $$tmp/usr/arm-linux-gnueabi/lib/hf; \ + fi; \ + if [ 'libc6-dev-armhf-cross' = $$pkgname ] && [ -n "$(ARM32_MULTILIBS)" ]; then \ + install -d $$tmp/usr/arm-linux-gnueabi/libhf; \ + for i in $$(ls $$tmp/usr/arm-linux-gnueabihf/lib); do \ + ln -sf ../../arm-linux-gnueabihf/lib/$$i $$tmp/usr/arm-linux-gnueabi/libhf/$$i; \ + done; \ cp -p debian/tmp.armel/usr/include/arm-linux-gnueabi/gnu/stubs-soft.h $$tmp/usr/arm-linux-gnueabihf/include/gnu/; \ fi; \ case `echo $$pkgname | cut -d'-' -f1` in libc6|libc6.1) \