| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Thu, 18 Aug 2016 08:58:07 +0200 | |
| branch | firefox48 |
| changeset 926 | 6ab8b16f232c |
| parent 925 | 05d175c5957e |
| permissions | -rw-r--r-- |
|
925
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# Parent 2a0e5188c796cb2addedd185aba6176405786854 |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Bug 1282843 - configure.py doesn't parse global autoconf options like --libdir |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
without assuming libdir during build we do not find plugins/extensions in the correct system directory |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
--- a/build/moz.configure/old.configure |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+++ b/build/moz.configure/old.configure |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
@@ -149,16 +149,19 @@ def old_configure_options(*options): |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
def all_options(help): |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
return list(options) |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
|
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
return depends(prepare_configure, extra_old_configure_args, all_options, |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
*options) |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
|
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
|
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
@old_configure_options( |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+ '--libdir', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+ '--includedir', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+ '--datadir', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
'--cache-file', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
'--enable-accessibility', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
'--enable-address-sanitizer', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
'--enable-alsa', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
'--enable-android-omx', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
'--enable-android-resource-constrained', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
'--enable-approximate-location', |
|
05d175c5957e
added upstream patch so system plugins/extensions are correctly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
'--enable-b2g-bt', |