Djam/glibc40
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/glibc40.git synced 2025-02-23 15:52:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge some fixes from Cooker to fix issues with building locales

Browse source
This commit is contained in:
Andrey Bondrov 2014-06-23 21:01:42 +11:00
parent 8f9285d0d3
commit 0b9a6aec0b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
glibc.spec
View file

@ -953,6 +953,7 @@ function BuildGlibc() {
BuildCompFlags="-march=armv6" BuildCompFlags="-march=armv6"
;; ;;
esac esac
BuildCompFlags="$BuildCompFlags -fuse-ld=bfd"
# Choose multiarch support # Choose multiarch support
MultiArchFlags= MultiArchFlags=
@ -1007,7 +1008,7 @@ function BuildGlibc() {
mkdir build-$arch-linux mkdir build-$arch-linux
pushd build-$arch-linux pushd build-$arch-linux
[[ "$BuildAltArch" = "yes" ]] && touch ".alt" || touch ".main" [[ "$BuildAltArch" = "yes" ]] && touch ".alt" || touch ".main"
CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags" LDFLAGS="%{ldflags}" ../configure \ CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags" LDFLAGS="%{ldflags} -fuse-ld=bfd" ../configure \
$arch-%{_target_vendor}-%{_target_os}%{?_gnu} \ $arch-%{_target_vendor}-%{_target_os}%{?_gnu} \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libexecdir=%{_prefix}/libexec \ --libexecdir=%{_prefix}/libexec \
@ -1303,7 +1304,7 @@ rm -f %{buildroot}%{_infodir}/dir
%if ! %{without locales} %if ! %{without locales}
# Build locales... # Build locales...
export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH
#export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH
export I18NPATH=%{buildroot}%{_datadir}/i18n export I18NPATH=%{buildroot}%{_datadir}/i18n
# make default charset pseudo-locales # make default charset pseudo-locales
@ -1318,7 +1319,9 @@ do
done done
# Build regular locales # Build regular locales
SUPPORTED=$I18NPATH/SUPPORTED DESTDIR=%{buildroot} %make -f %{SOURCE20} # Don't try to use SMP make here - that would result in concurrent writes to the locale
# archive.
SUPPORTED=$I18NPATH/SUPPORTED DESTDIR=%{buildroot} make -f %{SOURCE20}
# Locale related tools # Locale related tools
install -c -m 755 %{SOURCE1001} %{SOURCE1002} %{buildroot}%{_bindir}/ install -c -m 755 %{SOURCE1001} %{SOURCE1002} %{buildroot}%{_bindir}/
# And configs # And configs