forked from rpms/glibc
Sync with upstream master
This commit is contained in:
parent
adaecdb51b
commit
7047693f55
@ -30,7 +30,7 @@ index fd3036d..7cbceaa 100644
|
|||||||
+++ b/benchtests/Makefile
|
+++ b/benchtests/Makefile
|
||||||
@@ -103,6 +103,10 @@ bench-clean:
|
@@ -103,6 +103,10 @@ bench-clean:
|
||||||
|
|
||||||
bench: $(timing-type) bench-set bench-func bench-malloc
|
bench: $(timing-type) $(gen-locales) bench-set bench-func bench-malloc
|
||||||
|
|
||||||
+bench-build: bench-set-build bench-func-build
|
+bench-build: bench-set-build bench-func-build
|
||||||
+bench-set-build: $(binaries-benchset)
|
+bench-set-build: $(binaries-benchset)
|
||||||
|
@ -7,5 +7,5 @@ diff -Nrup a/localedata/Makefile b/localedata/Makefile
|
|||||||
$(LOCALEDEF) --alias-file=../intl/locale.alias \
|
$(LOCALEDEF) --alias-file=../intl/locale.alias \
|
||||||
+ --no-archive \
|
+ --no-archive \
|
||||||
-i locales/$$input -c -f charmaps/$$charset \
|
-i locales/$$input -c -f charmaps/$$charset \
|
||||||
$(addprefix --prefix=,$(install_root)) $$locale; \
|
$(addprefix --prefix=,$(install_root)) $$locale \
|
||||||
echo ' done'; \
|
&& echo ' done'; \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
%define glibcsrcdir glibc-2.21-320-ga6d78c3
|
%define glibcsrcdir glibc-2.21-357-gb40a4e1
|
||||||
%define glibcversion 2.21.90
|
%define glibcversion 2.21.90
|
||||||
%define glibcrelease 12%{?dist}
|
%define glibcrelease 13%{?dist}
|
||||||
# Pre-release tarballs are pulled in from git using a command that is
|
# Pre-release tarballs are pulled in from git using a command that is
|
||||||
# effectively:
|
# effectively:
|
||||||
#
|
#
|
||||||
@ -1817,6 +1817,9 @@ rm -f *.filelist*
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 18 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-13
|
||||||
|
- Sync with upstream master.
|
||||||
|
|
||||||
* Fri May 08 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-12
|
* Fri May 08 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-12
|
||||||
- Add benchmark comparison scripts.
|
- Add benchmark comparison scripts.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user