Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix MER#377: Do not add arm/local-linaro-cortex-strings.diff on armv6…
…, no ARMv7/Thumb2 there

Signed-off-by: Carsten Munk <carsten.munk@gmail.com>
  • Loading branch information
stskeeps committed Jun 11, 2012
1 parent 2a3ebd4 commit 734efce
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions glibc.changes
@@ -1,3 +1,6 @@
* Mon Jun 11 2012 Carsten Munk <carsten@merproject.org> - 2.15
- MER#377: Do not add arm/local-linaro-cortex-strings.diff on armv6, no ARMv7/Thumb2 there

* Sun May 27 2012 Carsten Munk <carsten@merproject.org> - 2.15
- MER#295: Add back build-locale-archive and run it on postinstall

Expand Down
5 changes: 4 additions & 1 deletion glibc.spec
Expand Up @@ -190,7 +190,10 @@ If unsure if you need this, don't install this package.
# Not well formatted locales --cvm
sed -i "s|^localedata/locale-eo_EO.diff$||g" debian/patches/series
sed -i "s|^localedata/locale-ia.diff$||g" debian/patches/series

# This screws up armv6, as it doesn't have ARMv7 instructions/Thumb2
%ifarch armv6l
sed -i "s|^arm/local-linaro-cortex-strings.diff$||g" debian/patches/series
%endif
QUILT_PATCHES=debian/patches quilt push -a

cat > find_provides.sh <<EOF
Expand Down

0 comments on commit 734efce

Please sign in to comment.