Author: aurel32 Date: 2009-09-09 18:04:02 +0000 (Wed, 09 Sep 2009) New Revision: 3828
Modified: glibc-package/branches/multiarch/debian/sysdeps/alpha.mk glibc-package/branches/multiarch/debian/sysdeps/i386.mk glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk glibc-package/branches/multiarch/debian/sysdeps/mips.mk glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk glibc-package/branches/multiarch/debian/sysdeps/s390.mk glibc-package/branches/multiarch/debian/sysdeps/sparc.mk Log: Fix rtlddir after multiarch changes Modified: glibc-package/branches/multiarch/debian/sysdeps/alpha.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/alpha.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/alpha.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -8,5 +8,4 @@ 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 alphaev67_slibdir = /lib/$(DEB_HOST_GNU_TYPE)/ev67 Modified: glibc-package/branches/multiarch/debian/sysdeps/i386.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/i386.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/i386.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -6,7 +6,6 @@ i686_add-ons = nptl $(add-ons) i686_configure_target=i686-linux-gnu i686_extra_cflags = -march=i686 -mtune=i686 -O3 -i686_rtlddir = /lib i686_slibdir = /lib/$(DEB_HOST_GNU_TYPE)/i686/cmov i686_extra_config_options = $(extra_config_options) --disable-profile @@ -17,7 +16,6 @@ xen_add-ons = nptl $(add-ons) xen_configure_target=i686-linux-gnu xen_extra_cflags = -march=i686 -mtune=i686 -O3 -mno-tls-direct-seg-refs -xen_rtlddir = /lib xen_slibdir = /lib/$(DEB_HOST_GNU_TYPE)/i686/nosegneg xen_extra_config_options = $(extra_config_options) --disable-profile @@ -43,6 +41,7 @@ amd64_CXX = $(CXX) -m64 -D__x86_64__ amd64_extra_cflags = -O3 amd64_extra_config_options = $(extra_config_options) --disable-profile +amd64_rtlddir = /lib64 amd64_slibdir = /lib64 amd64_libdir = /usr/lib64 Modified: glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -1,7 +1,3 @@ -libc_slibdir = /lib -libc_libdir = /usr/lib -libc_rtlddir = /lib - # /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302. define libc0.1_extra_pkg_install ln -sf /lib debian/$(curpass)/lib64 @@ -20,7 +16,6 @@ i386_extra_cflags = -march=pentium4 -O3 i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp i386_includedir = /usr/include/i486-kfreebsd-gnu -i386_rtlddir = /lib i386_slibdir = /lib32 i386_libdir = /usr/lib32 i386_MIN_KERNEL_SUPPORTED = 5.4.0 Modified: glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -6,6 +6,5 @@ i686_add-ons = ports linuxthreads $(add-ons) i686_configure_target=i686-kfreebsd-gnu i686_extra_cflags = -march=i686 -mtune=i686 -O3 -i686_rtlddir = /lib i686_slibdir = /lib/$(DEB_HOST_GNU_TYPE)/i686/cmov i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp Modified: glibc-package/branches/multiarch/debian/sysdeps/mips.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/mips.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/mips.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -27,6 +27,7 @@ mipsn32_CXX = $(CXX) -mabi=n32 libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) mipsn32_extra_cflags = -O3 +mipsn32_rtlddir = /lib32 mipsn32_slibdir = /lib32 mipsn32_libdir = /usr/lib32 mipsn32_extra_config_options := $(extra_config_options) --disable-profile @@ -40,6 +41,7 @@ mips64_CXX = $(CXX) -mabi=64 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) mips64_extra_cflags = -O3 +mips64_rtlddir = /lib64 mips64_slibdir = /lib64 mips64_libdir = /usr/lib64 mips64_extra_config_options := $(extra_config_options) --disable-profile Modified: glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -27,6 +27,7 @@ mipsn32_CXX = $(CXX) -mabi=n32 libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) mipsn32_extra_cflags = -O3 +mipsn32_rtlddir = /lib32 mipsn32_slibdir = /lib32 mipsn32_libdir = /usr/lib32 mipsn32_extra_config_options := $(extra_config_options) --disable-profile @@ -40,6 +41,7 @@ mips64_CXX = $(CXX) -mabi=64 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) mips64_extra_cflags = -O3 +mips64_rtlddir = /lib64 mips64_slibdir = /lib64 mips64_libdir = /usr/lib64 mips64_extra_config_options := $(extra_config_options) --disable-profile Modified: glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -8,6 +8,7 @@ libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver)) ppc64_extra_cflags = -O3 ppc64_extra_config_options := $(extra_config_options) --disable-profile +ppc64_rtlddir = /lib64 ppc64_slibdir = /lib64 ppc64_libdir = /usr/lib64 ppc64_includedir = /usr/include/powerpc64-linux-gnu Modified: glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -1,5 +1,3 @@ -libc_slibdir = /lib -libc_libdir = /usr/lib libc_rtlddir = /lib64 # /lib64 and /usr/lib64 are provided as symlinks @@ -19,7 +17,6 @@ powerpc_extra_cflags = -O3 powerpc_includedir = /usr/include/powerpc-linux-gnu powerpc_extra_config_options := $(extra_config_options) --disable-profile -powerpc_rtlddir = /lib powerpc_slibdir = /lib32 powerpc_libdir = /usr/lib32 Modified: glibc-package/branches/multiarch/debian/sysdeps/s390.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/s390.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/s390.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -9,6 +9,7 @@ s390x_extra_cflags = -O3 s390x_extra_config_options := $(extra_config_options) --disable-profile s390x_includedir = /usr/include/s390x-linux-gnu +s390x_rtlddir = /lib64 s390x_slibdir = /lib64 s390x_libdir = /usr/lib64 Modified: glibc-package/branches/multiarch/debian/sysdeps/sparc.mk =================================================================== --- glibc-package/branches/multiarch/debian/sysdeps/sparc.mk 2009-09-09 09:18:02 UTC (rev 3827) +++ glibc-package/branches/multiarch/debian/sysdeps/sparc.mk 2009-09-09 18:04:02 UTC (rev 3828) @@ -6,7 +6,6 @@ sparcv9b_configure_build=sparcv9b-linux-gnu sparcv9b_extra_cflags = -mtune=ultrasparc3 -O3 sparcv9b_extra_config_options = $(extra_config_options) --disable-profile -sparcv9b_rtlddir = /lib sparcv9b_slibdir = /lib/$(DEB_HOST_GNU_TYPE)/ultra3 # build 64-bit (sparc64) alternative library @@ -20,6 +19,7 @@ sparc64_extra_cflags = -O3 sparc64_extra_config_options = $(extra_config_options) --disable-profile sparc64_includedir = /usr/include/sparc64-linux-gnu +sparc64_rtlddir = /lib64 sparc64_slibdir = /lib64 sparc64_libdir = /usr/lib64 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
