Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Disable multilib for 64-bit architectures
Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
  • Loading branch information
Carsten Munk committed Feb 5, 2013
1 parent c02255e commit a6fd7f2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
Whitespace-only changes.
3 changes: 3 additions & 0 deletions glibc.changes
@@ -1,3 +1,6 @@
* Sat Jan 26 2013 Oleg Girko <ol+mer@infoserver.ru> - 2.15
- Disable multilib for 64-bit architectures.

* Wed Sep 12 2012 Carsten Munk <carsten@jollamobile.com> - 2.15
- Upgrade to 2.15-0ubuntu17

Expand Down
5 changes: 5 additions & 0 deletions glibc.spec
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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} \
Expand Down

0 comments on commit a6fd7f2

Please sign in to comment.