File tree Expand file tree Collapse file tree 2 files changed +9
-10
lines changed Expand file tree Collapse file tree 2 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ DEPENDS += "gnu-config-native virtual/libintl libxt libxi zip-native gtk+"
3
3
4
4
SRC_URI += "file://mozconfig"
5
5
6
- inherit pkgconfig pythonnative
6
+ inherit pkgconfig
7
7
8
8
EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \
9
9
--with-toolchain-prefix=${TARGET_SYS} - \
@@ -62,15 +62,6 @@ mozilla_do_configure() {
62
62
}
63
63
64
64
mozilla_do_compile () {
65
-
66
- # This is a hack/workaround necessary for building firefox 68esr on
67
- # Centos 7.6/Fedora
68
- # It doesn't do any harm on other distros - like Ubuntu 18.04 or Debian 10
69
- # Moreover, it mimics 'include pythonnative', which cannot be used as it
70
- # causes errors during firefox 68esr configuration stage
71
- ln -snf python -native /python2 .7 ${STAGING_BINDIR_NATIVE} /python2 .7
72
- ln -snf python -native /python2 .7 ${STAGING_BINDIR_NATIVE} /python
73
-
74
65
mozilla_run_mach build
75
66
}
76
67
Original file line number Diff line number Diff line change @@ -4,6 +4,14 @@ BBPATH .= ":${LAYERDIR}"
4
4
# We have a recipes directory, add to BBFILES
5
5
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
6
6
7
+ # this is only temporary to allow building firefox on hosts without any python2
8
+ # were it would fail like this:
9
+ # ERROR: firefox-68.9.0esr-r0 do_configure: Execution of '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/firefox/68.9.0esr-r0/temp/run.do_configure.2697230' failed with exit code 127:
10
+ # ./mach: 9: exec: python: not found
11
+ # this should be removed when firefox is upgraded to 78 ESR or newer which contains:
12
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1473498
13
+ HOSTTOOLS += "python python2.7"
14
+
7
15
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
8
16
firefox-addon-webconverger \
9
17
firefox-l10n-ach \
You can’t perform that action at this time.
0 commit comments