You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2010/02/17 14:18:01 UTC
svn commit: r910961 - in /apr/apr/branches/1.4.x: ./ build/gen-build.py
Author: jorton
Date: Wed Feb 17 13:18:01 2010
New Revision: 910961
URL: http://svn.apache.org/viewvc?rev=910961&view=rev
Log:
Merge r910419 from trunk:
* sorted requires python >= 2.4. We only require python 2.3 and do not
have any better by default on RHEL 4.
So sort the values by other means.
Submitted by: rpluem
Reviewed by: jorton
Modified:
apr/apr/branches/1.4.x/ (props changed)
apr/apr/branches/1.4.x/build/gen-build.py
Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:18:01 2010
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,905040,908427,910419
Modified: apr/apr/branches/1.4.x/build/gen-build.py
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/gen-build.py?rev=910961&r1=910960&r2=910961&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/gen-build.py (original)
+++ apr/apr/branches/1.4.x/build/gen-build.py Wed Feb 17 13:18:01 2010
@@ -180,7 +180,9 @@
for hdr in deps.keys():
deps.update(h_deps.get(hdr, {}))
- f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(sorted(deps.values()))))
+ vals = deps.values()
+ vals.sort()
+ f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(vals)))
objects.sort()