autoconf-2.13-native: initial add
PATCH 1/2 autoconf-2.13-native: initial add
This ancient version of autoconf is a requirement when building mozjs from firefox-esr sources.
Signed-off-by Andreas Müller <[email protected]>
--- .../autoconf-2.13-native_2.13.bb | 67 +++++++++++++++++++ ....guess-config.sub-install-to-destdir.patch | 67 +++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb create mode 100644 meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch
meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb new file +67 -0
@@ -0,0 +1,67 @@ +SUMMARY = "A GNU tool that produce shell scripts to automatically configure software" +DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ +configure software source code packages. Autoconf creates a configuration script for a package from a template \ +file that lists the operating system features that the package can use, in the form of M4 macro calls." +SECTION = "devel" + +HOMEPAGE = "http://www.gnu.org/software/autoconf/" + +LICENSE = "GPLv3" +LICENSE = "GPLv2 & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" + +SRC_URI = " \ + ${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ + file://0001-Add-config.guess-config.sub-install-to-destdir.patch \ +" + +S = "${WORKDIR}/${BPN}" +SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" +SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" + +inherit native texinfo + +DEPENDS += "m4-native gnu-config-native" +RDEPENDS_${PN} = "m4-native gnu-config-native" + +PERL = "${USRBINPATH}/perl" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" + +CONFIGUREOPTS = " \ + --build=${BUILD_SYS} \ + --host=${HOST_SYS} \ + --target=${TARGET_SYS} \ + --prefix=${prefix} \ + --exec_prefix=${exec_prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --oldincludedir=${oldincludedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + --disable-silent-rules \ +" + +EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no" + +do_configure() { + ./configure ${CONFIGUREOPTS} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + # avoid conflicts with standard autotools + ver="213" + for file in `find ${D}${bindir} -type f`; do + mv $file $file$ver + done + mv ${D}${datadir}/autoconf ${D}${datadir}/autoconf213 +}
meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch new file +67 -0
67 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 2/2 mozjs: upgrade 60.5.2 -> 60.9.0 and rework
* build with firefox-esr sources to simplyfy upgrade path
* cleanup: Should make python2-> python3 transition easier
Signed-off-by Andreas Müller <[email protected]>
---
...001-do-not-create-python-environment.patch | 15 +----
...toconf-2.13-to-refresh-old.configure.patch | 42 --------------
...ix-cross-compilation-on-i586-targets.patch | 20 +++++--
.../{mozjs_60.5.2.bb => mozjs_60.9.0.bb} | 56 +++++++++----------
4 files changed, 45 insertions(+), 88 deletions(-)
delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch
rename meta-oe/recipes-extended/mozjs/{mozjs_60.5.2.bb => mozjs_60.9.0.bb} (82%)meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch +3 -12
@@ -8,10 +8,12 @@ Use oe's python environment rather than create one of host Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <[email protected]> + +Rebase to 60.9.0 (firefox-esr sources) +Signed-off-by: Andreas Müller <[email protected]> --- build/moz.configure/init.configure | 18 ------------------ configure.py | 10 +++++++++- - js/src/old-configure | 4 ++-- 3 files changed, 11 insertions(+), 21 deletions(-) --- a/build/moz.configure/init.configure
@@ -60,14 +62,3 @@ Signed-off-by: Hongxu Jia <[email protected]> from mozbuild.configure import ConfigureSandbox from mozbuild.makeutil import Makefile from mozbuild.pythonutil import iter_modules_in_path ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -9974,7 +9974,7 @@ if test "$JS_STANDALONE"; then - - if test "$no_recursion" != yes; then - trap '' EXIT -- if ! $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then -+ if ! PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then - exit 1 - fi - fi
meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch deleted +0 -42
42 lines not on this page · raw message
meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch +14 -6
@@ -13,18 +13,26 @@ Signed-off-by: Maciej Borzecki <[email protected]> Rebase to 52.8.1 Signed-off-by: Hongxu Jia <[email protected]> + +Rebase to 60.9.0 (firefox-esr sources) +Signed-off-by: Andreas Müller <[email protected]> --- - js/src/old-configure | 2 +- + js/src/old-configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -3833,7 +3833,7 @@ AS='$(CC)' +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 3d53ee1..11c3d5a 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -405,7 +405,7 @@ AS='$(CC)' AS_DASH_C_FLAG='-c' MOZ_USER_DIR=".mozilla" -MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib" +MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin" - - + dnl Configure platform-specific CPU architecture compiler options. + dnl ============================================================== +-- +2.21.0 +
meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb renamed from meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +28 -28
96 lines not on this page · raw message
Signature · 1 line
2.21.0