Author: aurel32 Date: 2006-02-23 10:15:26 +0000 (Thu, 23 Feb 2006) New Revision: 1221
Added: glibc-package/trunk/debian/patches/rtld.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series glibc-package/trunk/debian/rules glibc-package/trunk/debian/rules.d/build.mk Log: * Multiarch support: - Add rtld.diff (add a new configuration variable rtlddir to change the dynamic linker in the ELF binaries) partly from Andreas Jochen. This is necessary to be able to install a glibc in the multiarch dir while still conforming to the various ABIs which specify a linker in /lib or /lib64. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2006-02-23 10:07:58 UTC (rev 1220) +++ glibc-package/trunk/debian/changelog 2006-02-23 10:15:26 UTC (rev 1221) @@ -98,6 +98,10 @@ to the search path). - Create (/usr)/lib/$(config-machine)-$(config-os) and add symlinks to these directories in /lib/ldconfig/ + - Add rtld.diff (add a new configuration variable rtlddir to change the + dynamic linker in the ELF binaries) partly from Andreas Jochen. This is + necessary to be able to install a glibc in the multiarch dir while still + conforming to the various ABIs which specify a linker in /lib or /lib64. -- Clint Adams <[EMAIL PROTECTED]> Sun, 12 Feb 2006 11:04:38 -0500 Added: glibc-package/trunk/debian/patches/rtld.diff =================================================================== --- glibc-package/trunk/debian/patches/rtld.diff 2006-02-23 10:07:58 UTC (rev 1220) +++ glibc-package/trunk/debian/patches/rtld.diff 2006-02-23 10:15:26 UTC (rev 1221) @@ -0,0 +1,55 @@ +2006-01-21 Aurelien Jarno <[EMAIL PROTECTED]> + + * Makeconfig: new configuration variable rtlddir to change the + dynamic linker in the ELF binaries, which defaults to slibdir + +2005-08-30 Andreas Jochen <Andreas Jochens> + * Makeconfig: use rtlddir instead of slibdir + * dlfcn/Makefile: likewise + * elf/Makefile: likewise + +--- glibc-2.3.6/Makeconfig 2005-08-30 17:48:26.000000000 +0000 ++++ glibc-2.3.6/Makeconfig 2005-08-30 18:38:37.000000000 +0000 +@@ -187,6 +187,11 @@ + endif + inst_slibdir = $(install_root)$(slibdir) + ++# Directory of the dynamic linker in the ELF binaries ++ifndef rtlddir ++rtlddir := $(slibdir) ++endif ++ + # Prefix to put on files installed in $(libdir). For libraries `libNAME.a', + # the prefix is spliced between `lib' and the name, so the linker switch + # `-l$(libprefix)NAME' finds the library; for other files the prefix is +@@ -438,7 +443,7 @@ + endif + ifndef config-LDFLAGS + ifeq (yesyes,$(build-shared)$(elf)) +-config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name) ++config-LDFLAGS = -Wl,-dynamic-linker=$(rtlddir)/$(rtld-installed-name) + endif + endif + ifndef link-libc +--- glibc-2.3.6/dlfcn/Makefile 2004-10-18 23:08:31.000000000 +0000 ++++ glibc-2.3.6/dlfcn/Makefile 2005-08-30 18:38:37.000000000 +0000 +@@ -65,7 +65,7 @@ + + include ../Rules + +-LDFLAGS-dl.so = -Wl,-dynamic-linker,$(slibdir)/$(rtld-installed-name) ++LDFLAGS-dl.so = -Wl,-dynamic-linker,$(rtlddir)/$(rtld-installed-name) + + test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) + $(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds +--- glibc-2.3.6/elf/Makefile 2005-08-30 17:48:26.000000000 +0000 ++++ glibc-2.3.6/elf/Makefile 2005-08-30 18:38:37.000000000 +0000 +@@ -296,7 +296,7 @@ + rm -f [EMAIL PROTECTED] + + # interp.c exists just to get this string into the libraries. +-CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \ ++CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \ + -DNOT_IN_libc=1 + $(objpfx)interp.os: $(common-objpfx)config.make + Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2006-02-23 10:07:58 UTC (rev 1220) +++ glibc-package/trunk/debian/patches/series 2006-02-23 10:15:26 UTC (rev 1221) @@ -128,3 +128,4 @@ glibc-manual-string.diff -p1 ld-multiarch.diff -p1 ldconfig-multiarch.diff -p1 +rtld.diff -p1 Modified: glibc-package/trunk/debian/rules =================================================================== --- glibc-package/trunk/debian/rules 2006-02-23 10:07:58 UTC (rev 1220) +++ glibc-package/trunk/debian/rules 2006-02-23 10:15:26 UTC (rev 1221) @@ -79,7 +79,6 @@ datadir=$(prefix)/share includedir=$(prefix)/include infodir=$(prefix)/share/info -libdir=$(prefix)/lib docdir=$(prefix)/share/doc mandir=$(prefix)/share/man sbindir=$(prefix)/sbin Modified: glibc-package/trunk/debian/rules.d/build.mk =================================================================== --- glibc-package/trunk/debian/rules.d/build.mk 2006-02-23 10:07:58 UTC (rev 1220) +++ glibc-package/trunk/debian/rules.d/build.mk 2006-02-23 10:15:26 UTC (rev 1221) @@ -35,9 +35,15 @@ echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms echo "sysconfdir = /etc" >> $(DEB_BUILDDIR)/configparms echo "rootsbindir = /sbin" >> $(DEB_BUILDDIR)/configparms +ifneq ($(call xx,libdir),) + echo "libdir = $(call xx,libdir)" >> $(DEB_BUILDDIR)/configparms +endif ifneq ($(call xx,slibdir),) echo "slibdir = $(call xx,slibdir)" >> $(DEB_BUILDDIR)/configparms endif +ifneq ($(call xx,rtlddir),) + echo "rtlddir = $(call xx,rtlddir)" >> $(DEB_BUILDDIR)/configparms +endif # Prevent autoconf from running unexpectedly by setting it to false. # Also explicitly pass CC down - this is needed to get -m64 on -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]