r5775 - in glibc-package/branches/eglibc-2.18/debian: . sysdeps
Author: adconrad
Date: 2013-11-20 22:12:15 +0000 (Wed, 20 Nov 2013)
New Revision: 5775
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/sysdeps/alpha.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/armel.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/armhf.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd-i386.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/i386.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-i386.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/mipsel.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/ppc64.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/s390x.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/sparc64.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/x32.mk
Log:
debian/sysdeps/*: Make rtlddir/slibdir uniform to keep the packaging
consistent with previous locations of ld.so symlinks in -alt packages.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-20 22:12:15 UTC (rev 5775)
@@ -54,6 +54,8 @@
* debian/patches/powerpc/unsubmitted-tst-auxv.diff: Fix regression in the
tst-setcontext-fpscr.c test introduced by kfreebsd/submitted-auxv.diff.
* debian/testsuite-checking/*: Allow powerpc to fail test-{double,float}.
+ * debian/sysdeps/*: Make rtlddir/slibdir uniform to keep the packaging
+ consistent with previous locations of ld.so symlinks in -alt packages.
[ Samuel Thibault ]
* patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Rebased.
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/alpha.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/alpha.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -9,4 +9,5 @@
alphaev67_configure_target = alphaev67-linux-gnu
alphaev67_extra_cflags = -mcpu=ev67 -mtune=ev67 -O2
alphaev67_extra_config_options = $(extra_config_options) --disable-profile
+alphaev67_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/ev67
alphaev67_slibdir = /lib/$(DEB_HOST_MULTIARCH)/ev67
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/amd64.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/amd64.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -11,6 +11,7 @@
i386_CXX = $(CXX) -m32
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-profile
+i386_rtlddir = /lib32
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/armel.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/armel.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -6,6 +6,7 @@
#armhf_configure_target = arm-linux-gnueabihf
#armhf_CC = $(CC) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
#armhf_CXX = $(CXX) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
+#armhf_rtlddir = /lib/arm-linux-gnueabihf
#armhf_slibdir = /lib/arm-linux-gnueabihf
#armhf_libdir = /usr/lib/arm-linux-gnueabihf
#
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/armhf.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/armhf.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/armhf.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -17,6 +17,7 @@
#armel_configure_target = arm-linux-gnueabi
#armel_CC = $(CC) -mfloat-abi=soft
#armel_CXX = $(CXX) -mfloat-abi=soft
+#armel_rtlddir = /lib/arm-linux-gnueabi
#armel_slibdir = /lib/arm-linux-gnueabi
#armel_libdir = /usr/lib/arm-linux-gnueabi
#
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd-i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd-i386.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd-i386.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -5,6 +5,7 @@
i686_add-ons = $(libc_add-ons)
i686_configure_target=i686-gnu
i686_extra_cflags = -march=i686 -mtune=generic
+i686_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp
@@ -15,6 +16,7 @@
xen_add-ons = $(libc_add-ons)
xen_configure_target=i686-gnu
xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
+xen_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
xen_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/i386.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/i386.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -8,6 +8,7 @@
i686_add-ons = nptl $(add-ons)
i686_configure_target=i686-linux-gnu
i686_extra_cflags = -march=i686 -mtune=generic
+i686_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile
@@ -18,6 +19,7 @@
xen_add-ons = nptl $(add-ons)
xen_configure_target=i686-linux-gnu
xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
+xen_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
xen_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-amd64.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-amd64.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -12,6 +12,7 @@
i386_add-ons = ports fbtl $(add-ons)
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-profile
+i386_rtlddir = /lib32
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-i386.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd-i386.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -10,5 +10,6 @@
i686_add-ons = ports fbtl $(add-ons)
i686_configure_target=i686-kfreebsd-gnu
i686_extra_cflags = -march=i686 -mtune=generic
+i686_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/mipsel.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/mipsel.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -64,6 +64,7 @@
loongson2f_CXX = $(CXX) -mabi=32
loongson2f_extra_cflags = -march=loongson2f -mtune=loongson2f -O2
loongson2f_extra_config_options = $(extra_config_options) --disable-profile
+loongson2f_rtlddir = /lib/$(DEB_HOST_MULTIARCH)/loongson2f
loongson2f_slibdir = /lib/$(DEB_HOST_MULTIARCH)/loongson2f
# Need to put a tri-arch aware version of ldd in the base package
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/ppc64.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/ppc64.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -10,6 +10,7 @@
powerpc_CC = $(CC) -m32
powerpc_CXX = $(CXX) -m32
powerpc_extra_config_options := $(extra_config_options) --disable-profile
+powerpc_rtlddir = /lib32
powerpc_slibdir = /lib32
powerpc_libdir = /usr/lib32
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/s390x.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/s390x.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/s390x.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -8,6 +8,7 @@
s390_CC = $(CC) -m31
s390_CXX = $(CXX) -m31
s390_extra_config_options := $(extra_config_options) --disable-profile
+s390_rtlddir = /lib32
s390_slibdir = /lib32
s390_libdir = /usr/lib32
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/sparc64.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/sparc64.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/sparc64.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -11,7 +11,7 @@
sparc_CXX = $(CXX) -m32
libc6-sparc_shlib_dep = libc6-sparc (>= $(shlib_dep_ver))
sparc_extra_config_options = $(extra_config_options) --disable-profile
-sparc_rtlddir = /lib
+sparc_rtlddir = /lib32
sparc_slibdir = /lib32
sparc_libdir = /usr/lib32
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/x32.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/x32.mk 2013-11-20 15:46:16 UTC (rev 5774)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/x32.mk 2013-11-20 22:12:15 UTC (rev 5775)
@@ -42,6 +42,7 @@
i386_CXX = $(CXX) -m32
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-profile
+i386_rtlddir = /lib32
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Reply to: