r6596 - in glibc-package/branches/glibc-2.22/debian: . debhelper.in rules.d sysdeps
Author: adconrad
Date: 2015-09-19 22:46:04 +0000 (Sat, 19 Sep 2015)
New Revision: 6596
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-udeb.install
glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.22/debian/shlibs-add-udebs
glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk
Log:
debian/*: Conditionally add libmvec to libc-udeb only on amd64 and x32.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-09-19 22:46:04 UTC (rev 6596)
@@ -37,6 +37,7 @@
- debian/patches/mips/submitted-rld_map.diff: Rebased.
* debian/{control,symbols.wildcards,copyright}: Updated strings for 2.22.
* debian/libc6*.symbols: Add libmvec.so.1 to the amd64/x32 symbols files.
+ * debian/*: Conditionally add libmvec to libc-udeb only on amd64 and x32.
[ Samuel Thibault ]
* debian/patches/hurd-i386/tg-tls.diff: Rebased.
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-udeb.install
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-udeb.install 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-udeb.install 2015-09-19 22:46:04 UTC (rev 6596)
@@ -2,6 +2,8 @@
TMPDIR/SLIBDIR/ld*.so* lib
TMPDIR/SLIBDIR/libm-*.so* lib
TMPDIR/SLIBDIR/libm.so* lib
+TMPDIR/SLIBDIR/libmvec-* lib
+TMPDIR/SLIBDIR/libmvec.so* lib
TMPDIR/SLIBDIR/libdl*.so* lib
TMPDIR/SLIBDIR/libresolv*.so* lib
TMPDIR/SLIBDIR/libc-*.so* lib
Modified: glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk 2015-09-19 22:46:04 UTC (rev 6596)
@@ -143,6 +143,7 @@
sed -e "s/^#.*//" -i $$y ; \
$(if $(filter $(pt_chown),no),sed -e "/pt_chown/d" -i $$y ;) \
$(if $(filter $(pldd),no),sed -e "/pldd/d" -i $$y ;) \
+ $(if $(filter $(mvec),no),sed -e "/libmvec/d" -i $$y ;) \
;; \
esac; \
done
Modified: glibc-package/branches/glibc-2.22/debian/shlibs-add-udebs
===================================================================
--- glibc-package/branches/glibc-2.22/debian/shlibs-add-udebs 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/shlibs-add-udebs 2015-09-19 22:46:04 UTC (rev 6596)
@@ -36,7 +36,7 @@
# The following lists should match the ones in the *-udeb.install files
# in debian/debhelper.in; $W replaces any "*" wildcards there.
expr_libc1="ld$W libm-$W libm libdl$W libresolv$W libc-$W libc"
-expr_libc2="libutil$W libcrypt$W librt$W libpthread$W"
+expr_libc2="libutil$W libcrypt$W librt$W libpthread$W libmvec$W"
expr_hurd="libmachuser$W libhurduser$W"
expr_nss_dns="libnss_dns$W"
expr_nss_files="libnss_files$W"
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/amd64.mk 2015-09-19 22:46:04 UTC (rev 6596)
@@ -1,5 +1,6 @@
libc_rtlddir = /lib64
extra_config_options = --enable-multi-arch --enable-lock-elision
+mvec = yes
# build 32-bit (i386) alternative library
GLIBC_MULTILIB_PASSES += i386
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/hurd.mk 2015-09-19 22:46:04 UTC (rev 6596)
@@ -5,6 +5,8 @@
pt_chown = yes
# Expect pldd on this platform
pldd = no
+# Expect the mvec library on this platform
+mvec = no
# Linuxthreads Config (we claim "no threads" as nptl keys off this)
threads = no
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/kfreebsd.mk 2015-09-19 22:46:04 UTC (rev 6596)
@@ -6,6 +6,8 @@
pt_chown = yes
# Expect pldd on this platform
pldd = no
+# Expect the mvec library on this platform
+mvec = no
# NPTL Config
threads = yes
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/linux.mk 2015-09-19 22:46:04 UTC (rev 6596)
@@ -6,6 +6,8 @@
pt_chown = no
# Expect pldd on this platform
pldd = yes
+# Expect the mvec library on this platform
+mvec = no
# NPTL Config
threads = yes
Modified: glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk 2015-09-19 20:23:12 UTC (rev 6595)
+++ glibc-package/branches/glibc-2.22/debian/sysdeps/x32.mk 2015-09-19 22:46:04 UTC (rev 6596)
@@ -1,5 +1,6 @@
libc_rtlddir = /libx32
extra_config_options = --enable-multi-arch --enable-lock-elision
+mvec = yes
# build 64-bit (amd64) alternative library
GLIBC_MULTILIB_PASSES += amd64
Reply to: