~ubuntu-branches/ubuntu/raring/gcc-4.7/raring

« back to all changes in this revision

Viewing changes to debian/patches/libjava-disable-plugin.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-12-17 23:19:46 UTC
  • Revision ID: package-import@ubuntu.com-20111217231946-n668coanjbjgqxq7
Tags: 4.7-20111217-1
* GCC-4.7 snapshot build.
  - Including the GFDL documentation; will stay in experimental
    until the 4.7.0 release sometime next year.
* Update patches for the trunk.
* Update symbols files.
* Build libitm packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# DP: Don't build the gcjwebplugin, even when configured with --enable-plugin
 
2
 
 
3
--- a/src/libjava/configure.ac
 
4
+++ b/src/libjava/configure.ac
 
5
@@ -65,6 +65,8 @@
 
6
      esac],
 
7
     [browser_plugin_enabled=no]
 
8
 )
 
9
+# FIXME: don't build the plugin, this option collides with GCC plugin support
 
10
+plugin_enabled=no
 
11
 
 
12
 AC_ARG_ENABLE(gconf-peer,
 
13
   AS_HELP_STRING([--enable-gconf-peer],