[PATCH] aot-compile and aot-compile-rpm fix

[PATCH] aot-compile and aot-compile-rpm fix

[Gary Benson]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

Hi again,

The attached patch changes how the library modules are made available
to the aot-compile scripts.  The current code adds libgcj's module
directory to the _end_ of the path, so modules of the same name
earlier in the path will take priority.  The attached patch changes it
to add the directory to the start of the path.

Ok to commit?

Cheers,
Gary

-- 
http://gbenson.net/

[-- Attachment #2: aot-compile-paths.patch --]
[-- Type: text/plain, Size: 2002 bytes --]

Index: libjava/ChangeLog
===================================================================
--- libjava/ChangeLog	(revision 170131)
+++ libjava/ChangeLog	(working copy)
@@ -1,5 +1,11 @@
 2011-02-14  Gary Benson  <gbenson@redhat.com>
 
+	* libjava/contrib/aot-compile.in: Add our module directory
+	to the start of the search path rather than the end.
+	* libjava/contrib/aot-compile-rpm.in: Likewise.
+
+2011-02-14  Gary Benson  <gbenson@redhat.com>
+
 	PR libjava/47484
 	* configure.ac (python_mod_dir, python_mod_dir_expanded):
 	Install Python modules into versioned directory.
Index: libjava/contrib/aot-compile.in
===================================================================
--- libjava/contrib/aot-compile.in	(revision 170130)
+++ libjava/contrib/aot-compile.in	(working copy)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2006 Free Software Foundation
+## Copyright (C) 2006, 2011 Free Software Foundation
 ## Written by Gary Benson <gbenson@redhat.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 ## GNU General Public License for more details.
 
 import sys
-sys.path.append("@python_mod_dir_expanded@")
+sys.path.insert(0, "@python_mod_dir_expanded@")
 import aotcompile
 import getopt
 import os
Index: libjava/contrib/aot-compile-rpm.in
===================================================================
--- libjava/contrib/aot-compile-rpm.in	(revision 170130)
+++ libjava/contrib/aot-compile-rpm.in	(working copy)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2005, 2006, 2007 Free Software Foundation
+## Copyright (C) 2005, 2006, 2007, 2011 Free Software Foundation
 ## Written by Gary Benson <gbenson@redhat.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 ## GNU General Public License for more details.
 
 import sys
-sys.path.append("@python_mod_dir_expanded@")
+sys.path.insert(0, "@python_mod_dir_expanded@")
 import aotcompile
 import os
 

Re: [PATCH] aot-compile and aot-compile-rpm fix

[Andrew Haley]

On 02/14/2011 03:42 PM, Gary Benson wrote:
> Hi again,

> Ok to commit?

OK.

Andrew.

Re: [PATCH] aot-compile and aot-compile-rpm fix

[Gary Benson]

Andrew Haley wrote:
> On 02/14/2011 03:42 PM, Gary Benson wrote:
> > Ok to commit?
>
> OK.

Thanks, done.

Cheers,
Gary

-- 
http://gbenson.net/