[glibc] 01/01: debian/debhelper.in/libc-dev-alt.install, debian/rules.d/debhelper.mk: do no try to install libm-*.a for builds without mvec.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.25
in repository glibc.
commit 175738336253065ddfc475ae6d06fa805fed6a2d
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Aug 26 19:17:58 2017 +0200
debian/debhelper.in/libc-dev-alt.install, debian/rules.d/debhelper.mk: do no try to install libm-*.a for builds without mvec.
---
debian/changelog | 4 +++-
debian/debhelper.in/libc-dev-alt.install | 3 ++-
debian/rules.d/debhelper.mk | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e6a685a..2fc478c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
glibc (2.25-0experimental3) UNRELEASED; urgency=medium
- *
+ [ Aurelien Jarno ]
+ * debian/debhelper.in/libc-dev-alt.install, debian/rules.d/debhelper.mk: do
+ no try to install libm-*.a for builds without mvec.
-- Aurelien Jarno <aurel32@debian.org> Sat, 26 Aug 2017 16:23:18 +0200
diff --git a/debian/debhelper.in/libc-dev-alt.install b/debian/debhelper.in/libc-dev-alt.install
index 5a3d5fd..ca0da4b 100644
--- a/debian/debhelper.in/libc-dev-alt.install
+++ b/debian/debhelper.in/libc-dev-alt.install
@@ -7,7 +7,8 @@ TMPDIR/LIBDIR/libcrypt.a LIBDIR
TMPDIR/LIBDIR/libdl.a LIBDIR
TMPDIR/LIBDIR/libg.a LIBDIR
TMPDIR/LIBDIR/libieee.a LIBDIR
-TMPDIR/LIBDIR/libm*.a LIBDIR
+TMPDIR/LIBDIR/libm.a LIBDIR
+TMPDIR/LIBDIR/libm-*.a LIBDIR
TMPDIR/LIBDIR/libmcheck.a LIBDIR
TMPDIR/LIBDIR/libmvec.a LIBDIR
TMPDIR/LIBDIR/libmvec_nonshared.a LIBDIR
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index 81b6c25..9c4f29a 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -251,7 +251,7 @@ $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_%
sed -e "s#FLAVOR#$$curpass#g" -i $$t; \
sed -e "s#RTLD_SO#$$rtld_so#g" -i $$t ; \
sed -e "s#MULTIARCHDIR#$$DEB_HOST_MULTIARCH#g" -i $$t ; \
- $(if $(filter $(call xx,mvec),no),sed -e "/libmvec/d" -i $$t ;) \
+ $(if $(filter $(call xx,mvec),no),sed -e "/libmvec/d" -e "/libm-\*\.a/d" -i $$t ;) \
$(if $(filter-out $(DEB_HOST_ARCH_OS),linux),sed -e "/gdb/d" -i $$t ;) \
done ; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: