Author: adconrad
Date: 2013-01-23 05:52:38 +0000 (Wed, 23 Jan 2013)
New Revision: 5447
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk
Log:
debian/rules.d/build.mk: Fix armhf multilib with WITH_BUILD_SYSROOT.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 05:35:28 UTC
(rev 5446)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 05:52:38 UTC
(rev 5447)
@@ -68,6 +68,7 @@
[ Matthias Klose ]
* debian/{rules,rules.d/control.mk,control.in/libc}: Allow turning off
libc-prof arbitrarily, and disable it for arm64, which lacks support.
+ * debian/rules.d/build.mk: Fix armhf multilib with WITH_BUILD_SYSROOT.
-- Adam Conrad <adcon...@0c3.net> Mon, 26 Nov 2012 02:20:40 -0700
Modified: glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk 2013-01-23
05:35:28 UTC (rev 5446)
+++ glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk 2013-01-23
05:52:38 UTC (rev 5447)
@@ -171,12 +171,29 @@
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-o $(CURDIR)/debian/tmp-$(curpass)/lib/libc.so
else
+ : # FIXME: why just needed for ARM multilib?
case "$(curpass)" in \
armhf) \
- cp -p /lib/arm-linux-gnueabihf/libgcc_s.so.1
$(DEB_BUILDDIR)/ ;; \
+ libgcc_dirs=/lib/arm-linux-gnueabihf; \
+ if [ -n "$$WITH_BUILD_SYSROOT" ]; then \
+
libgcc_dirs="$$WITH_BUILD_SYSROOT/usr/arm-linux-gnueabi/lib/arm-linux-gnueabihf
$$WITH_BUILD_SYSROOT/usr/lib/gcc-cross/arm-linux-gnueabi/4.7/hf"; \
+ fi; \
+ ;; \
armel) \
- cp -p /lib/arm-linux-gnueabi/libgcc_s.so.1
$(DEB_BUILDDIR)/ ;; \
- esac
+ libgcc_dirs=/lib/arm-linux-gnueabi; \
+ if [ -n "$$WITH_BUILD_SYSROOT" ]; then \
+
libgcc_dirs="$$WITH_BUILD_SYSROOT/usr/arm-linux-gnueabihf/lib/arm-linux-gnueabi
$$WITH_BUILD_SYSROOT/usr/lib/gcc-cross/arm-linux-gnueabihf/4.7/sf"; \
+ fi; \
+ ;; \
+ esac; \
+ if [ -n "$$libgcc_dirs" ]; then \
+ for d in $$libgcc_dirs; do \
+ if [ -f $$d/libgcc_s.so.1 ]; then \
+ cp -p $$d/libgcc_s.so.1 $(DEB_BUILDDIR)/; \
+ break; \
+ fi; \
+ done; \
+ fi
$(MAKE) -C $(DEB_BUILDDIR) \
install_root=$(CURDIR)/debian/tmp-$(curpass) install
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1txtgj-0000su...@vasks.debian.org
