[PATCH] Fix namespace pollution (PR libjava/47484)

[PATCH] Fix namespace pollution (PR libjava/47484)

[Gary Benson]

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

Hi all,

The attached patch fixes PR libjava/47484, an issue where Python
modules are installed in an unversioned directory:

  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47484

Ok to commit?

Cheers,
Gary

-- 
http://gbenson.net/

[-- Attachment #2: aot-compile-fix-take-2.patch --]
[-- Type: text/plain, Size: 3209 bytes --]

Index: libjava/ChangeLog
===================================================================
--- libjava/ChangeLog	(revision 170123)
+++ libjava/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+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.
+	* configure: Regenerate.
+
 2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure: Regenerate.
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 170123)
+++ libjava/configure.ac	(working copy)
@@ -1843,21 +1843,18 @@
 # We get this from the environment.
 AC_SUBST(GCJFLAGS)
 
+default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava"
 AC_ARG_WITH([python-dir],
             AS_HELP_STRING([--with-python-dir],
                            [the location to install Python modules. This path should NOT include the prefix.]),
-            [with_python_dir=$withval], [with_python_dir=""])
+            [with_python_dir=$withval], [with_python_dir="${default_python_dir}"])
 
-if test "x${with_python_dir}" = "x"
-then
-  # Needed for installing Python modules during make install.
-  python_mod_dir="\${prefix}/share/python"
-  # Needed for substituting into aot-compile*
-  python_mod_dir_expanded="${expanded_prefix}/share/python"
-else
-  python_mod_dir="\${prefix}${with_python_dir}"
-  python_mod_dir_expanded="${expanded_prefix}${with_python_dir}"
-fi
+# Needed for installing Python modules during make install.
+python_mod_dir="\${prefix}${with_python_dir}"
+
+# Needed for substituting into aot-compile*
+python_mod_dir_expanded="${expanded_prefix}${with_python_dir}"
+
 AC_MSG_RESULT(Python modules dir: ${python_mod_dir_expanded});
 AC_SUBST(python_mod_dir)
 AC_SUBST(python_mod_dir_expanded)
Index: libjava/configure
===================================================================
--- libjava/configure	(revision 170123)
+++ libjava/configure	(working copy)
@@ -24631,25 +24631,22 @@
 # We get this from the environment.
 
 
+default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava"
 
 # Check whether --with-python-dir was given.
 if test "${with_python_dir+set}" = set; then :
   withval=$with_python_dir; with_python_dir=$withval
 else
-  with_python_dir=""
+  with_python_dir="${default_python_dir}"
 fi
 
 
-if test "x${with_python_dir}" = "x"
-then
-  # Needed for installing Python modules during make install.
-  python_mod_dir="\${prefix}/share/python"
-  # Needed for substituting into aot-compile*
-  python_mod_dir_expanded="${expanded_prefix}/share/python"
-else
-  python_mod_dir="\${prefix}${with_python_dir}"
-  python_mod_dir_expanded="${expanded_prefix}${with_python_dir}"
-fi
+# Needed for installing Python modules during make install.
+python_mod_dir="\${prefix}${with_python_dir}"
+
+# Needed for substituting into aot-compile*
+python_mod_dir_expanded="${expanded_prefix}${with_python_dir}"
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Python modules dir: ${python_mod_dir_expanded}" >&5
 $as_echo "Python modules dir: ${python_mod_dir_expanded}" >&6; };
 

Re: [PATCH] Fix namespace pollution (PR libjava/47484)

[Andrew Haley]

On 02/14/2011 01:00 PM, Gary Benson wrote:
> Hi all,
>
> The attached patch fixes PR libjava/47484, an issue where Python
> modules are installed in an unversioned directory:
>
>    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47484
>
> Ok to commit?

OK, thanks.

Andrew.

Re: [PATCH] Fix namespace pollution (PR libjava/47484)

[Gary Benson]

Andrew Haley wrote:
> On 02/14/2011 01:00 PM, Gary Benson wrote:
> > The attached patch fixes PR libjava/47484, an issue where Python
> > modules are installed in an unversioned directory:
> >
> >    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47484
> >
> > Ok to commit?
>
> OK, thanks.

Done, thank you.

Cheers,
Gary

-- 
http://gbenson.net/