From a6fd7f21ed7a84ce213c27bff346d9e7b473d21e Mon Sep 17 00:00:00 2001 From: Carsten Munk Date: Tue, 5 Feb 2013 13:40:35 +0100 Subject: [PATCH] Disable multilib for 64-bit architectures Signed-off-by: Carsten Munk --- eglibc-2.15-disable-multilib.patch | 0 glibc.changes | 3 +++ glibc.spec | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 eglibc-2.15-disable-multilib.patch diff --git a/eglibc-2.15-disable-multilib.patch b/eglibc-2.15-disable-multilib.patch new file mode 100644 index 0000000..e69de29 diff --git a/glibc.changes b/glibc.changes index b83275d..c8a2066 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,6 @@ +* Sat Jan 26 2013 Oleg Girko - 2.15 +- Disable multilib for 64-bit architectures. + * Wed Sep 12 2012 Carsten Munk - 2.15 - Upgrade to 2.15-0ubuntu17 diff --git a/glibc.spec b/glibc.spec index debafcf..d2939b1 100644 --- a/glibc.spec +++ b/glibc.spec @@ -34,6 +34,7 @@ Patch8: glibc-2.14.1-ldso-nodefaultdirs-option.5.diff Patch9: eglibc-2.15-mips-async-unwind.patch Patch10: eglibc-2.15-mips-no-n32-n64.patch Patch11: glibc-2.14-locarchive-fedora.patch +Patch12: eglibc-2.15-disable-multilib.patch Provides: ldconfig # The dynamic linker supports DT_GNU_HASH @@ -193,6 +194,7 @@ If unsure if you need this, don't install this package. %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 # Not well formatted locales --cvm sed -i "s|^localedata/locale-eo_EO.diff$||g" debian/patches/series @@ -242,6 +244,9 @@ builddir=build-%{nptl_target_cpu}-$1 shift rm -rf $builddir mkdir $builddir ; cd $builddir +echo libdir=/usr/lib > configparms +echo slibdir=/lib >> configparms +echo BUILD_CC=gcc >> configparms build_CFLAGS="$BuildFlags -g -O3 $*" ../configure CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" \ --prefix=%{_prefix} \