diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
147 files changed, 3747 insertions, 5845 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch deleted file mode 100644 index 287391a52..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch +++ /dev/null @@ -1,98 +0,0 @@ -Remove rpath, its bad for cross compiling to encode -build time rpaths - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: boinc-client_release-7.6-7.6.33/api/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am -+++ boinc-client_release-7.6-7.6.33/api/Makefile.am -@@ -43,18 +43,18 @@ endif - - lib_LTLIBRARIES = libboinc_api.la - libboinc_api_la_SOURCES = $(api_files) --libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - - if BUILD_GRAPHICS_API - lib_LTLIBRARIES += libboinc_graphics2.la - libboinc_graphics2_la_SOURCES = $(graphics2_files) - libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs --libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg -+libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg - endif #BUILD_GRAPHICS_API - - lib_LTLIBRARIES += libboinc_opencl.la - libboinc_opencl_la_SOURCES = $(opencl_files) --libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - - if INSTALL_HEADERS - ## install only headers that are meant for exporting the API !! -Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am -+++ boinc-client_release-7.6-7.6.33/lib/Makefile.am -@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la - libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources) - libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) - libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) --libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION) -+libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) - libboinc_la_LIBADD = - - if ENABLE_BOINCCRYPT -@@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la - libboinc_crypt_la_SOURCES = crypt.cpp - libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS) - libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS) --libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION) -+libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) - libboinc_crypt_la_LIBADD = - endif - -@@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la - libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources) - libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) - libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) --libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - libboinc_fcgi_la_LIBADD = - endif - # end of "if ENABLE_FCGI" -Index: boinc-client_release-7.6-7.6.33/sched/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/sched/Makefile.am -+++ boinc-client_release-7.6-7.6.33/sched/Makefile.am -@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libsched.la - libsched_la_SOURCES = $(libsched_sources) - libsched_la_CFLAGS = $(AM_CPPFLAGS) - libsched_la_CXXFLAGS = $(AM_CPPFLAGS) --libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) - libsched_la_LIBADD= $(SSL_LIBS) - - ## install only headers that are meant for exporting the API !! -@@ -48,7 +48,7 @@ lib_LTLIBRARIES += libsched_fcgi.la - libsched_fcgi_la_SOURCES = $(libsched_sources) - libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS) - libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS) --libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libsched_fcgi_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) - libsched_fcgi_la_LIBADD= - - endif -Index: boinc-client_release-7.6-7.6.33/zip/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/zip/Makefile.am -+++ boinc-client_release-7.6-7.6.33/zip/Makefile.am -@@ -61,7 +61,7 @@ endif - - lib_LTLIBRARIES = libboinc_zip.la - libboinc_zip_la_SOURCES = $(libboinc_zip_sources) --libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - libboinc_zip_la_LIBADD = - - # Some OSs may not prefix libraries with lib. diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb index 99b43fa3f..e505bb4c5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb @@ -29,21 +29,19 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " - -SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.gz \ +SRCREV = "bd12338dbd29083daa5a4b022592ca31ff68cd98" +BRANCH = "client_release/7/${PV}" +SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ file://opengl_m4_check.patch \ - file://cross-compile.patch \ file://gtk-configure.patch \ " -SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac" -SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d" -inherit gettext autotools-brokensep pkgconfig distro_features_check +inherit gettext autotools pkgconfig distro_features_check systemd REQUIRED_DISTRO_FEATURES += "opengl" -S = "${WORKDIR}/${BPN}_release-7.6-${PV}" +S = "${WORKDIR}/git" EXTRA_OECONF += "\ --enable-libraries \ @@ -75,5 +73,15 @@ do_compile_prepend () { sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/${TARGET_SYS}-libtool sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool } +do_install_append() { + if [ -e ${D}${libdir}/systemd/system/boinc-client.service ]; then + install -D -m 0644 \ + ${D}${libdir}/systemd/system/boinc-client.service \ + ${D}${systemd_system_unitdir}/boinc-client.service + rm -rf ${D}${libdir}/systemd + fi +} + +SYSTEMD_SERVICE_${PN} = "boinc-client.service" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" +FILES_${PN} += "${libdir}/systemd" diff --git a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb new file mode 100644 index 000000000..b4d4773ee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb @@ -0,0 +1,14 @@ +SUMMARY = "Lossless compression library and tool" +DESCRIPTIOM = "Brotli is a generic-purpose lossless compression algorithm \ +that it is similar in speed to deflate but offers more dense compression." +HOMEPAGE = "https://github.com/google/brotli" +BUGTRACKER = "https://github.com/google/brotli/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" + +SRC_URI = "git://github.com/google/brotli.git" +# tag 1.0.7 +SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541" +S = "${WORKDIR}/git" + +inherit cmake lib_package diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc index 9bdafd244..5214715cd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc @@ -6,7 +6,7 @@ programming language." SECTION = "devel" LICENSE = "PD" -SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz \ +SRC_URI = "ftp://ftp.invisible-island.net/byacc/byacc-${PV}.tgz \ file://byacc-open.patch \ file://0001-byacc-do-not-reorder-CC-and-CFLAGS.patch" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 7cd2510c8..3bc0db96e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -9,28 +9,29 @@ Delete all these stuff so that we could have all options we need. Upstream-Status: Inappropriate [OE Specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- aclocal.m4 | 1 - - configure | 119 ------------------------------------------------------------- - 2 files changed, 120 deletions(-) + configure | 140 ------------------------------------------------------------- + 2 files changed, 141 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 917a848..62ef241 100644 +index 0d14f26..0cefa08 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1021,7 +1021,6 @@ CF_GCC_VERSION +@@ -1038,7 +1038,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) -CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- - dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 + dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index 9707e50..4f0497c 100755 +index d27ae31..077c648 100755 --- a/configure +++ b/configure -@@ -1946,125 +1946,6 @@ esac +@@ -1946,146 +1946,6 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} @@ -43,8 +44,9 @@ index 9707e50..4f0497c 100755 - { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... -- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'` -- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'` +- cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` +- cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` +- CC="$cf_prog" - for cf_arg in $cf_flags - do - case "x$cf_arg" in @@ -55,7 +57,7 @@ index 9707e50..4f0497c 100755 -cf_new_cppflags= -cf_new_extra_cppflags= - --for cf_add_cflags in $cf_flags +-for cf_add_cflags in $cf_arg -do -case $cf_fix_cppflags in -(no) @@ -70,10 +72,16 @@ index 9707e50..4f0497c 100755 - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- - continue - elif test "${cf_tst_cflags}" = "\"'" ; then -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- - continue - fi - ;; @@ -92,17 +100,25 @@ index 9707e50..4f0497c 100755 - - ;; - esac -- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" +- +- test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " +- cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +- - ;; - esac - ;; - (*) -- cf_new_cflags="$cf_new_cflags $cf_add_cflags" +- +- test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " +- cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +- - ;; - esac - ;; -(yes) -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - @@ -115,17 +131,23 @@ index 9707e50..4f0497c 100755 - -if test -n "$cf_new_cflags" ; then - -- CFLAGS="$CFLAGS $cf_new_cflags" +- test -n "$CFLAGS" && CFLAGS="$CFLAGS " +- CFLAGS="${CFLAGS}$cf_new_cflags" +- -fi - -if test -n "$cf_new_cppflags" ; then - -- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +- test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " +- CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +- -fi - -if test -n "$cf_new_extra_cppflags" ; then - -- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +- test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " +- EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +- -fi - - ;; @@ -136,26 +158,26 @@ index 9707e50..4f0497c 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2051: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2072: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2055: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2076: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2059: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2080: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2063: result: ok" >&5 +- echo "$as_me:2084: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2068: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2089: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- -2.8.3 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20180510.bb index 702c4c99e..f30c42640 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20180510.bb @@ -4,9 +4,9 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=9176bfb16dab43ebcb8e50d9ee9550b6" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=8b2933503c0443e041d3168dc0c65640" require byacc.inc -SRC_URI[md5sum] = "4bb274bbd7b648d4251c2b9ca36ed0c9" -SRC_URI[sha256sum] = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91" +SRC_URI[md5sum] = "97fdc0745e0ff0cef5c09d57d0c6752d" +SRC_URI[sha256sum] = "d0940dbffbc7e9c9dd4985c25349c390beede84ae1d9fe86b71c0aa659a6d693" diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb index b52e7cc08..dda6af9c9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb @@ -22,8 +22,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz" -SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4" -SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6" +SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860" +SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch deleted file mode 100644 index 2295e415c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -projlibdir use a hard coded lib path, this will cause error when build a 64bit -target. So change it to suitable path. - -Signed-off-by: Song.Li <Song.Li@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 38e2b9c..bc6b996 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [ - fi - - sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_? -- projlibdir='${exec_prefix}/lib' -+ projlibdir='${libdir}' - mandir='${exec_prefix}/share/man' - ]) - --- -1.7.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch index b9526f284..db69f951c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch @@ -1,23 +1,38 @@ +From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 18 Jul 2016 09:06:06 +0800 +Subject: [PATCH] cfengine: add recipe and base policy + Upstream-Status: Inappropriate [configuration] Set the path of default configure file. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + misc/init.d/cfengine3.in | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in -index d6ae26f..1dee283 100644 +index c584817..12f5803 100644 --- a/misc/init.d/cfengine3.in +++ b/misc/init.d/cfengine3.in -@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then +@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then fi # default control file -if [ "$DEBIAN" = "1" ]; then - DEFAULT=/etc/default/cfengine3 +- INIT_FUNCTIONS=/lib/lsb/init-functions +- if [ -e "$INIT_FUNCTIONS" ]; then +- . "$INIT_FUNCTIONS" +- fi -else - DEFAULT=/etc/sysconfig/cfengine3 --fi +DEFAULT=/etc/default/cfengine3 ++INIT_FUNCTIONS=/lib/lsb/init-functions ++if [ -e "$INIT_FUNCTIONS" ]; then ++ . "$INIT_FUNCTIONS" + fi if [ -f $DEFAULT ]; then - . $DEFAULT diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb index b86b0a1f1..9d0123d8b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb @@ -16,20 +16,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494" DEPENDS = "attr tokyocabinet" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ - file://change-hard-coded-lib-path.patch \ file://set-path-of-default-config-file.patch \ -" + " -SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992" -SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7" +SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5" +SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec" inherit autotools systemd export EXPLICIT_VERSION="${PV}" SYSTEMD_SERVICE_${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ - cf-runalerts.service cf-consumer.service cf-execd.service \ - cf-monitord.service cf-redis-server.service cf-serverd.service \ + cf-runalerts.service cf-execd.service \ + cf-monitord.service cf-serverd.service \ " SYSTEMD_AUTO_ENABLE_${PN} = "disable" diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 987c09fe5..987c09fe5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch index 1ceacd8c4..5ee75cb4d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch @@ -1,28 +1,31 @@ -[PATCH] conditionally check libvirt +From 385bf1c2ec57942e17ee529e57eef0dcd99904e6 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 1 Sep 2015 17:00:33 +0800 +Subject: [PATCH] [PATCH] conditionally check libvirt Upstream-Statue: Pending check if libvirt is available only when a user wants to use libvirt Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) + configure.ac | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) -Index: collectd-5.7.1/configure.ac -=================================================================== ---- collectd-5.7.1.orig/configure.ac -+++ collectd-5.7.1/configure.ac -@@ -5556,12 +5556,14 @@ else - with_libxml2="no (pkg-config doesn't know libxml-2.0)" +diff --git a/configure.ac b/configure.ac +index 101d6f9f..a7eca97d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5758,11 +5758,14 @@ else + with_libxml2="no (pkg-config doesn't know libxml-2.0)" fi -$PKG_CONFIG --exists libvirt 2>/dev/null --if test "$?" = "0" --then -- with_libvirt="yes" +-if test $? = 0; then +- with_libvirt="yes" -else -- with_libvirt="no (pkg-config doesn't know libvirt)" +- with_libvirt="no (pkg-config doesn't know libvirt)" +if test "x$enable_libvirt" = "xyes"; then + $PKG_CONFIG --exists libvirt 2>/dev/null + if test "$?" = "0" @@ -32,5 +35,5 @@ Index: collectd-5.7.1/configure.ac + with_libvirt="no (pkg-config doesn't know libvirt)" + fi fi - if test "x$with_libxml2" = "xyes" - then + + if test "x$with_libxml2" = "xyes"; then diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index 5069a639c..d2c726800 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -1,4 +1,4 @@ -From b459c55e4968321e5a82272cb39aa69d4054990f Mon Sep 17 00:00:00 2001 +From b0a64db90a24469e36978c748417ebe456b34d59 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 22 Apr 2017 11:54:57 -0700 Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler @@ -14,35 +14,26 @@ client.c:834:23: error: '%s' directive output may be truncated writing up to 102 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - configure.ac | 3 +- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 76 insertions(+), 1 deletion(-) + configure.ac | 1 + + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/configure.ac b/configure.ac -index 8854542..edb8cfb 100644 +index a7eca97d..560eb988 100644 --- a/configure.ac +++ b/configure.ac -@@ -4,7 +4,6 @@ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) - AC_CONFIG_SRCDIR(src/target_set.c) - AC_CONFIG_HEADERS(src/config.h) - AC_CONFIG_AUX_DIR([libltdl/config]) -- - dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; - dnl we don't really need the 'u' even in older toolchains. Then there is - dnl older libtool, which spelled it AR_FLAGS -@@ -6688,6 +6687,8 @@ then - AM_CFLAGS="$AM_CFLAGS -Werror" - AM_CXXFLAGS="$AM_CXXFLAGS -Werror" +@@ -6794,6 +6794,7 @@ if test "x$enable_werror" != "xno"; then + AM_CFLAGS="$AM_CFLAGS -Werror" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror" fi +AX_CHECK_COMPILE_FLAG([-Werror -Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) -+ + AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS]) - diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 -index 0000000..dcabb92 +index 00000000..dcabb92a --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ @@ -120,6 +111,3 @@ index 0000000..dcabb92 + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS --- -2.13.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch new file mode 100644 index 000000000..b12690b32 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch @@ -0,0 +1,65 @@ +From d65e48b68076d5b304e6d865967003ae1fea0e6c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 9 May 2018 21:45:38 -0700 +Subject: [PATCH] Disable new gcc8 warnings + +GCC seems to be not able to detect the checks for size are +already in place + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/2768] + src/libcollectdclient/network_parse.c | 7 +++++++ + src/write_sensu.c | 7 +++++++ + 2 files changed, 14 insertions(+) + +diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c +index 2365ab0a..79e6ed96 100644 +--- a/src/libcollectdclient/network_parse.c ++++ b/src/libcollectdclient/network_parse.c +@@ -163,6 +163,11 @@ static int parse_int(void *payload, size_t payload_size, uint64_t *out) { + return 0; + } + ++#pragma GCC diagnostic push ++#if __GNUC__ == 8 ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif ++ + static int parse_string(void *payload, size_t payload_size, char *out, + size_t out_size) { + char *in = payload; +@@ -175,6 +180,8 @@ static int parse_string(void *payload, size_t payload_size, char *out, + return 0; + } + ++#pragma GCC diagnostic pop ++ + static int parse_identifier(uint16_t type, void *payload, size_t payload_size, + lcc_value_list_t *state) { + char buf[LCC_NAME_LEN]; +diff --git a/src/write_sensu.c b/src/write_sensu.c +index ce23e654..63e1f599 100644 +--- a/src/write_sensu.c ++++ b/src/write_sensu.c +@@ -569,6 +569,11 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */ + return ret_str; + } /* }}} char *sensu_value_to_json */ + ++#pragma GCC diagnostic push ++#if __GNUC__ == 8 ++#pragma GCC diagnostic ignored "-Wstringop-overflow" ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif + /* + * Uses replace_str2() implementation from + * http://creativeandcritical.net/str-replace-c/ +@@ -631,6 +636,8 @@ static char *replace_str(const char *str, const char *old, /* {{{ */ + return ret; + } /* }}} char *replace_str */ + ++#pragma GCC diagnostic pop ++ + static char *replace_json_reserved(const char *message) /* {{{ */ + { + char *msg = replace_str(message, "\\", "\\\\"); diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch index 1fde6a071..f12b16cb9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch @@ -1,43 +1,37 @@ -Index: collectd-5.7.1/configure.ac -=================================================================== ---- collectd-5.7.1.orig/configure.ac -+++ collectd-5.7.1/configure.ac -@@ -2305,7 +2305,7 @@ AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([ - with_libgcrypt="yes" - else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config" - then -- with_libgcrypt_config="$withval/bin/gcrypt-config" -+ with_libgcrypt_config="$withval/bin/pkg-config" - with_libgcrypt="yes" - else if test -d "$withval" - then -@@ -2313,12 +2313,12 @@ AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([ - GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib" - with_libgcrypt="yes" - else -- with_libgcrypt_config="gcrypt-config" -+ with_libgcrypt_config="pkg-config" - with_libgcrypt="$withval" - fi; fi; fi - ], - [ -- with_libgcrypt_config="libgcrypt-config" -+ with_libgcrypt_config="pkg-config" - with_libgcrypt="yes" - ]) - -@@ -2326,12 +2326,12 @@ if test "x$with_libgcrypt" = "xyes" && t - then - if test "x$GCRYPT_CPPFLAGS" = "x" - then -- GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null` -+ GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags libgcrypt 2>/dev/null` - fi - - if test "x$GCRYPT_LIBS" = "x" - then -- GCRYPT_LIBS=`"$with_libgcrypt_config" --libs 2>/dev/null` -+ GCRYPT_LIBS=`"$with_libgcrypt_config" --lib libgcrypt 2>/dev/null` - fi - fi - +From d9b954bd9d0b084d9a1f5159a9f0c45802a51809 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Mon, 22 Apr 2013 16:28:16 +0000 + +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e869a6a0..101d6f9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2514,20 +2514,20 @@ AC_ARG_WITH([libgcrypt], + if test -f "$withval" && test -x "$withval"; then + with_libgcrypt_config="$withval" + with_libgcrypt="yes" +- else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config"; then +- with_libgcrypt_config="$withval/bin/gcrypt-config" ++ else if test -f "$withval/bin/pkg-config" && test -x "$withval/bin/pkg-config"; then ++ with_libgcrypt_config="$withval/bin/pkg-config" + with_libgcrypt="yes" + else if test -d "$withval"; then + GCRYPT_CPPFLAGS="$GCRYPT_CPPFLAGS -I$withval/include" + GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib" + with_libgcrypt="yes" + else +- with_libgcrypt_config="gcrypt-config" ++ with_libgcrypt_config="pkg-config" + with_libgcrypt="$withval" + fi; fi; fi + ], + [ +- with_libgcrypt_config="libgcrypt-config" ++ with_libgcrypt_config="libpkg-config" + with_libgcrypt="yes" + ] + ) diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.0.bb index c156ea19c..df9fa233c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.0.bb @@ -12,9 +12,10 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-conditionally-check-libvirt.patch \ file://0001-fix-to-build-with-glibc-2.25.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ -" -SRC_URI[md5sum] = "5da2b69c286a064db35c6cc1e758b039" -SRC_URI[sha256sum] = "9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592" + file://0005-Disable-new-gcc8-warnings.patch \ + " +SRC_URI[md5sum] = "a841159323624f18bf03198e9f5aa364" +SRC_URI[sha256sum] = "b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9" inherit autotools pythonnative update-rc.d pkgconfig systemd @@ -42,7 +43,7 @@ PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \ --disable-amqp --with-librabbitmq=no,rabbitmq-c" # protobuf-c, libvirt that are currently only available in meta-virtualization layer PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf-c-native protobuf-c" -PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" +PACKAGECONFIG[libvirt] = "--enable-virt,--disable-virt,libvirt" PACKAGECONFIG[libesmtp] = "--with-libesmtp,--without-libesmtp,libesmtp" PACKAGECONFIG[libmnl] = "--with-libmnl,--without-libmnl,libmnl" PACKAGECONFIG[libatasmart] = "--with-libatasmart,--without-libatasmart,libatasmart" @@ -62,7 +63,7 @@ do_install_append() { sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/collectd - + install -Dm 0640 ${B}/src/collectd.conf ${D}${sysconfdir}/collectd.conf # Fix configuration file to allow collectd to start up sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20180621.bb index 63c65c4fc..e98795944 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20180621.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "f66f28beca900b54f5fc90fdcce93508" -SRC_URI[sha256sum] = "20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6" +SRC_URI[md5sum] = "1dba09cf45ac4ba40b3cb4a3f1d694b2" +SRC_URI[sha256sum] = "4a4859e2b22d24e46c1a529b5a5605b95503aa04da4432f7bbd713e3e867587a" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb index 4cc289d3a..f9fd8ae88 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb @@ -60,10 +60,12 @@ do_install_append_class-target() { install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ } -PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" +PACKAGES =+ "${PN}-x11" + +RPROVIDES_${PN}-dbg += "${PN}-x11-dbg" + DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." SECTION_${PN}-x11 = "x11/scientific" FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " FILES_${PN} += "${datadir}/texmf" -FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb index 05ee842f6..bf1367391 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb @@ -12,6 +12,8 @@ SRC_URI = "http://www.issihosts.com/haveged/haveged-${PV}.tar.gz \ SRC_URI[md5sum] = "fb1d8b3dcbb9d06b30eccd8aa500fd31" SRC_URI[sha256sum] = "f77d9adbdf421b61601fa29faa9ce3b479d910f73c66b9e364ba8642ccbfbe70" +UPSTREAM_CHECK_URI = "http://www.issihosts.com/haveged/downloads.html" + inherit autotools update-rc.d systemd EXTRA_OECONF = "\ diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb index 5a335b924..5f4155ea5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb @@ -7,9 +7,11 @@ SECTION = "base" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" -SRC_URI = "https://www.open-mpi.org/software/${PN}/v1.11/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "96c34136ff416d2b13a7821c27477bed" -SRC_URI[sha256sum] = "95d80286dfe658a3f79e2ac90698782bb36e5504f4bac1bba2394ba14dbbad24" +SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2" +SRC_URI[md5sum] = "0981a01935982aa7e850a96e0c3057b0" +SRC_URI[sha256sum] = "2be808383d8337846fe77ce49c7ad3336fb6857505494d85c0ac03f22c5bd1e7" + +UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb index 5dcae98b1..94643cd24 100644 --- a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb @@ -12,6 +12,9 @@ SRC_URI = "http://guichaz.free.fr/iotop/files/${BP}.tar.bz2" SRC_URI[md5sum] = "5ef9456b26d7694abf3101a72e1e0d1d" SRC_URI[sha256sum] = "3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b" +UPSTREAM_CHECK_URI = "http://repo.or.cz/iotop.git/tags" +UPSTREAM_CHECK_REGEX = "iotop-(?P<pver>\d+(\.\d+)+)" + inherit distutils do_install_append() { @@ -21,4 +24,4 @@ do_install_append() { RDEPENDS_${PN} = "python-curses python-textutils \ python-codecs python-ctypes python-pprint \ - python-shell" + python-shell python-subprocess" diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch index bcfc11724..61310ccf5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch @@ -1,7 +1,7 @@ -From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001 +From a70513ff59da3c593c76330afb445c21761c3268 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 18 Jul 2017 21:53:00 -0400 -Subject: [PATCH] tweak install prefix +Date: Tue, 31 Jul 2018 17:14:24 +0800 +Subject: [PATCH 1/2] tweak install prefix Upstream-Status: Inappropriate [oe specific] @@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile -index df16a3b..fbdfcb4 100644 +index c98cf35..7c5907f 100644 --- a/Makefile +++ b/Makefile @@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS) @@ -43,7 +43,7 @@ index df16a3b..fbdfcb4 100644 - install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ - install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) - install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR) -- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc +- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#/usr/include#g; s#@libdir@#/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc + install -d -m 0755 $(DESTDIR)$(includedir) + install -d -m 0755 $(DESTDIR)$(libdir) + install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig @@ -51,10 +51,10 @@ index df16a3b..fbdfcb4 100644 + install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir) + install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir) + install -m 0644 libcheckisomd5.a $(DESTDIR)$(libdir) -+ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc ++ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#$(includedir)#g; s#@libdir@#$(libdir)#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc clean: rm -f *.o *.so *.pyc *.a .depend *~ -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index 815113e67..83e838580 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -25,11 +25,12 @@ do_install () { oe_runmake install } -PACKAGES += "${PYTHON_PN}-${PN} ${PYTHON_PN}-${PN}-dbg" +PACKAGES += "${PYTHON_PN}-${PN}" + +RPROVIDES_${PN}-dbg += "${PYTHON_PN}-${PN}-dbg" FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" -FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so" -SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026" +SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.9.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.11.bb index 455b3744a..370fa2248 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.11.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8b70213ec164c7bd876ec2120ba52f61" SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "84abaefee9502b2f2ff394d758f160c7" -SRC_URI[sha256sum] = "0ad0d074ca049a36637e7abef755d40849ad73e926b93914ce294927b97bd2a5" +SRC_URI[md5sum] = "7af071db9970441e1eaaf25662310e33" +SRC_URI[sha256sum] = "6e85f42dabe49a7831dbdd6d30dca8a966956b51a9a50ed534b82afc3fa5b2f4" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 0f798d233..f62cf6ba6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -30,9 +30,10 @@ do_install_append() { rm -rf ${D}${datadir} } -PACKAGES =+ "${PN}-python ${PN}-python-dbg" +PACKAGES =+ "${PN}-python" + +RPROVIDES_${PN}-dbg += "${PN}-python-dbg" FILES_${PN}-python = "${libdir}/python2.7/site-packages/konkretmof.py* ${libdir}/python2.7/site-packages/_konkretmof.so" -FILES_${PN}-python-dbg = "${libdir}/python2.7/site-packages/.debug/*" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch deleted file mode 100644 index abdedad5d..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b5ca64c7398d516e9845d849e8306df7ac024bc4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 Apr 2017 13:59:34 -0700 -Subject: [PATCH] include asm/ioctl.h explicitly - -Needed for _IOC* defines - -helps compiling with musl where this file is -not included indirectly - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - server/drivers/hd44780-pifacecad.c | 1 + - server/drivers/hd44780-spi.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/server/drivers/hd44780-pifacecad.c b/server/drivers/hd44780-pifacecad.c -index 43db19c..e2798ad 100644 ---- a/server/drivers/hd44780-pifacecad.c -+++ b/server/drivers/hd44780-pifacecad.c -@@ -54,6 +54,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <asm/ioctl.h> - #include <stdint.h> - #include <linux/spi/spidev.h> - -diff --git a/server/drivers/hd44780-spi.c b/server/drivers/hd44780-spi.c -index 5f94333..8a4015b 100644 ---- a/server/drivers/hd44780-spi.c -+++ b/server/drivers/hd44780-spi.c -@@ -29,6 +29,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <asm/ioctl.h> - #include <stdint.h> - #include <linux/spi/spidev.h> - --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb index 96bc826fd..93a09f28a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb @@ -9,17 +9,18 @@ DEPENDS = "ncurses lirc" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ file://README.md;beginline=107;md5=5c927ce1742d6d5cddc45b7ad6230f75" -BASEPV = "0.5.8" +BASEPV = "0.5.9" PV = "${BASEPV}+git${SRCPV}" -SRCREV = "f5156e2e41bb418f14761afea22eee8efb49fb85" -SRC_URI = "git://github.com/lcdproc/lcdproc;branch=lcdproc-${BASEPV} \ - file://0001-include-asm-ioctl.h-explicitly.patch \ +SRCREV = "a4b5a7e058fdd0d914a61138748b589c0128b45b" +SRC_URI = "git://github.com/lcdproc/lcdproc \ " S = "${WORKDIR}/git" inherit autotools pkgconfig update-rc.d +COMPATIBLE_HOST_arm_libc-musl = "null" + LCD_DRIVERS ?= "all,!irman,!svga" LCD_DEFAULT_DRIVER ?= "curses" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch deleted file mode 100644 index 745883ebe..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 86686ccbf43c5d9e8c8dc97c66ba09e522050e5e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 27 Jul 2017 10:06:24 +0800 -Subject: [PATCH 1/3] fix configure and compile failures - -1. Fix do_configure failure ---------------------------- -|Checking header volume_key/libvolume_key.h existence and usability. -../tmp/6tvtK.c:1:38: fatal error: volume_key/libvolume_key.h: -No such file or directory -| #include <volume_key/libvolume_key.h> -|Checking header dmraid/dmraid.h existence and usability.../tmp/ -ktVJ6.c:1:27: fatal error: dmraid/dmraid.h: No such file or directory -| #include <dmraid/dmraid.h> ---------------------------- -We explictly add volume_key and dmraid to DEPENDS, do not need -configure to test. - -2. Fix config.h not found -Add it to configure.ac - -3. Correct AC_DEFINE -... -autoheader: warning: missing template: LIBMOUNT_NEW_ERR_API -autoheader: Use AC_DEFINE([LIBMOUNT_NEW_ERR_API], [], [Description]) -... - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d41a307..b036e04 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,6 +9,8 @@ AC_DISABLE_STATIC - AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-syntax -Wno-portability]) - AC_CONFIG_MACRO_DIR([m4]) - -+AC_CONFIG_HEADERS([config.h]) -+ - AM_PATH_PYTHON - - AM_PROG_AR -@@ -154,7 +156,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19]) - AS_IF([test "x$with_crypto" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([CRYPTSETUP], [libcryptsetup >= 1.6.7]) - LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0]) -- LIBBLOCKDEV_CHECK_HEADER([volume_key/libvolume_key.h], [$GLIB_CFLAGS $NSS_CFLAGS], [libvolume_key.h not available]) - ], - []) - -@@ -162,10 +163,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" ! - [LIBBLOCKDEV_PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.93])], - []) - --AS_IF([test "x$with_dm" != "xno"], -- [LIBBLOCKDEV_CHECK_HEADER([dmraid/dmraid.h], [], [dmraid.h not available])], -- []) -- - AS_IF([test "x$with_part" != "xno" -o "x$with_fs" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([PARTED], [libparted >= 3.1])] - []) -@@ -174,7 +171,8 @@ AS_IF([test "x$with_fs" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([MOUNT], [mount >= 2.23.0]) - # new versions of libmount has some new functions we can use - AS_IF([$PKG_CONFIG --atleast-version=2.30.0 mount], -- [AC_DEFINE([LIBMOUNT_NEW_ERR_API])], []) -+ [AC_DEFINE([LIBMOUNT_NEW_ERR_API], [1], [new versions of libmount has some new functions we can use])], -+ []) - - LIBBLOCKDEV_PKG_CHECK_MODULES([BLKID], [blkid >= 2.23.0]) - # older versions of libblkid don't support BLKID_SUBLKS_BADCSUM so let's just --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch deleted file mode 100644 index 0719759cd..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40dae7ea6450cb30f066da8443eabf063b5b0ad7 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 8 May 2017 02:05:40 -0400 -Subject: [PATCH 2/3] remove python2 support - -Only python3 is required. - -Upstream-Status: Inappropriate [wr-installer specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/python/gi/overrides/Makefile.am | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/python/gi/overrides/Makefile.am b/src/python/gi/overrides/Makefile.am -index a2927ac..6385502 100644 ---- a/src/python/gi/overrides/Makefile.am -+++ b/src/python/gi/overrides/Makefile.am -@@ -1,8 +1,3 @@ --pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") -- --overridesdir = $(pylibdir)/gi/overrides --dist_overrides_DATA = BlockDev.py -- - if WITH_PYTHON3 - py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") - py3overridesdir = $(py3libdir)/gi/overrides --- -1.8.3.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch deleted file mode 100644 index ac5b5e2be..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch +++ /dev/null @@ -1,492 +0,0 @@ -From bda7c937ba544182a5cae2a9cf0c173e0ba268c9 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 27 Jul 2017 09:47:23 +0800 -Subject: [PATCH 3/3] remove dmraid while compiling with --with-dm - -Fix the following failure: - -... -Perhaps you should add the directory containing `dmraid.pc' -to the PKG_CONFIG_PATH environment variable -No package 'dmraid' found -... - -... -../../../git/src/plugins/dm.c:24:10: fatal error: dmraid/dmraid.h: No -such file or directory - #include <dmraid/dmraid.h> - ^~~~~~~~~~~~~~~~~ -... - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/lib/plugin_apis/dm.api | 50 ------ - src/plugins/Makefile.am | 2 +- - src/plugins/dm.c | 330 ------------------------------------ - src/plugins/dm.h | 5 - - src/python/gi/overrides/BlockDev.py | 6 - - 5 files changed, 1 insertion(+), 392 deletions(-) - -diff --git a/src/lib/plugin_apis/dm.api b/src/lib/plugin_apis/dm.api -index 04fd8d8..5d30b6a 100644 ---- a/src/lib/plugin_apis/dm.api -+++ b/src/lib/plugin_apis/dm.api -@@ -111,53 +111,3 @@ gchar* bd_dm_get_subsystem_from_name (const gchar *device_name, GError **error); - * Tech category: %BD_DM_TECH_MAP-%BD_DM_TECH_MODE_QUERY - */ - gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean active_only, GError **error); -- --/** -- * bd_dm_get_member_raid_sets: -- * @name: (allow-none): name of the member -- * @uuid: (allow-none): uuid of the member -- * @major: major number of the device or -1 if not specified -- * @minor: minor number of the device or -1 if not specified -- * @error: (out): variable to store error (if any) -- * -- * Returns: (transfer full) (array zero-terminated=1): list of names of the RAID sets related to -- * the member or %NULL in case of error -- * -- * One of @name, @uuid or @major:@minor has to be given. -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_MODE_QUERY -- */ --gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); -- --/** -- * bd_dm_activate_raid_set: -- * @name: name of the DM RAID set to activate -- * @error: (out): variable to store error (if any) -- * -- * Returns: whether the RAID set @name was successfully activate or not -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_CREATE_ACTIVATE -- */ --gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); -- --/** -- * bd_dm_deactivate_raid_set: -- * @name: name of the DM RAID set to deactivate -- * @error: (out): variable to store error (if any) -- * -- * Returns: whether the RAID set @name was successfully deactivate or not -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_REMOVE_DEACTIVATE -- */ --gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); -- --/** -- * bd_dm_get_raid_set_type: -- * @name: name of the DM RAID set to get the type of -- * @error: (out): variable to store error (if any) -- * -- * Returns: string representation of the @name RAID set's type -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_QUERY -- */ --gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error); -diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am -index b69c8f7..7575f4a 100644 ---- a/src/plugins/Makefile.am -+++ b/src/plugins/Makefile.am -@@ -75,7 +75,7 @@ endif - - if WITH_DM - libbd_dm_la_CFLAGS = $(GLIB_CFLAGS) $(DEVMAPPER_CFLAGS) $(UDEV_CFLAGS) -Wall -Wextra -Werror --libbd_dm_la_LIBADD = $(GLIB_LIBS) $(DEVMAPPER_LIBS) $(UDEV_LIBS) -ldmraid ${builddir}/../utils/libbd_utils.la -+libbd_dm_la_LIBADD = $(GLIB_LIBS) $(DEVMAPPER_LIBS) $(UDEV_LIBS) ${builddir}/../utils/libbd_utils.la - libbd_dm_la_LDFLAGS = -L${srcdir}/../utils/ -version-info 2:0:0 -Wl,--no-undefined - # Dear author of libdmdraid, VERSION really is not a good name for an enum member! - libbd_dm_la_CPPFLAGS = -I${builddir}/../../include/ -UVERSION -diff --git a/src/plugins/dm.c b/src/plugins/dm.c -index 0e5466c..31ebe96 100644 ---- a/src/plugins/dm.c -+++ b/src/plugins/dm.c -@@ -21,17 +21,11 @@ - #include <unistd.h> - #include <blockdev/utils.h> - #include <libdevmapper.h> --#include <dmraid/dmraid.h> - #include <libudev.h> - - #include "dm.h" - #include "check_deps.h" - --/* macros taken from the pyblock/dmraid.h file plus one more*/ --#define for_each_raidset(_c, _n) list_for_each_entry(_n, LC_RS(_c), list) --#define for_each_subset(_rs, _n) list_for_each_entry(_n, &(_rs)->sets, list) --#define for_each_device(_rs, _d) list_for_each_entry(_d, &(_rs)->devs, devs) -- - /** - * SECTION: dm - * @short_description: plugin for basic operations with device mapper -@@ -380,327 +374,3 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a - - return ret; - } -- --/** -- * init_dmraid_stack: (skip) -- * -- * Initializes the dmraid stack by creating the library context, discovering -- * devices, raid sets, etc. -- */ --static struct lib_context* init_dmraid_stack (GError **error) { -- gint rc = 0; -- gchar *argv[] = {"blockdev.dmraid", NULL}; -- struct lib_context *lc; -- -- /* the code for this function was cherry-picked from the pyblock code */ -- /* XXX: do this all just once, store global lc and provide a reinit -- * function? */ -- -- /* initialize dmraid library context */ -- lc = libdmraid_init (1, (gchar **)argv); -- -- rc = discover_devices (lc, NULL); -- if (!rc) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, -- "Failed to discover devices"); -- libdmraid_exit (lc); -- return NULL; -- } -- discover_raid_devices (lc, NULL); -- -- if (!count_devices (lc, RAID)) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_NO_DEVS, -- "No RAIDs discovered"); -- libdmraid_exit (lc); -- return NULL; -- } -- -- argv[0] = NULL; -- if (!group_set (lc, argv)) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, -- "Failed to group_set"); -- libdmraid_exit (lc); -- return NULL; -- } -- -- return lc; --} -- --/** -- * raid_dev_matches_spec: (skip) -- * -- * Returns: whether the device specified by @sysname matches the spec given by @name, -- * @uuid, @major and @minor -- */ --static gboolean raid_dev_matches_spec (struct raid_dev *raid_dev, const gchar *name, const gchar *uuid, gint major, gint minor) { -- gchar const *dev_name = NULL; -- gchar const *dev_uuid; -- gchar const *major_str; -- gchar const *minor_str; -- struct udev *context; -- struct udev_device *device; -- gboolean ret = TRUE; -- -- /* find the second '/' to get name (the rest of the string) */ -- dev_name = strchr (raid_dev->di->path, '/'); -- if (dev_name && strlen (dev_name) > 1) { -- dev_name++; -- dev_name = strchr (dev_name, '/'); -- } -- if (dev_name && strlen (dev_name) > 1) { -- dev_name++; -- } -- else -- dev_name = NULL; -- -- /* if we don't have the name, we cannot check any match */ -- g_return_val_if_fail (dev_name, FALSE); -- -- /* g_return_val_if_fail above checks value of dev_name and returns FALSE if -- * it is NULL so we don't need to check it here */ -- /* coverity[var_deref_model] */ -- if (name && strcmp (dev_name, name) != 0) { -- return FALSE; -- } -- -- context = udev_new (); -- device = udev_device_new_from_subsystem_sysname (context, "block", dev_name); -- dev_uuid = udev_device_get_property_value (device, "UUID"); -- major_str = udev_device_get_property_value (device, "MAJOR"); -- minor_str = udev_device_get_property_value (device, "MINOR"); -- -- if (uuid && (g_strcmp0 (uuid, "") != 0) && (g_strcmp0 (uuid, dev_uuid) != 0)) -- ret = FALSE; -- -- if (major >= 0 && (atoi (major_str) != major)) -- ret = FALSE; -- -- if (minor >= 0 && (atoi (minor_str) != minor)) -- ret = FALSE; -- -- udev_device_unref (device); -- udev_unref (context); -- -- return ret; --} -- --/** -- * find_raid_sets_for_dev: (skip) -- */ --static void find_raid_sets_for_dev (const gchar *name, const gchar *uuid, gint major, gint minor, struct lib_context *lc, struct raid_set *rs, GPtrArray *ret_sets) { -- struct raid_set *subset = NULL; -- struct raid_dev *dev = NULL; -- -- if (T_GROUP(rs) || !list_empty(&(rs->sets))) { -- for_each_subset (rs, subset) -- find_raid_sets_for_dev (name, uuid, major, minor, lc, subset, ret_sets); -- } else { -- for_each_device (rs, dev) { -- if (raid_dev_matches_spec (dev, name, uuid, major, minor)) -- g_ptr_array_add (ret_sets, g_strdup (rs->name)); -- } -- } --} -- --/** -- * bd_dm_get_member_raid_sets: -- * @name: (allow-none): name of the member -- * @uuid: (allow-none): uuid of the member -- * @major: major number of the device or -1 if not specified -- * @minor: minor number of the device or -1 if not specified -- * @error: (out): variable to store error (if any) -- * -- * Returns: (transfer full) (array zero-terminated=1): list of names of the RAID sets related to -- * the member or %NULL in case of error -- * -- * One of @name, @uuid or @major:@minor has to be given. -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_MODE_QUERY -- */ --gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error) { -- guint64 i = 0; -- struct lib_context *lc = NULL; -- struct raid_set *rs = NULL; -- GPtrArray *ret_sets = g_ptr_array_new (); -- gchar **ret = NULL; -- -- lc = init_dmraid_stack (error); -- if (!lc) -- /* error is already populated */ -- return NULL; -- -- for_each_raidset (lc, rs) { -- find_raid_sets_for_dev (name, uuid, major, minor, lc, rs, ret_sets); -- } -- -- /* now create the return value -- NULL-terminated array of strings */ -- ret = g_new0 (gchar*, ret_sets->len + 1); -- for (i=0; i < ret_sets->len; i++) -- ret[i] = (gchar*) g_ptr_array_index (ret_sets, i); -- ret[i] = NULL; -- -- g_ptr_array_free (ret_sets, FALSE); -- -- libdmraid_exit (lc); -- return ret; --} -- --/** -- * find_in_raid_sets: (skip) -- * -- * Runs @eval_fn with @data on each set (traversing recursively) and returns the -- * first RAID set that @eval_fn returns. Thus the @eval_fn should return %NULL -- * on all RAID sets that don't fulfill the search criteria. -- */ --static struct raid_set* find_in_raid_sets (struct raid_set *rs, RSEvalFunc eval_fn, gpointer data) { -- struct raid_set *subset = NULL; -- struct raid_set *ret = NULL; -- -- ret = eval_fn (rs, data); -- if (ret) -- return ret; -- -- if (T_GROUP(rs) || !list_empty(&(rs->sets))) { -- for_each_subset (rs, subset) { -- ret = find_in_raid_sets (subset, eval_fn, data); -- if (ret) -- return ret; -- } -- } -- -- return ret; --} -- --static struct raid_set* rs_matches_name (struct raid_set *rs, gpointer *name_data) { -- gchar *name = (gchar*) name_data; -- -- if (g_strcmp0 (rs->name, name) == 0) -- return rs; -- else -- return NULL; --} -- --static gboolean change_set_by_name (const gchar *name, enum activate_type action, GError **error) { -- gint rc = 0; -- struct lib_context *lc = NULL; -- struct raid_set *iter_rs = NULL; -- struct raid_set *match_rs = NULL; -- -- lc = init_dmraid_stack (error); -- if (!lc) -- /* error is already populated */ -- return FALSE; -- -- for_each_raidset (lc, iter_rs) { -- match_rs = find_in_raid_sets (iter_rs, (RSEvalFunc)rs_matches_name, (gchar *)name); -- if (match_rs) -- break; -- } -- -- if (!match_rs) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_NO_EXIST, -- "RAID set %s doesn't exist", name); -- libdmraid_exit (lc); -- return FALSE; -- } -- -- rc = change_set (lc, action, match_rs); -- if (!rc) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, -- "Failed to activate the RAID set '%s'", name); -- libdmraid_exit (lc); -- return FALSE; -- } -- -- libdmraid_exit (lc); -- return TRUE; --} -- --/** -- * bd_dm_activate_raid_set: -- * @name: name of the DM RAID set to activate -- * @error: (out): variable to store error (if any) -- * -- * Returns: whether the RAID set @name was successfully activate or not -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_CREATE_ACTIVATE -- */ --gboolean bd_dm_activate_raid_set (const gchar *name, GError **error) { -- guint64 progress_id = 0; -- gchar *msg = NULL; -- gboolean ret = FALSE; -- -- msg = g_strdup_printf ("Activating DM RAID set '%s'", name); -- progress_id = bd_utils_report_started (msg); -- g_free (msg); -- ret = change_set_by_name (name, A_ACTIVATE, error); -- bd_utils_report_finished (progress_id, "Completed"); -- return ret; --} -- --/** -- * bd_dm_deactivate_raid_set: -- * @name: name of the DM RAID set to deactivate -- * @error: (out): variable to store error (if any) -- * -- * Returns: whether the RAID set @name was successfully deactivate or not -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_REMOVE_DEACTIVATE -- */ --gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error) { -- guint64 progress_id = 0; -- gchar *msg = NULL; -- gboolean ret = FALSE; -- -- msg = g_strdup_printf ("Deactivating DM RAID set '%s'", name); -- progress_id = bd_utils_report_started (msg); -- g_free (msg); -- ret = change_set_by_name (name, A_DEACTIVATE, error); -- bd_utils_report_finished (progress_id, "Completed"); -- return ret; --} -- --/** -- * bd_dm_get_raid_set_type: -- * @name: name of the DM RAID set to get the type of -- * @error: (out): variable to store error (if any) -- * -- * Returns: string representation of the @name RAID set's type -- * -- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_QUERY -- */ --gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error) { -- struct lib_context *lc = NULL; -- struct raid_set *iter_rs = NULL; -- struct raid_set *match_rs = NULL; -- const gchar *type = NULL; -- -- lc = init_dmraid_stack (error); -- if (!lc) -- /* error is already populated */ -- return NULL; -- -- for_each_raidset (lc, iter_rs) { -- match_rs = find_in_raid_sets (iter_rs, (RSEvalFunc)rs_matches_name, (gchar *)name); -- if (match_rs) -- break; -- } -- -- if (!match_rs) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_NO_EXIST, -- "RAID set %s doesn't exist", name); -- libdmraid_exit (lc); -- return NULL; -- } -- -- type = get_set_type (lc, match_rs); -- if (!type) { -- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, -- "Failed to get RAID set's type"); -- libdmraid_exit (lc); -- return NULL; -- } -- -- libdmraid_exit (lc); -- return g_strdup (type); --} -diff --git a/src/plugins/dm.h b/src/plugins/dm.h -index 0dce6ac..1ee3788 100644 ---- a/src/plugins/dm.h -+++ b/src/plugins/dm.h -@@ -1,5 +1,4 @@ - #include <glib.h> --#include <dmraid/dmraid.h> - - #ifndef BD_DM - #define BD_DM -@@ -48,9 +47,5 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a - gchar* bd_dm_name_from_node (const gchar *dm_node, GError **error); - gchar* bd_dm_node_from_name (const gchar *map_name, GError **error); - gchar* bd_dm_get_subsystem_from_name (const gchar *device_name, GError **error); --gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); --gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); --gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); --gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error); - - #endif /* BD_DM */ -diff --git a/src/python/gi/overrides/BlockDev.py b/src/python/gi/overrides/BlockDev.py -index fb3ffb4..eed0a38 100644 ---- a/src/python/gi/overrides/BlockDev.py -+++ b/src/python/gi/overrides/BlockDev.py -@@ -233,12 +233,6 @@ def dm_create_linear(map_name, device, length, uuid=None): - return _dm_create_linear(map_name, device, length, uuid) - __all__.append("dm_create_linear") - --_dm_get_member_raid_sets = BlockDev.dm_get_member_raid_sets --@override(BlockDev.dm_get_member_raid_sets) --def dm_get_member_raid_sets(name=None, uuid=None, major=-1, minor=-1): -- return _dm_get_member_raid_sets(name, uuid, major, minor) --__all__.append("dm_get_member_raid_sets") -- - - _loop_setup = BlockDev.loop_setup - @override(BlockDev.loop_setup) --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch deleted file mode 100644 index 0b5b80912..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 59fbd57acd1df25b1972a131dc6a77a4fe147729 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 27 Jul 2017 10:45:02 +0800 -Subject: [PATCH] fix compile failure against musl C library - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/plugins/crypto.c | 2 +- - src/plugins/part.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index b961471..2d3d251 100644 ---- a/src/plugins/crypto.c -+++ b/src/plugins/crypto.c -@@ -22,7 +22,7 @@ - #include <libcryptsetup.h> - #include <nss.h> - #include <volume_key/libvolume_key.h> --#include <sys/fcntl.h> -+#include <fcntl.h> - #include <sys/ioctl.h> - #include <linux/random.h> - #include <locale.h> -diff --git a/src/plugins/part.c b/src/plugins/part.c -index 6b2a690..ab490d9 100644 ---- a/src/plugins/part.c -+++ b/src/plugins/part.c -@@ -25,6 +25,7 @@ - #include <inttypes.h> - #include <unistd.h> - #include <sys/file.h> -+#include <fcntl.h> - #include <sys/ioctl.h> - #include <linux/fs.h> - #include <blockdev/utils.h> -@@ -1354,7 +1355,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, - real_flags |= 0x4000000000000000; /* 1 << 62 */ - if (flags & BD_PART_FLAG_GPT_NO_AUTOMOUNT) - real_flags |= 0x8000000000000000; /* 1 << 63 */ -- mask_str = g_strdup_printf ("%.16"__PRI64_PREFIX"x", real_flags); -+ mask_str = g_strdup_printf ("%.16"__PRI64"x", real_flags); - - args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); - g_free (mask_str); --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch deleted file mode 100644 index b214f0b05..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 9b4a7a4d0653b627d747e00d6b3ada2990caa1d3 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 9 Aug 2017 13:57:57 +0800 -Subject: [PATCH] fix a clang compiling issue - -[snip] -../../../git/src/plugins/fs.c:2617:26: error: missing field 'start' -initializer [-Werror,-Wmissing-field-initializers] - PedGeometry geom = {0}; - ^ -../../../git/src/plugins/fs.c:2618:30: error: missing field 'start' -initializer [-Werror,-Wmissing-field-initializers] - PedGeometry new_geom = {0}; -[snip] - -Fix typo s/enum libvk_packet_format format/enum libvk_secret secret_type/ - -Upstream-Status: Submitted [https://github.com/storaged-project/libblockdev/pull/266] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/plugins/crypto.c | 6 +++--- - src/plugins/fs/vfat.c | 4 ++-- - src/plugins/part.c | 4 ++-- - src/utils/exec.c | 2 +- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index 563093e..b961471 100644 ---- a/src/plugins/crypto.c -+++ b/src/plugins/crypto.c -@@ -970,7 +970,7 @@ gboolean bd_crypto_tc_open (const gchar *device, const gchar *name, const guint8 - gint ret = 0; - guint64 progress_id = 0; - gchar *msg = NULL; -- struct crypt_params_tcrypt params = {0}; -+ struct crypt_params_tcrypt params = {NULL,0,NULL,0,NULL,NULL,NULL,0,0}; - - msg = g_strdup_printf ("Started opening '%s' TrueCrypt/VeraCrypt device", device); - progress_id = bd_utils_report_started (msg); -@@ -1090,7 +1090,7 @@ static gchar *replace_char (gchar *str, gchar orig, gchar new) { - return str; - } - --static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libvk_ui *ui, enum libvk_packet_format format, const gchar *out_path, -+static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libvk_ui *ui, enum libvk_secret secret_type, const gchar *out_path, - CERTCertificate *cert, GError **error) { - gpointer packet_data = NULL; - gsize packet_data_size = 0; -@@ -1099,7 +1099,7 @@ static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libv - gsize bytes_written = 0; - GError *tmp_error = NULL; - -- packet_data = libvk_volume_create_packet_asymmetric_with_format (volume, &packet_data_size, format, cert, -+ packet_data = libvk_volume_create_packet_asymmetric_with_format (volume, &packet_data_size, secret_type, cert, - ui, LIBVK_PACKET_FORMAT_ASYMMETRIC_WRAP_SECRET_ONLY, error); - - if (!packet_data) { -diff --git a/src/plugins/fs/vfat.c b/src/plugins/fs/vfat.c -index 3ed7d4a..5ff7795 100644 ---- a/src/plugins/fs/vfat.c -+++ b/src/plugins/fs/vfat.c -@@ -376,8 +376,8 @@ BDFSVfatInfo* bd_fs_vfat_get_info (const gchar *device, GError **error) { - */ - gboolean bd_fs_vfat_resize (const gchar *device, guint64 new_size, GError **error) { - PedDevice *ped_dev = NULL; -- PedGeometry geom = {0}; -- PedGeometry new_geom = {0}; -+ PedGeometry geom = {NULL, 0, 0, 0}; -+ PedGeometry new_geom = {NULL, 0, 0, 0}; - PedFileSystem *fs = NULL; - PedSector start = 0; - PedSector length = 0; -diff --git a/src/plugins/part.c b/src/plugins/part.c -index fed8300..6b2a690 100644 ---- a/src/plugins/part.c -+++ b/src/plugins/part.c -@@ -926,7 +926,7 @@ static PedPartition* add_part_to_disk (PedDevice *dev, PedDisk *disk, BDPartType - return NULL; - } - -- part = ped_partition_new (disk, type, NULL, geom->start, geom->end); -+ part = ped_partition_new (disk, (PedPartitionType)type, NULL, geom->start, geom->end); - if (!part) { - set_parted_error (error, BD_PART_ERROR_FAIL); - g_prefix_error (error, "Failed to create new partition on device '%s'", dev->path); -@@ -1564,7 +1564,7 @@ gboolean bd_part_set_part_flags (const gchar *disk, const gchar *part, guint64 f - PedPartition *ped_part = NULL; - const gchar *part_num_str = NULL; - gint part_num = 0; -- guint64 i = 0; -+ int i = 0; - gint status = 0; - gboolean ret = FALSE; - guint64 progress_id = 0; -diff --git a/src/utils/exec.c b/src/utils/exec.c -index 11c1489..dcf87e5 100644 ---- a/src/utils/exec.c -+++ b/src/utils/exec.c -@@ -354,7 +354,7 @@ gboolean bd_utils_exec_and_report_progress (const gchar **argv, const BDExtraArg - GIOStatus io_status = G_IO_STATUS_NORMAL; - guint i = 0; - guint8 completion = 0; -- GPollFD fds[2] = {{0}, {0}}; -+ GPollFD fds[2] = {{0,0,0}, {0,0,0}}; - gboolean out_done = FALSE; - gboolean err_done = FALSE; - GString *stdout_data = g_string_new (NULL); --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb index 0c954aa39..35f0cc060 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb @@ -10,42 +10,34 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools python3native gobject-introspection -DEPENDS += " \ - cryptsetup \ - nss \ - volume-key \ - libbytesize \ - btrfs-tools \ -" - -SRCREV = "e2e0899efe8dd3f111ff955fb6c1dc10b0bd2075" +SRCREV = "0debeb45562ac3d8f6f43f6f942b238abab55be9" SRC_URI = " \ git://github.com/rhinstaller/libblockdev;branch=master \ - file://0001-fix-configure-and-compile-failures.patch \ - file://0002-remove-python2-support.patch \ - file://0003-remove-dmraid-while-compiling-with-with-dm.patch \ - file://0005-fix-a-clang-compiling-issue.patch \ -" -SRC_URI_append_libc-musl = " \ - file://0004-fix-compile-failure-against-musl-C-library.patch \ " S = "${WORKDIR}/git" -RDEPENDS_${PN} += " \ - lvm2 \ -" - FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs" +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools" -PACKAGECONFIG[dm] = "--with-dm, --without-dm" +PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" +PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" +PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" +PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" +PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod" PACKAGECONFIG[parted] = "--with-part, --without-part, parted" PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" +PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm" +PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo" +PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" +PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" +PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" +PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" +PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch b/meta-openembedded/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch new file mode 100644 index 000000000..ec1f5d0d5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch @@ -0,0 +1,24 @@ +From 16e8c072709572ccefa6c7f835136db01f031323 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@siemens.com> +Date: Fri, 28 Sep 2018 16:56:14 +0200 +Subject: [PATCH] Explicitly use python3 in pyCecClient + +Upstream-Status: Submitted [https://github.com/Pulse-Eight/libcec/pull/433] + +--- + src/pyCecClient/pyCecClient.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pyCecClient/pyCecClient.py b/src/pyCecClient/pyCecClient.py +index 6d47857..d0504ac 100755 +--- a/src/pyCecClient/pyCecClient.py ++++ b/src/pyCecClient/pyCecClient.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/python3 + ## demo of the python-libcec API + + # This file is part of the libCEC(R) library. +-- +2.11.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch b/meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch deleted file mode 100644 index b6be78dd4..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 330fa6777d51d41eefacff8e98e4250d210fde35 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Javi=20Mart=C3=ADnez?= <javi@flamingalah.net> -Date: Tue, 13 Dec 2016 22:31:13 +0100 -Subject: [PATCH] Improve/fix installation of Python bindings - -Upstream-Status: Backport - -dist-packages is a Debian-specific directory for distribution packages (and used in derivatives such as Ubuntu). Therefore changed to site-packages. ---- - src/libcec/cmake/CheckPlatformSupport.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index fcd0ef7..7661107 100644 ---- a/src/libcec/cmake/CheckPlatformSupport.cmake -+++ b/src/libcec/cmake/CheckPlatformSupport.cmake -@@ -195,9 +195,9 @@ else() - RENAME __init__.py) - else() - install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} -- DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec) -+ DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec) - install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py -- DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec -+ DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec - RENAME __init__.py) - endif() - endif() diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb index cb65caad8..4ad49971a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb @@ -4,24 +4,30 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=e61fd86f9c947b430126181da2c6c715" -DEPENDS = "p8platform udev lockdev ncurses swig-native python3" +DEPENDS = "p8platform udev ncurses swig-native python3" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -PV = "4.0.1+gitr${SRCPV}" +PV = "4.0.2+gitr${SRCPV}" -SRCREV = "2fc92b5f02dca702da92ccc5ed7b805b240ef5df" +SRCREV = "0a97062dd4b196ceeb003ec41841c7a7edc36dd1" SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ - file://python-install-location.patch" + file://0001-Explicitly-use-python3-in-pyCecClient.patch" S = "${WORKDIR}/git" inherit cmake pkgconfig +# Put client tools into a separate package +PACKAGE_BEFORE_PN += "${PN}-tools" +FILES_${PN}-tools = "${bindir}" +RDEPENDS_${PN}-tools = "python3-${BPN}" + # Create the wrapper for python3 PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${libdir}/python3*" +FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*" +RDEPENDS_${PN} = "python3-core" # cec-client and xbmc need the .so present to work :( FILES_${PN} += "${libdir}/*.so" diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb deleted file mode 100644 index fb6e50e51..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "C/C++ Configuration File Library" -DESCRIPTION = "Library for manipulating structured configuration files" -HOMEPAGE = "http://www.hyperrealm.com/libconfig/" -SECTION = "libs" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" - -SRC_URI = "http://www.hyperrealm.com/${BPN}/${BP}.tar.gz" - -inherit autotools-brokensep pkgconfig - -SRC_URI[md5sum] = "a939c4990d74e6fc1ee62be05716f633" -SRC_URI[sha256sum] = "e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6" diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb new file mode 100644 index 000000000..eb0a2c3ec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "C/C++ Configuration File Library" +DESCRIPTION = "Library for manipulating structured configuration files" +HOMEPAGE = "https://hyperrealm.github.io/libconfig/" +BUGTRACKER = "https://github.com/hyperrealm/libconfig/issues" +SECTION = "libs" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" + +SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz" + +inherit autotools-brokensep pkgconfig + +SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690" +SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9" + +FILES_${PN}_append = " \ + ${libdir}/cmake \ +" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch deleted file mode 100644 index f8114a063..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 18 Oct 2016 21:31:40 +0000 -Subject: [PATCH] Fix warnings found with clang - -| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type] -| if (!buf) return; -| ^ -| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type] -| if (len <= 0) return; - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libcnary/node.c | 2 +- - src/base64.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libcnary/node.c b/libcnary/node.c -index 1f9f669..d6f3f63 100644 ---- a/libcnary/node.c -+++ b/libcnary/node.c -@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) { - - int node_insert(node_t* parent, unsigned int index, node_t* child) - { -- if (!parent || !child) return; -+ if (!parent || !child) return -1; - child->isLeaf = TRUE; - child->isRoot = FALSE; - child->parent = parent; -diff --git a/src/base64.c b/src/base64.c -index 65c6061..531a06a 100644 ---- a/src/base64.c -+++ b/src/base64.c -@@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da - - unsigned char *base64decode(const char *buf, size_t *size) - { -- if (!buf) return; -+ if (!buf) return 0; - size_t len = strlen(buf); -- if (len <= 0) return; -+ if (len <= 0) return 0; - unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3); - - unsigned char *line; --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch deleted file mode 100644 index f6ef6f4f8..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001 -From: Nikias Bassen -Date: Mon, 09 Jul 2012 21:17:15 +0000 -Subject: Fix building with parallel build makeopts - ---- -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bad840..155994e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil ) - ADD_SUBDIRECTORY( include ) - ADD_SUBDIRECTORY( test ) - -+ADD_DEPENDENCIES( plist libcnary ) -+ - IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) - ADD_SUBDIRECTORY( swig ) - ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) --- -cgit v0.9.0.2 diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb index f78979619..43c1fd5ca 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb @@ -6,15 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ DEPENDS = "libxml2 glib-2.0 swig python" -inherit cmake pkgconfig +inherit autotools pkgconfig pythonnative -SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ - file://fix-parallel-make.patch \ - file://0001-Fix-warnings-found-with-clang.patch \ +SRCREV = "62ec804736435fa34e37e66e228e17e2aacee1d7" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \ " -SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" -SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" +S = "${WORKDIR}/git" do_install_append () { if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb new file mode 100644 index 000000000..36fc5c858 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" + +DEPENDS = "udev libusb1 libplist" + +inherit autotools pkgconfig gitpkgv + +PKGV = "${GITPKGVTAG}" + +SRCREV = "78df9be5fc8222ed53846cb553de9b5d24c85c6c" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${base_libdir}/udev/rules.d/" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch deleted file mode 100644 index a9319ff1e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir = @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -+ install -d $(ROOT)$(includedir) - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) -- if [ "$(MAILGROUP)" != "" ]; then\ -- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ -- else \ -- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ -- fi -+ install -d $(ROOT)$(bindir) -+ install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) -+ install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 - install -m 644 *.1 $(ROOT)$(mandir)/man1 - install -m 644 *.3 $(ROOT)$(mandir)/man3 - - install_nfslib: nfslib -+ install -d $(ROOT)$(nfslockdir) - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch deleted file mode 100644 index eb1d1478b..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~ldflags -+++ liblockfile-1.05/Makefile.in -@@ -34,11 +34,11 @@ - - liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ -- -o liblockfile.so lockfile.o -lc -+ -o liblockfile.so lockfile.o $(LDFLAGS) -lc - - nfslock.so.$(VER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ -- -o nfslock.so.$(NVER) nfslock.o -+ -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - - dotlockfile: dotlockfile.o xlockfile.o - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch deleted file mode 100644 index 27f760c83..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate [no upstream] - -The extend so file is rename from nfslock.so.$(VER) to nfslock.so.$(NVER). That -causes file nfslock.so.0.1 is installed into manual directory. Fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -diff --git a/Makefile.in b/Makefile.in -index a589fb8..46a57e8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -68,7 +68,7 @@ install_common: - install -d $(ROOT)$(bindir) - install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) - install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 -- install -m 644 *.1 $(ROOT)$(mandir)/man1 -+ install -m 644 dotlockfile.1 $(ROOT)$(mandir)/man1 - install -m 644 *.3 $(ROOT)$(mandir)/man3 - - install_nfslib: nfslib diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch deleted file mode 100644 index ffd7a40fa..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status: Inappropriate [no upstream] - -* nfslib should use NVER instead of VER -* install the missing soname library - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Makefile.in | 9 ++++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 836ca9b..a589fb8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -27,7 +27,7 @@ install: @INSTALL_TARGETS@ - - static: liblockfile.a dotlockfile - shared: liblockfile.so dotlockfile --nfslib: nfslock.so.$(VER) -+nfslib: nfslock.so.$(NVER) - - liblockfile.a: lockfile.o - $(AR) rv liblockfile.a lockfile.o -@@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ - -o liblockfile.so lockfile.o $(LDFLAGS) -lc - --nfslock.so.$(VER): nfslock.o -+nfslock.so.$(NVER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ - -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - -@@ -59,6 +59,7 @@ install_shared: shared install_common - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so -+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -@@ -72,7 +73,9 @@ install_common: - - install_nfslib: nfslib - install -d $(ROOT)$(nfslockdir) -- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) -+ install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir) -+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so -+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - clean: --- -1.7.9.5 - diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch new file mode 100644 index 000000000..ea415dd8b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch @@ -0,0 +1,54 @@ +From 67843dabe1177840697839b916fd899218893ec7 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 19 Jul 2018 00:25:23 -0700 +Subject: [PATCH] Makefile.in: add DESTDIR + +Add DESTDIR to fix below error during do_install + +| install -d -m 755 -g root -p /usr/include +| install -d -m 755 -g root -p /usr/lib +| install -d -m 755 -g root -p /usr/bin +| install -m 755 nfslock.so.0.1 /usr/lib +| install -d -m 755 -g root -p /usr/share/man/man1 +| install: cannot create regular file '/usr/lib/nfslock.so.0.1': Permission denied +| Makefile:78: recipe for target 'install_nfslib' failed +| make: *** [install_nfslib] Error 1 +| make: *** Waiting for unfinished jobs.... +| install -d -m 755 -g root -p /usr/share/man/man3 +| install -m 644 lockfile.h maillock.h /usr/include +| install: cannot create regular file '/usr/include/lockfile.h': Permission denied +| install: cannot create regular file '/usr/include/maillock.h': Permission denied +| Makefile:64: recipe for target 'install_common' failed +| make: *** [install_common] Error 1 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 36a6d23..1e4130e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -12,11 +12,11 @@ CC = @CC@ + + prefix = $(DESTDIR)@prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ +-nfslockdir = @nfslockdir@ +-includedir = @includedir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ ++nfslockdir = $(DESTDIR)@nfslockdir@ ++includedir = $(DESTDIR)@includedir@ + datarootdir = @datarootdir@ + MAILGROUP = @MAILGROUP@ + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch new file mode 100644 index 000000000..a6b297b59 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch @@ -0,0 +1,31 @@ +From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 19 Jul 2018 01:00:10 -0700 +Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 + +* install the missing soname library + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index 1e4130e..0f1b506 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,6 +77,8 @@ install_common: + install_nfslib: nfslib + install -d -m 755 -g root -p $(nfslockdir) + install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) ++ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so ++ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 + if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi + + clean: +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch index ea13e11d2..ea13e11d2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/configure.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch new file mode 100644 index 000000000..da2503339 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch @@ -0,0 +1,33 @@ +From 363eb1aaeca914c7d36a2cdaf1417e4f87af4c22 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 19 Jul 2018 01:12:47 -0700 +Subject: [PATCH] Makefile.in: define dotlockfile.1 installed to man + +Explicitly define dotlockfile.1 installed to man +dir to avoid nfslock.so.0.1 is installed into man +directory + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 0f1b506..6e53179 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -71,7 +71,7 @@ install_common: + else \ + install -g root -m 755 dotlockfile $(bindir); \ + fi +- install -m 644 *.1 $(mandir)/man1 ++ install -m 644 dotlockfile.1 $(mandir)/man1 + install -m 644 *.3 $(mandir)/man3 + + install_nfslib: nfslib +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb deleted file mode 100644 index 0c41afa3c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "File locking library" -HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html" -SECTION = "libs" -LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" - -SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09-6.debian.tar.bz2;name=1.09-6 \ - file://install.patch \ - file://configure.patch \ - file://ldflags.patch \ - file://liblockfile-fix-nfslib-and-soname.patch \ - file://liblockfile-fix-install-so-to-man-dir.patch \ -" - -SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" -SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" - -SRC_URI[1.09-6.md5sum] = "a2811807e63a526c07b0f60626e329a2" -SRC_URI[1.09-6.sha256sum] = "d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f" - -inherit autotools-brokensep - -# set default mailgroup to mail -# --with-libnfslock specify where to install nfslock.so.NVER -EXTRA_OECONF = "--enable-shared \ - --with-mailgroup=mail \ - --with-libnfslock=${libdir} \ -" - -# Makefile using ROOT not DESTDIR -EXTRA_OEMAKE += "ROOT=${D}" - -FILES_${PN} += "${libdir}/nfslock.so.*" -FILES_${PN}-dev += "${libdir}/nfslock.so" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb new file mode 100644 index 000000000..de2c1e36d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb @@ -0,0 +1,37 @@ +SUMMARY = "File locking library" +HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html" +SECTION = "libs" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f4ba6ad04fcb05cc30a4cfa5062c55a3" + +SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ + file://configure.patch \ + file://0001-Makefile.in-add-DESTDIR.patch \ + file://0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch \ + file://liblockfile-fix-install-so-to-man-dir.patch \ +" + +SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb" +SRC_URI[sha256sum] = "ab40d4a3e8cbc204f7e87fea637a4e4ddf9a1149aaa0a723a4267febd0b1d060" + +SRC_URI[1.14-1.md5sum] = "f9a44928c3477d218c56252712ebc479" +SRC_URI[1.14-1.sha256sum] = "73f9be769e602149391588c28f0f4f5cda131e30fb94c0777dbb23d811ac21ff" + +S = "${WORKDIR}/${BPN}" + +inherit autotools-brokensep + +# set default mailgroup to mail +# --with-libnfslock specify where to install nfslock.so.NVER +EXTRA_OECONF = "--enable-shared \ + --with-mailgroup=mail \ + --with-libnfslock=${libdir} \ +" + +# Makefile using DESTDIR as the change in e35f9eabcbba224ecc70b145d5d2a2d81064c195 +# at https://github.com/miquels/liblockfile.git +EXTRA_OEMAKE += "DESTDIR=${D}" + +FILES_${PN} += "${libdir}/nfslock.so.*" +FILES_${PN}-dev += "${libdir}/nfslock.so" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb index 64a258b01..bb5984519 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb @@ -12,8 +12,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=63fe03535d83726f5655072502bef1bc" SRC_URI = "http://download.rsyslog.com/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "44b8ce2daa1bfb84c9feaf42f9925fd7" -SRC_URI[sha256sum] = "310dc1691279b7a669d383581fe4b0babdc7bf75c9b54a24e51e60428624890b" +SRC_URI[md5sum] = "f215c7e7ac6cfd1f5dabdba08c522b29" +SRC_URI[sha256sum] = "338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb index 2c96063f1..9fb25cdc7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb @@ -12,20 +12,19 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME} SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" +UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases" + S = "${WORKDIR}/${SRCNAME}-${PV}" -DEPENDS = "cracklib virtual/gettext python3" -RDEPENDS_python3-libpwquality = "${PN}" +DEPENDS = "cracklib virtual/gettext" -inherit autotools python3native gettext +inherit autotools distutils3-base gettext B = "${S}" export PYTHON_DIR export BUILD_SYS export HOST_SYS -export STAGING_LIBDIR -export STAGING_INCDIR EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ @@ -36,10 +35,7 @@ EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" -PACKAGES += "python3-libpwquality python3-libpwquality-dbg" FILES_${PN} += "${libdir}/security/pam_pwquality.so" FILES_${PN}-dbg += "${libdir}/security/.debug" FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la" -FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_python3-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug" diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch index 9b328a10a..97fb097fe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch @@ -1,7 +1,7 @@ -From db32ba60ca75d288d3ac08b54256cb74d9e1581a Mon Sep 17 00:00:00 2001 +From 1f7d106c7d982fe055addc8d883b161202233175 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 26 Apr 2017 03:47:58 -0400 -Subject: [PATCH 1/3] Makefile.am: remove doc and apidoc +Subject: [PATCH 1/4] Makefile.am: remove doc and apidoc There was a failure at do_install time, so remove doc to workaround. @@ -13,7 +13,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index c6ab640..fb09fc1 100644 +index 9ad827c..34364a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ @@ -24,5 +24,5 @@ index c6ab640..fb09fc1 100644 EXTRA_DIST = \ libreport.pc.in \ -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch index 146510e3c..7f5895ea1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch @@ -1,7 +1,7 @@ -From d8c49e6a15ab28f4ca94e03b2a53ed8df63346cd Mon Sep 17 00:00:00 2001 +From 9beadcdfca9198548f06bf18f3f26e1d11542e53 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 26 Apr 2017 03:49:45 -0400 -Subject: [PATCH 2/3] configure.ac: remove prog test of xmlto and asciidoc +Date: Tue, 31 Jul 2018 16:53:04 +0800 +Subject: [PATCH 2/4] configure.ac: remove prog test of xmlto and asciidoc The prog of xmlto and asciidoc were used to generate documents, and since the doc module has already been disabled, so we should @@ -15,12 +15,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 18 deletions(-) diff --git a/configure.ac b/configure.ac -index ccefe50..ed48c88 100644 +index feafc28..aceccf4 100644 --- a/configure.ac +++ b/configure.ac -@@ -68,24 +68,6 @@ if test -z "$PYTHON3"; then - exit 1 - fi +@@ -56,24 +56,6 @@ IT_PROG_INTLTOOL([0.35.0]) + + dnl ****** END **************************************** -AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) -[if test "$ASCIIDOC" = "no"] @@ -44,5 +44,5 @@ index ccefe50..ed48c88 100644 AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), LIBREPORT_PARSE_WITH([bugzilla])) -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch index 3ad777464..2ff1731be 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch @@ -1,7 +1,7 @@ -From 0e96d9f23b2b166e7444e7c8e0a6d4b83c2eccd7 Mon Sep 17 00:00:00 2001 +From 41bce1de2fd2a0f79c266f245ae3e3720ccaf46a Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 26 Apr 2017 03:51:03 -0400 -Subject: [PATCH 3/3] without build plugins +Subject: [PATCH 3/4] without build plugins Upstream-Status: Inappropriate workaround @@ -22,5 +22,5 @@ index c15928c..bac02b1 100644 -SUBDIRS = include lib plugins report-python cli client-python workflows $(sub_dirs) +SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs) -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch index 9839e5a9f..4ba69c793 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch @@ -1,7 +1,7 @@ -From cf3b646facc19078ed29f828e36dd2e552283518 Mon Sep 17 00:00:00 2001 +From c1c301502a8f69b9889197744b301a136082f09d Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 27 Apr 2017 02:15:02 -0400 -Subject: [PATCH] configure.ac: remove prog test of augparse +Subject: [PATCH 4/4] configure.ac: remove prog test of augparse The build time does not require it. @@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac -index c06af2d..b90f49e 100644 +index aceccf4..83c101b 100644 --- a/configure.ac +++ b/configure.ac -@@ -288,14 +288,6 @@ AC_ARG_WITH(augeaslenslibdir, +@@ -350,14 +350,6 @@ AC_ARG_WITH(augeaslenslibdir, [Directory for librepor lens (default: /usr/share/augeas/lenses)])], [], [with_augeaslenslibdir="/usr/share/augeas/lenses"]) AC_SUBST([AUGEAS_LENS_LIB_DIR], [$with_augeaslenslibdir]) @@ -32,5 +32,5 @@ index c06af2d..b90f49e 100644 AC_ARG_WITH([defaultdumpdirmode], AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE], -- -2.8.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch deleted file mode 100644 index 9770f077c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 06710ab89fc7d7a82a378289aa3fcd92d33074f2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 27 Apr 2017 03:31:00 -0400 -Subject: [PATCH] remove python2 support - -We do not require python2, so remove it. - -Upstream-Status: Inappropriate workaround - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 15 --------------- - src/client-python/reportclient/Makefile.am | 9 --------- - src/report-python/Makefile.am | 19 ------------------- - 3 files changed, 43 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eb50382..826d0fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -166,15 +166,6 @@ do - done - fi dnl end NO_MANTISBT - --AC_PATH_PROG([PYTHON_CONFIG], [python-config], [no]) --[if test "$PYTHON_CONFIG" = "no"] --[then] -- [echo "The python-config program was not found in the search path. Please ensure"] -- [echo "that it is installed and its directory is included in the search path."] -- [echo "Then run configure again before attempting to build libreport."] -- [exit 1] --[fi] -- - AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) - [if test "$PYTHON3_CONFIG" = "no"] - [then] -@@ -184,9 +175,6 @@ AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) - [exit 1] - [fi] - --PYTHON_CFLAGS=`python-config --cflags 2> /dev/null` --PYTHON_LIBS=`python-config --libs 2> /dev/null` -- - PYTHON3_CFLAGS=`python3-config --cflags 2> /dev/null` - PYTHON3_LIBS=`python3-config --libs 2> /dev/null` - -@@ -198,9 +186,6 @@ PYTHON3_DIR=`$PYTHON3 -c "import distutils.sysconfig; \ - PYTHON3_EXECDIR=`$PYTHON3 -c "import distutils.sysconfig; \ - print(distutils.sysconfig.get_python_lib(1,0,prefix='$PYTHON3_EXEC_PREFIX'))"` - --AC_SUBST(PYTHON_CFLAGS) --AC_SUBST(PYTHON_LIBS) -- - AC_SUBST(PYTHON3_CFLAGS) - AC_SUBST(PYTHON3_LIBS) - AC_SUBST(python3dir, $PYTHON3_DIR) -diff --git a/src/client-python/reportclient/Makefile.am b/src/client-python/reportclient/Makefile.am -index 46ac42f..fb5216a 100644 ---- a/src/client-python/reportclient/Makefile.am -+++ b/src/client-python/reportclient/Makefile.am -@@ -4,13 +4,10 @@ PYFILES = \ - dnfdebuginfo.py \ - yumdebuginfo.py - --py2clientdir = $(pyexecdir)/reportclient - py3clientdir = $(py3execdir)/reportclient - --py2client_PYTHON = $(PYFILES) - py3client_PYTHON = $(PYFILES) - --py2client_LTLIBRARIES = _reportclient.la - py3client_LTLIBRARIES = _reportclient3.la - - PYEXTFILES = \ -@@ -33,12 +30,6 @@ PYEXTLDFLAGS = \ - -avoid-version \ - -Wl,-z,relro -Wl,-z,now - --_reportclient_la_SOURCES = $(PYEXTFILES) --_reportclient_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON_CFLAGS) --_reportclient_la_LDFLAGS = $(PYEXTLDFLAGS) \ -- -export-symbols-regex init_reportclient --_reportclient_la_LIBADD = ../../lib/libreport.la -- - _reportclient3_la_SOURCES = $(PYEXTFILES) - _reportclient3_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON3_CFLAGS) - _reportclient3_la_LDFLAGS = $(PYEXTLDFLAGS) \ -diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am -index 793cebd..241dcb7 100644 ---- a/src/report-python/Makefile.am -+++ b/src/report-python/Makefile.am -@@ -1,12 +1,9 @@ - PYFILES = __init__.py accountmanager.py - --pyreportexecdir = $(pyexecdir)/report - py3reportexecdir = $(py3execdir)/report - --pyreportexec_PYTHON = $(PYFILES) - py3reportexec_PYTHON = $(PYFILES) - --pyreportexec_LTLIBRARIES = _pyreport.la - py3reportexec_LTLIBRARIES = _py3report.la - - PYEXTFILES = \ -@@ -34,20 +31,6 @@ PYEXTLDFLAGS = \ - -avoid-version \ - -Wl,-z,relro -Wl,-z,now - --_pyreport_la_SOURCES = $(PYEXTFILES) -- --_pyreport_la_CPPFLAGS = \ -- $(PYEXTCPPFLAGS) \ -- $(PYTHON_CFLAGS) -- --_pyreport_la_LDFLAGS = \ -- $(PYEXTLDFLAGS) \ -- -export-symbols-regex init_pyreport -- --_pyreport_la_LIBADD = \ -- ../lib/libreport.la \ -- $(PYTHON2_LIBS) -- - _py3report_la_SOURCES = $(PYEXTFILES) - - _py3report_la_CPPFLAGS = \ -@@ -64,7 +47,6 @@ _py3report_la_LIBADD = \ - - # report compat: - --pyreportioexecdir = $(pyexecdir)/report/io - py3reportioexecdir = $(py3execdir)/report/io - - PYIOFILES = \ -@@ -73,5 +55,4 @@ PYIOFILES = \ - io/NewtIO.py \ - io/TextIO.py - --pyreportioexec_PYTHON = $(PYIOFILES) - py3reportioexec_PYTHON = $(PYIOFILES) --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.5.bb index f2c661c8f..542956cf6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.5.bb @@ -16,9 +16,11 @@ SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch \ file://0003-without-build-plugins.patch \ file://0004-configure.ac-remove-prog-test-of-augparse.patch \ - file://0005-remove-python2-support.patch \ " -SRCREV = "cfff49f06d9d17e269d463ee71b3d94c8bfb0c58" +SRCREV = "15f92bcaf73e5eb8958fbde655a57dcd111757a7" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/git" inherit distro_features_check @@ -29,6 +31,8 @@ inherit gettext autotools python3native pkgconfig PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}" PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3," +EXTRA_OECONF += "--without-python2 --with-python3" + RDEPENDS_python3-libreport += "${PN}" do_patch[prefuncs] += "do_gen_version" diff --git a/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch new file mode 100644 index 000000000..6a8911daf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch @@ -0,0 +1,72 @@ +From 7db6d8a657d13bb562a27c6181accaf3e53c0efd Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 25 Sep 2018 14:03:10 +0800 +Subject: [PATCH] support openssl 1.1.x + +Long time no maintain from upstream since 2013-06-04 +(https://sourceforge.net/projects/nail/), backport a +fix from openSUSE + +Upstream-Status: Backport [openSUSE] +https://build.opensuse.org/package/view_file/openSUSE:Leap:15.0/mailx/mailx-12.5-openssl-1.1.0f.patch?expand=1 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + openssl.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/openssl.c b/openssl.c +index 44fe4e5..0ccc517 100644 +--- a/openssl.c ++++ b/openssl.c +@@ -137,7 +137,12 @@ ssl_rand_init(void) + + if ((cp = value("ssl-rand-egd")) != NULL) { + cp = expand(cp); +- if (RAND_egd(cp) == -1) { ++#ifndef OPENSSL_NO_EGD ++ if (RAND_egd(cp) == -1) ++#else ++ if (1) ++#endif ++ { + fprintf(stderr, catgets(catd, CATSET, 245, + "entropy daemon at \"%s\" not available\n"), + cp); +@@ -216,6 +221,7 @@ ssl_select_method(const char *uhp) + + cp = ssl_method_string(uhp); + if (cp != NULL) { ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL + if (equal(cp, "ssl3")) + method = SSLv3_client_method(); + else if (equal(cp, "tls1")) +@@ -225,8 +231,25 @@ ssl_select_method(const char *uhp) + "Invalid SSL method \"%s\"\n"), cp); + method = SSLv23_client_method(); + } ++#else ++ method = NULL; ++ if (equal(cp, "tls")) ++ method = TLS_client_method(); ++ else if (equal(cp, "dtls")) ++ method = DTLS_client_method(); ++ ++ if (!method) { ++ fprintf(stderr, catgets(catd, CATSET, 244, ++ "Invalid SSL method \"%s\"\n"), cp); ++ method = TLS_client_method(); ++ } ++#endif + } else ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL + method = SSLv23_client_method(); ++#else ++ method = TLS_client_method(); ++#endif + return method; + } + +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb b/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb index 0a191a00c..4161ea675 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb @@ -9,7 +9,7 @@ SECTION = "console/network" LICENSE = "BSD & MPL-1" LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd" -DEPENDS = "openssl10" +DEPENDS = "openssl" SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5.orig.tar.gz;name=archive \ file://0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch \ @@ -21,6 +21,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/ file://0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch \ file://0015-usr-sbin-sendmail.patch \ file://explicitly.disable.krb5.support.patch \ + file://0001-support-openssl-1.1.x.patch \ " SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2" diff --git a/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch deleted file mode 100644 index cc7cdc336..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6ef69a26126ee4e69a25392fd456b8a66c51dffd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 15 Nov 2016 02:46:55 +0000 -Subject: [PATCH] Fix errors found by clang - -Fixes errors like - -../../git/src/hash.cpp:282:19: error: ordered comparison between pointer and zero ('const unsigned char *' and 'int') - if(fdht->base>0){ - ~~~~~~~~~~^~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/hash.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hash.cpp b/src/hash.cpp -index 4216157..52f419b 100644 ---- a/src/hash.cpp -+++ b/src/hash.cpp -@@ -279,7 +279,7 @@ void file_data_hasher_t::hash() - MAP_FILE| - #endif - MAP_SHARED,fd,0); -- if(fdht->base>0){ -+ if(fdht->base != (void *) -1){ - /* mmap is successful, so set the bounds. - * if it is not successful, we default to reading the fd - */ --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch new file mode 100644 index 000000000..69460b314 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch @@ -0,0 +1,128 @@ +From 7d7b60e38ca701819d4d00b38161faddce01e2ae Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Sep 2018 23:21:22 -0700 +Subject: [PATCH] Fix literal and identifier spacing as dictated by C++11 + +Fixes clang error like below + +error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] +| status(" Known files not found: %"PRIu64, this->match.unused); + +Upstream-Status: Submitted [https://github.com/jessek/hashdeep/pull/385/commits/18a6b5d57f7a648d2b7dcc6e50ff00a1e4b05fcc] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/display.cpp | 16 ++++++++-------- + src/files.cpp | 4 ++-- + src/hash.cpp | 2 +- + src/hashlist.cpp | 4 ++-- + src/xml.h | 2 +- + 5 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/display.cpp b/src/display.cpp +index b23335d..2eddc23 100644 +--- a/src/display.cpp ++++ b/src/display.cpp +@@ -311,7 +311,7 @@ void display::display_realtime_stats(const file_data_hasher_t *fdht, const hash_ + + ss << mb_read << "MB of " << fdht->stat_megs() << "MB done, "; + char msg[64]; +- snprintf(msg,sizeof(msg),"%02"PRIu64":%02"PRIu64":%02"PRIu64" left", hour, min, seconds); ++ snprintf(msg,sizeof(msg),"%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64 " left", hour, min, seconds); + ss << msg; + } + ss << "\r"; +@@ -424,14 +424,14 @@ void display::display_audit_results() + + if (opt_verbose) { + if(opt_verbose >= MORE_VERBOSE){ +- status(" Input files examined: %"PRIu64, this->match.total); +- status(" Known files expecting: %"PRIu64, this->match.expect); ++ status(" Input files examined: %" PRIu64, this->match.total); ++ status(" Known files expecting: %" PRIu64, this->match.expect); + } +- status(" Files matched: %"PRIu64, this->match.exact); +- status("Files partially matched: %"PRIu64, this->match.partial); +- status(" Files moved: %"PRIu64, this->match.moved); +- status(" New files found: %"PRIu64, this->match.unknown); +- status(" Known files not found: %"PRIu64, this->match.unused); ++ status(" Files matched: %" PRIu64, this->match.exact); ++ status("Files partially matched: %" PRIu64, this->match.partial); ++ status(" Files moved: %" PRIu64, this->match.moved); ++ status(" New files found: %" PRIu64, this->match.unknown); ++ status(" Known files not found: %" PRIu64, this->match.unused); + } + } + +diff --git a/src/files.cpp b/src/files.cpp +index 89c6984..3dfd363 100644 +--- a/src/files.cpp ++++ b/src/files.cpp +@@ -509,7 +509,7 @@ int state::parse_encase_file(const char *fn, FILE *handle,uint32_t expected_hash + + // Users expect the line numbers to start at one, not zero. + if ((!ocb.opt_silent) || (mode_warn_only)) { +- ocb.error("%s: No hash found in line %"PRIu32, fn, count + 1); ++ ocb.error("%s: No hash found in line %" PRIu32, fn, count + 1); + ocb.error("%s: %s", fn, strerror(errno)); + return status_t::STATUS_USER_ERROR; + } +@@ -542,7 +542,7 @@ int state::parse_encase_file(const char *fn, FILE *handle,uint32_t expected_hash + } + + if (expected_hashes != count){ +- ocb.error("%s: Expecting %"PRIu32" hashes, found %"PRIu32"\n", ++ ocb.error("%s: Expecting %" PRIu32 " hashes, found %" PRIu32 "\n", + fn, expected_hashes, count); + } + return status_t::status_ok; +diff --git a/src/hash.cpp b/src/hash.cpp +index 52f419b..a4b3128 100644 +--- a/src/hash.cpp ++++ b/src/hash.cpp +@@ -124,7 +124,7 @@ bool file_data_hasher_t::compute_hash(uint64_t request_start,uint64_t request_le + + // If an error occured, display a message and see if we need to quit. + if ((current_read_bytes<0) || (this->handle && ferror(this->handle))){ +- ocb->error_filename(this->file_name,"error at offset %"PRIu64": %s", ++ ocb->error_filename(this->file_name,"error at offset %" PRIu64 ": %s", + request_start, strerror(errno)); + + if (file_fatal_error()){ +diff --git a/src/hashlist.cpp b/src/hashlist.cpp +index b5b275f..eb0d45a 100644 +--- a/src/hashlist.cpp ++++ b/src/hashlist.cpp +@@ -342,7 +342,7 @@ hashlist::load_hash_file(display *ocb,const std::string &fn) + file_data_t *t = new (std::nothrow) file_data_t(); + if (NULL == t) + { +- ocb->fatal_error("%s: Out of memory in line %"PRIu64, ++ ocb->fatal_error("%s: Out of memory in line %" PRIu64, + fn.c_str(), line_number); + } + +@@ -390,7 +390,7 @@ hashlist::load_hash_file(display *ocb,const std::string &fn) + if ( !algorithm_t::valid_hash(hash_column[column_number],word)) + { + if (ocb) +- ocb->error("%s: Invalid %s hash in line %"PRIu64, ++ ocb->error("%s: Invalid %s hash in line %" PRIu64, + fn.c_str(), + hashes[hash_column[column_number]].name.c_str(), + line_number); +diff --git a/src/xml.h b/src/xml.h +index bfe0c94..017dba7 100644 +--- a/src/xml.h ++++ b/src/xml.h +@@ -100,7 +100,7 @@ public: + void xmlout(const std::string &tag,const std::string &value){ xmlout(tag,value,"",true); } + void xmlout(const std::string &tag,const int value){ xmlprintf(tag,"","%d",value); } + void xmloutl(const std::string &tag,const long value){ xmlprintf(tag,"","%ld",value); } +- void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); } ++ void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%" PRId64,value); } + void xmlout(const std::string &tag,const double value){ xmlprintf(tag,"","%f",value); } + void xmlout(const std::string &tag,const struct timeval &ts){ + xmlprintf(tag,"","%d.%06d",(int)ts.tv_sec, (int)ts.tv_usec); +-- +2.18.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch index 3a4c4f4c2..73c6cb126 100644 --- a/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch +++ b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch @@ -1,6 +1,8 @@ ---- a/configure.ac 2014-08-22 12:22:54.290884351 +0200 -+++ b/configure.ac 2014-08-22 12:23:15.822306295 +0200 -@@ -42,18 +42,6 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -42,18 +42,6 @@ case $host in ;; esac @@ -19,21 +21,3 @@ # # ################################################################ -@@ -71,7 +59,7 @@ - - if test $mingw = "no" ; then - # add the warnings we don't want to do on mingw -- $WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes -Weffc++" -+ WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes -Weffc++" - fi - - for option in $WARNINGS_TO_TEST -@@ -105,7 +93,7 @@ - - if test $mingw = "no" ; then - # add the warnings we don't want to do on mingw -- $WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" -+ WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" - fi - - for option in $WARNINGS_TO_TEST diff --git a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb index bb30abedd..e8c6864c1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb @@ -4,13 +4,15 @@ AUTHOR = "Jesse Kornblum, Simson L. Garfinkel" HOMEPAGE = "http://md5deep.sourceforge.net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9190f660105b9a56cdb272309bfd5491" -# Release 4.4 -SRCREV = "cd2ed7416685a5e83eb10bb659d6e9bec01244ae" + +PV = "4.4+git${SRCPV}" + +SRCREV = "877613493ff44807888ce1928129574be393cbb0" SRC_URI = "git://github.com/jessek/hashdeep.git \ - file://wrong-variable-expansion.patch \ - file://0001-Fix-errors-found-by-clang.patch \ - " + file://wrong-variable-expansion.patch \ + file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch new file mode 100644 index 000000000..8b0096630 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch @@ -0,0 +1,31 @@ +From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 May 2018 23:18:11 -0700 +Subject: [PATCH] Fix formatting for modern c++11 compilers + +Fixes +error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/backend/svg/SVG_RenderingContext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc +index 55d6097..0d50702 100644 +--- a/src/backend/svg/SVG_RenderingContext.cc ++++ b/src/backend/svg/SVG_RenderingContext.cc +@@ -68,7 +68,7 @@ void + SVG_RenderingContext::documentStart(const BoundingBox& bbox) + { + beginDocument(bbox); +- metadata("Created by "PACKAGE" version "VERSION); ++ metadata("Created by " PACKAGE " version " VERSION); + } + + void +-- +2.17.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb index df82bef63..9ee9e3035 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/GNOME/gtkmathview.git \ file://0001-include-cstdio-to-get-printf-definitions.patch \ file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \ file://0003-gcc-6.0-build-fixes.patch \ + file://0001-Fix-formatting-for-modern-c-11-compilers.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch deleted file mode 100644 index 40d646c7d..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f36c9476d2816e0d3e61c9e13c22ed73883cb54a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 24 Apr 2017 12:13:43 -0700 -Subject: [PATCH] compare the first character of string to be null or not - -Fixes - -error: ISO C++ forbids comparison between pointer and integer [-fpermissive] -| if (value[0] == '\0') -| ^~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - js/src/shell/jsoptparse.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp -index b49d0a5..612aa00 100644 ---- a/js/src/shell/jsoptparse.cpp -+++ b/js/src/shell/jsoptparse.cpp -@@ -243,7 +243,7 @@ OptionParser::extractValue(size_t argc, char **argv, size_t *i, char **value) - char *eq = strchr(argv[*i], '='); - if (eq) { - *value = eq + 1; -- if (value[0] == '\0') -+ if (value[0][0] == '\0') - return error("A value is required for option %.*s", eq - argv[*i], argv[*i]); - return Okay; - } --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch new file mode 100644 index 000000000..ba317bc0c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch @@ -0,0 +1,91 @@ +From 5028d1cd669c179ed49061316d04c8e8862a5bd8 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 12 Jul 2018 15:04:47 +0800 +Subject: [PATCH 1/5] do not create python environment + +Use oe's python environment rather than create one of host + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/moz.configure/init.configure | 18 ------------------ + configure.py | 10 +++++++++- + js/src/old-configure | 4 ++-- + 3 files changed, 11 insertions(+), 21 deletions(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 2123beb..6fe6591 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -179,24 +179,6 @@ def virtualenv_python(env_python, build_env, mozconfig, help): + else: + python = sys.executable + +- if not manager.up_to_date(python): +- log.info('Creating Python environment') +- manager.build(python) +- +- python = normsep(manager.python_path) +- +- if python != normsep(sys.executable): +- log.info('Reexecuting in the virtualenv') +- if env_python: +- del os.environ['PYTHON'] +- # One would prefer to use os.execl, but that's completely borked on +- # Windows. +- sys.exit(subprocess.call([python] + sys.argv)) +- +- # We are now in the virtualenv +- if not distutils.sysconfig.get_python_lib(): +- die('Could not determine python site packages directory') +- + return python + + set_config('PYTHON', virtualenv_python) +diff --git a/configure.py b/configure.py +index f7392d0..45323a5 100644 +--- a/configure.py ++++ b/configure.py +@@ -12,7 +12,15 @@ import textwrap + + + base_dir = os.path.abspath(os.path.dirname(__file__)) +-sys.path.insert(0, os.path.join(base_dir, 'python', 'mozbuild')) ++sys.path.insert(0, os.path.join(base_dir, 'config')) ++def get_immediate_subdirectories(a_dir): ++ return [name for name in os.listdir(a_dir) ++ if os.path.isdir(os.path.join(a_dir, name))] ++for s in ["python", "testing/mozbase"]: ++ sub_dir = os.path.join(base_dir, s) ++ for module_dir in get_immediate_subdirectories(sub_dir): ++ sys.path.insert(0, os.path.join(sub_dir, module_dir)) ++ + from mozbuild.configure import ConfigureSandbox + from mozbuild.util import ( + indented_repr, +diff --git a/js/src/old-configure b/js/src/old-configure +index ee4527b..75b00e1 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -10512,7 +10512,7 @@ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then + ;; + esac + +- eval $dumpenv $PYTHON $_topsrcdir/build/subconfigure.py --prepare "$srcdir" "$moz_config_dir" "$_CONFIG_SHELL" $ac_configure_args ++ eval $dumpenv PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --prepare "$srcdir" "$moz_config_dir" "$_CONFIG_SHELL" $ac_configure_args + + done + +@@ -10931,7 +10931,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 +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch new file mode 100644 index 000000000..bc1af3c70 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch @@ -0,0 +1,79 @@ +From 5ad700c92224193bfc789f7d53af38fc6f8b8904 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 19 Jul 2018 17:31:35 +0800 +Subject: [PATCH] fix compiling failure on mips64-n32 bsp + +- Tweak mips64-n32 with mips32 + +- The toolchain of mips64-n32 supports both of macro + `__mips64' and `__mips__', but 32bit is required here. + +- N32 uses 64-bit registers but restricts addresses to 32 bits. + https://www.linux-mips.org/pub/linux/mips/doc/ABI/MIPS-N32-ABI-Handbook.pdf + Table 2-1 specifies the use of registers in n32 and native 64-bit mode. + From the table, N32 and N64 have the same registers + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/moz.configure/init.configure | 5 ++++- + js/src/jit/mips-shared/Architecture-mips-shared.h | 4 +++- + python/mozbuild/mozbuild/configure/constants.py | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 6fe6591..a77b46c 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -357,7 +357,10 @@ def split_triplet(triplet): + canonical_cpu = 'mips32' + endianness = 'little' if 'el' in cpu else 'big' + elif cpu in ('mips64', 'mips64el'): +- canonical_cpu = 'mips64' ++ if 'n32' in triplet: ++ canonical_cpu = 'mips32' ++ else: ++ canonical_cpu = 'mips64' + endianness = 'little' if 'el' in cpu else 'big' + elif cpu.startswith('aarch64'): + canonical_cpu = 'aarch64' +diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h +index 7afe305..c6e29dc 100644 +--- a/js/src/jit/mips-shared/Architecture-mips-shared.h ++++ b/js/src/jit/mips-shared/Architecture-mips-shared.h +@@ -24,6 +24,8 @@ + #define USES_O32_ABI + #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || defined(JS_SIMULATOR_MIPS64) + #define USES_N64_ABI ++#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABIN32)) ++#define USES_N32_ABI + #else + #error "Unsupported ABI" + #endif +@@ -91,7 +93,7 @@ class Registers + ta1 = t5, + ta2 = t6, + ta3 = t7, +-#elif defined(USES_N64_ABI) ++#elif defined(USES_N64_ABI) || defined(USES_N32_ABI) + a4 = r8, + a5 = r9, + a6 = r10, +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index dfc7cf8..27f83ab 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -83,8 +83,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), + ('sparc', '__sparc__'), +- ('mips64', '__mips64'), + ('mips32', '__mips__'), ++ ('mips64', '__mips64'), + )) + + assert sorted(CPU_preprocessor_checks.keys()) == sorted(CPU.POSSIBLE_VALUES) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch index bc141d9d5..c111ea5ea 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch @@ -3,33 +3,31 @@ From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Thu, 6 Jun 2013 18:36:01 +0200 Subject: [PATCH] js.pc.in: do not include RequiredDefines.h for depending packages -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit in our cross environment the would fail with: | cc1: fatal error: /usr/include/js-17.0/js/RequiredDefines.h: No such file or directory and currently it only defines __STDC_LIMIT_MACROS - Upstream-Status: Inappropriate [embedded specific] - Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +Rebase to 52.8.1 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - js.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + js/src/js.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/js.pc.in b/js.pc.in -index 13d761d..a95a7bd 100644 ---- a/js.pc.in -+++ b/js.pc.in +diff --git a/js/src/js.pc.in b/js/src/js.pc.in +index 2eae393..c2dea62 100644 +--- a/js/src/js.pc.in ++++ b/js/src/js.pc.in @@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript Version: @MOZILLA_VERSION@ - Requires.private: @NSPR_PKGCONF_CHECK@ - Libs: -L${libdir} -l@LIBRARY_NAME@ --Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h -I${includedir}/@MODULE@ -+Cflags: -I${includedir}/@MODULE@ + @PKGCONF_REQUIRES_PRIVATE@ + Libs: -L${libdir} -l@JS_LIBRARY_NAME@ +-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ ++Cflags: -I${includedir}/@JS_LIBRARY_NAME@ -- -1.7.6.5 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch new file mode 100644 index 000000000..477f73a2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs-fix-coredump-caused-by-getenv.patch @@ -0,0 +1,27 @@ +From 20b639b7364f9953fdacb058f9ba800bcbf029b4 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 2 Aug 2018 09:40:48 +0800 +Subject: [PATCH] mozjs: fix coredump caused by getenv + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1480315] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + mozglue/misc/TimeStamp.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mozglue/misc/TimeStamp.cpp b/mozglue/misc/TimeStamp.cpp +index 932b75c..7a4d71b 100644 +--- a/mozglue/misc/TimeStamp.cpp ++++ b/mozglue/misc/TimeStamp.cpp +@@ -11,6 +11,7 @@ + #include "mozilla/TimeStamp.h" + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + + namespace mozilla { + +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch deleted file mode 100644 index de72d4f9a..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From da3929a96d9c74e11bf37d128890e18fcb745365 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Mon, 26 Jan 2015 08:53:19 +0900 -Subject: [PATCH] mozjs17.0.0: fix the compile bug of powerpc - -To fix the bug as following - -error: cannot convert '__va_list_tag**' to '__va_list_tag (*)[1]' for -argument '5' to 'JSBool TryArgumentFormatter(JSContext*, const char**, -JSBool, jsval**, __va_list_tag (*)[1])' - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - jscpucfg.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/jscpucfg.h b/jscpucfg.h -index dfb1c14..8683491 100644 ---- a/jscpucfg.h -+++ b/jscpucfg.h -@@ -47,6 +47,12 @@ - #elif defined(JS_HAVE_ENDIAN_H) - # include <endian.h> - -+#if defined(_POWER) || defined(__powerpc__) || \ -+ defined(__ppc__) -+# define HAVE_VA_LIST_AS_ARRAY 1 -+# endif -+ -+ - # if defined(__BYTE_ORDER) - # if __BYTE_ORDER == __LITTLE_ENDIAN - # define IS_LITTLE_ENDIAN 1 --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch deleted file mode 100644 index fa413ea9f..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch +++ /dev/null @@ -1,3238 +0,0 @@ -From 6440b4901c6f4bcc69686ff10806e311cc5a927b Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Tue, 3 Mar 2015 19:12:17 +0800 -Subject: [PATCH] regenerate configure with autoconf-2.13 - -Signed-off-by: Koen Kooi <koen.kooi@linaro.org> -Upstream-status: Inappropriate [generated file] - ---- - js/src/configure | 838 ++++++++++++++++++++++++++----------------------------- - 1 file changed, 389 insertions(+), 449 deletions(-) - -diff --git a/js/src/configure b/js/src/configure -index cb6b41b..b05298f 100755 ---- a/js/src/configure -+++ b/js/src/configure -@@ -5757,6 +5757,10 @@ arm*) - CPU_ARCH=arm - ;; - -+aarch64*) -+ CPU_ARCH=aarch64 -+ ;; -+ - mips|mipsel) - CPU_ARCH="mips" - ;; -@@ -5893,14 +5897,14 @@ no) - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$arch_flag" - cat > conftest.$ac_ext <<EOF --#line 5897 "configure" -+#line 5901 "configure" - #include "confdefs.h" - - int main() { - return sizeof(__thumb2__); - ; return 0; } - EOF --if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_THUMB2=1 - else -@@ -5972,16 +5976,16 @@ if test -n "$all_flags"; then - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$all_flags" - echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 --echo "configure:5976: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 -+echo "configure:5980: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 - cat > conftest.$ac_ext <<EOF --#line 5978 "configure" -+#line 5982 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:5985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -6004,18 +6008,18 @@ fi - - if test "$CPU_ARCH" = "arm"; then - echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6 --echo "configure:6008: checking for ARM SIMD support in compiler" >&5 -+echo "configure:6012: checking for ARM SIMD support in compiler" >&5 - # We try to link so that this also fails when - # building with LTO. - cat > conftest.$ac_ext <<EOF --#line 6012 "configure" -+#line 6016 "configure" - #include "confdefs.h" - - int main() { - asm("uqadd8 r1, r1, r2"); - ; return 0; } - EOF --if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - result="yes" - else -@@ -6038,18 +6042,18 @@ EOF - fi - - echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 --echo "configure:6042: checking for ARM NEON support in compiler" >&5 -+echo "configure:6046: checking for ARM NEON support in compiler" >&5 - # We try to link so that this also fails when - # building with LTO. - cat > conftest.$ac_ext <<EOF --#line 6046 "configure" -+#line 6050 "configure" - #include "confdefs.h" - - int main() { - asm(".fpu neon\n vadd.i8 d0, d0, d0"); - ; return 0; } - EOF --if { (eval echo configure:6053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - result="yes" - else -@@ -6094,7 +6098,7 @@ configure_static_assert_macros=' - ' - - echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 --echo "configure:6098: checking that static assertion macros used in autoconf tests work" >&5 -+echo "configure:6102: checking that static assertion macros used in autoconf tests work" >&5 - if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6108,14 +6112,14 @@ cross_compiling=$ac_cv_prog_cc_cross - - ac_cv_static_assertion_macros_work="yes" - cat > conftest.$ac_ext <<EOF --#line 6112 "configure" -+#line 6116 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(1) - ; return 0; } - EOF --if { (eval echo configure:6119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -6125,14 +6129,14 @@ else - fi - rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 6129 "configure" -+#line 6133 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(0) - ; return 0; } - EOF --if { (eval echo configure:6136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -6148,14 +6152,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 6152 "configure" -+#line 6156 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(1) - ; return 0; } - EOF --if { (eval echo configure:6159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -6165,14 +6169,14 @@ else - fi - rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 6169 "configure" -+#line 6173 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(0) - ; return 0; } - EOF --if { (eval echo configure:6176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_static_assertion_macros_work="no" - else -@@ -6317,7 +6321,7 @@ if test "$GNU_CC"; then - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -Wpointer-arith -Wdeclaration-after-statement" - - echo $ac_n "checking whether the C compiler supports -Werror=return-type""... $ac_c" 1>&6 --echo "configure:6321: checking whether the C compiler supports -Werror=return-type" >&5 -+echo "configure:6325: checking whether the C compiler supports -Werror=return-type" >&5 - if eval "test \"`echo '$''{'ac_c_has_werror_return_type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6333,14 +6337,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Werror=return-type" - cat > conftest.$ac_ext <<EOF --#line 6337 "configure" -+#line 6341 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_werror_return_type="yes" - else -@@ -6368,7 +6372,7 @@ echo "$ac_t""$ac_c_has_werror_return_type" 1>&6 - - - echo $ac_n "checking whether the C compiler supports -Wtype-limits""... $ac_c" 1>&6 --echo "configure:6372: checking whether the C compiler supports -Wtype-limits" >&5 -+echo "configure:6376: checking whether the C compiler supports -Wtype-limits" >&5 - if eval "test \"`echo '$''{'ac_c_has_wtype_limits'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6384,14 +6388,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wtype-limits" - cat > conftest.$ac_ext <<EOF --#line 6388 "configure" -+#line 6392 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_wtype_limits="yes" - else -@@ -6419,7 +6423,7 @@ echo "$ac_t""$ac_c_has_wtype_limits" 1>&6 - - - echo $ac_n "checking whether the C compiler supports -Wempty-body""... $ac_c" 1>&6 --echo "configure:6423: checking whether the C compiler supports -Wempty-body" >&5 -+echo "configure:6427: checking whether the C compiler supports -Wempty-body" >&5 - if eval "test \"`echo '$''{'ac_c_has_wempty_body'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6435,14 +6439,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Wempty-body" - cat > conftest.$ac_ext <<EOF --#line 6439 "configure" -+#line 6443 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_wempty_body="yes" - else -@@ -6476,7 +6480,7 @@ echo "$ac_t""$ac_c_has_wempty_body" 1>&6 - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wno-unused" - - echo $ac_n "checking whether the C compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 --echo "configure:6480: checking whether the C compiler supports -Wno-overlength-strings" >&5 -+echo "configure:6484: checking whether the C compiler supports -Wno-overlength-strings" >&5 - if eval "test \"`echo '$''{'ac_c_has_wno_overlength_strings'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6492,14 +6496,14 @@ cross_compiling=$ac_cv_prog_cc_cross - _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -Woverlength-strings" - cat > conftest.$ac_ext <<EOF --#line 6496 "configure" -+#line 6500 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_c_has_wno_overlength_strings="yes" - else -@@ -6580,7 +6584,7 @@ if test "$GNU_CXX"; then - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wpointer-arith -Woverloaded-virtual" - - echo $ac_n "checking whether the C++ compiler supports -Werror=return-type""... $ac_c" 1>&6 --echo "configure:6584: checking whether the C++ compiler supports -Werror=return-type" >&5 -+echo "configure:6588: checking whether the C++ compiler supports -Werror=return-type" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_werror_return_type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6596,14 +6600,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Werror=return-type" - cat > conftest.$ac_ext <<EOF --#line 6600 "configure" -+#line 6604 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_werror_return_type="yes" - else -@@ -6631,7 +6635,7 @@ echo "$ac_t""$ac_cxx_has_werror_return_type" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wtype-limits""... $ac_c" 1>&6 --echo "configure:6635: checking whether the C++ compiler supports -Wtype-limits" >&5 -+echo "configure:6639: checking whether the C++ compiler supports -Wtype-limits" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wtype_limits'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6647,14 +6651,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wtype-limits" - cat > conftest.$ac_ext <<EOF --#line 6651 "configure" -+#line 6655 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wtype_limits="yes" - else -@@ -6682,7 +6686,7 @@ echo "$ac_t""$ac_cxx_has_wtype_limits" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wempty-body""... $ac_c" 1>&6 --echo "configure:6686: checking whether the C++ compiler supports -Wempty-body" >&5 -+echo "configure:6690: checking whether the C++ compiler supports -Wempty-body" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wempty_body'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6698,14 +6702,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wempty-body" - cat > conftest.$ac_ext <<EOF --#line 6702 "configure" -+#line 6706 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wempty_body="yes" - else -@@ -6741,7 +6745,7 @@ echo "$ac_t""$ac_cxx_has_wempty_body" 1>&6 - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-ctor-dtor-privacy" - - echo $ac_n "checking whether the C++ compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 --echo "configure:6745: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 -+echo "configure:6749: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_overlength_strings'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6757,14 +6761,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Woverlength-strings" - cat > conftest.$ac_ext <<EOF --#line 6761 "configure" -+#line 6765 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_overlength_strings="yes" - else -@@ -6792,7 +6796,7 @@ echo "$ac_t""$ac_cxx_has_wno_overlength_strings" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6 --echo "configure:6796: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 -+echo "configure:6800: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_invalid_offsetof'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6808,14 +6812,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Winvalid-offsetof" - cat > conftest.$ac_ext <<EOF --#line 6812 "configure" -+#line 6816 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_invalid_offsetof="yes" - else -@@ -6843,7 +6847,7 @@ echo "$ac_t""$ac_cxx_has_wno_invalid_offsetof" 1>&6 - - - echo $ac_n "checking whether the C++ compiler supports -Wno-variadic-macros""... $ac_c" 1>&6 --echo "configure:6847: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 -+echo "configure:6851: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_variadic_macros'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6859,14 +6863,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wvariadic-macros" - cat > conftest.$ac_ext <<EOF --#line 6863 "configure" -+#line 6867 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_variadic_macros="yes" - else -@@ -6918,7 +6922,7 @@ echo "$ac_t""$ac_cxx_has_wno_variadic_macros" 1>&6 - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-c++0x-extensions" - - echo $ac_n "checking whether the C++ compiler supports -Wno-extended-offsetof""... $ac_c" 1>&6 --echo "configure:6922: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 -+echo "configure:6926: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 - if eval "test \"`echo '$''{'ac_cxx_has_wno_extended_offsetof'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6934,14 +6938,14 @@ cross_compiling=$ac_cv_prog_cxx_cross - _SAVE_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Werror -Wextended-offsetof" - cat > conftest.$ac_ext <<EOF --#line 6938 "configure" -+#line 6942 "configure" - #include "confdefs.h" - - int main() { - return(0); - ; return 0; } - EOF --if { (eval echo configure:6945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cxx_has_wno_extended_offsetof="yes" - else -@@ -6979,7 +6983,7 @@ MKSHLIB_UNFORCE_ALL= - if test "$COMPILE_ENVIRONMENT"; then - if test "$GNU_CC"; then - echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 --echo "configure:6983: checking whether ld has archive extraction flags" >&5 -+echo "configure:6987: checking whether ld has archive extraction flags" >&5 - if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6996,14 +7000,14 @@ LOOP_INPUT - LDFLAGS=$force - LIBS=$unforce - cat > conftest.$ac_ext <<EOF --#line 7000 "configure" -+#line 7004 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:7007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_mkshlib_force_and_unforce=$line; break - else -@@ -7038,16 +7042,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 --echo "configure:7042: checking for 64-bit OS" >&5 -+echo "configure:7046: checking for 64-bit OS" >&5 - cat > conftest.$ac_ext <<EOF --#line 7044 "configure" -+#line 7048 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8) - ; return 0; } - EOF --if { (eval echo configure:7051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" - else -@@ -7170,7 +7174,7 @@ case "$host" in - esac - - echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 --echo "configure:7174: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 -+echo "configure:7178: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 - - $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION - _python_res=$? -@@ -7181,7 +7185,7 @@ fi - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking for custom <stdint.h> implementation""... $ac_c" 1>&6 --echo "configure:7185: checking for custom <stdint.h> implementation" >&5 -+echo "configure:7189: checking for custom <stdint.h> implementation" >&5 - if test "$MOZ_CUSTOM_STDINT_H"; then - cat >> confdefs.pytmp <<EOF - (''' MOZ_CUSTOM_STDINT_H ''', r''' "$MOZ_CUSTOM_STDINT_H" ''') -@@ -7249,9 +7253,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for IBM XLC/C++ compiler version >= 9.0.0.7""... $ac_c" 1>&6 --echo "configure:7253: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 -+echo "configure:7257: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 - cat > conftest.$ac_ext <<EOF --#line 7255 "configure" -+#line 7259 "configure" - #include "confdefs.h" - - int main() { -@@ -7260,7 +7264,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:7264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -7298,12 +7302,12 @@ cross_compiling=$ac_cv_prog_cc_cross - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7302: checking for $ac_hdr" >&5 -+echo "configure:7306: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7307 "configure" -+#line 7311 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -7311,7 +7315,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -7394,17 +7398,17 @@ EOF - # builds. - _SAVE_LDFLAGS=$LDFLAGS - echo $ac_n "checking for -framework ExceptionHandling""... $ac_c" 1>&6 --echo "configure:7398: checking for -framework ExceptionHandling" >&5 -+echo "configure:7402: checking for -framework ExceptionHandling" >&5 - LDFLAGS="$LDFLAGS -framework ExceptionHandling" - cat > conftest.$ac_ext <<EOF --#line 7401 "configure" -+#line 7405 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_framework_exceptionhandling="yes" - else -@@ -7426,18 +7430,18 @@ rm -f conftest* - echo "Skipping -dead_strip because DTrace is enabled. See bug 403132." - else - echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 --echo "configure:7430: checking for -dead_strip option to ld" >&5 -+echo "configure:7434: checking for -dead_strip option to ld" >&5 - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-dead_strip" - cat > conftest.$ac_ext <<EOF --#line 7434 "configure" -+#line 7438 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - _HAVE_DEAD_STRIP=1 - else -@@ -7783,12 +7787,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7787: checking for $ac_hdr" >&5 -+echo "configure:7791: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7792 "configure" -+#line 7796 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -7796,7 +7800,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:7800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -7989,19 +7993,19 @@ EOF - _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" - - echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 --echo "configure:7993: checking for __declspec(dllexport)" >&5 -+echo "configure:7997: checking for __declspec(dllexport)" >&5 - if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7998 "configure" -+#line 8002 "configure" - #include "confdefs.h" - __declspec(dllexport) void ac_os2_declspec(void) {} - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:8005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_os2_declspec="yes" - else -@@ -8054,14 +8058,14 @@ EOF - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" - cat > conftest.$ac_ext <<EOF --#line 8058 "configure" -+#line 8062 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:8065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -8089,7 +8093,7 @@ rm -f conftest* - CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` - echo $ac_n "checking for Sun C++ compiler version >= 5.9""... $ac_c" 1>&6 --echo "configure:8093: checking for Sun C++ compiler version >= 5.9" >&5 -+echo "configure:8097: checking for Sun C++ compiler version >= 5.9" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -8099,7 +8103,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <<EOF --#line 8103 "configure" -+#line 8107 "configure" - #include "confdefs.h" - - int main() { -@@ -8108,7 +8112,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:8112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _BAD_COMPILER= - else -@@ -8125,7 +8129,7 @@ rm -f conftest* - _res="yes" - fi - cat > conftest.$ac_ext <<EOF --#line 8129 "configure" -+#line 8133 "configure" - #include "confdefs.h" - - int main() { -@@ -8134,7 +8138,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:8138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _ABOVE_SS12U1= - else -@@ -8535,7 +8539,7 @@ fi - - if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF"; then - echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 --echo "configure:8539: checking whether the linker supports Identical Code Folding" >&5 -+echo "configure:8543: checking whether the linker supports Identical Code Folding" >&5 - if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8544,7 +8548,7 @@ else - 'int main() {return foo() - bar();}' > conftest.${ac_ext} - # If the linker supports ICF, foo and bar symbols will have - # the same address -- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && - test -s conftest${ac_exeext} && - objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then - LD_SUPPORTS_ICF=yes -@@ -8559,14 +8563,14 @@ echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6 - _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe" - LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections" - cat > conftest.$ac_ext <<EOF --#line 8563 "configure" -+#line 8567 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections - else -@@ -8584,15 +8588,15 @@ fi - - if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -n "$MOZ_DEBUG_FLAGS"; then - echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 --echo "configure:8588: checking whether removing dead symbols breaks debugging" >&5 -+echo "configure:8592: checking whether removing dead symbols breaks debugging" >&5 - if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo 'int foo() {return 42;}' \ - 'int bar() {return 1;}' \ - 'int main() {return foo();}' > conftest.${ac_ext} -- if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -- { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && - test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then - if test "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest.${ac_objext} conftest.${ac_ext}`" = \ - "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest${ac_exeext} conftest.${ac_ext}`"; then -@@ -8615,12 +8619,12 @@ fi - - if test -z "$SKIP_COMPILER_CHECKS"; then - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:8619: checking for ANSI C header files" >&5 -+echo "configure:8623: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8624 "configure" -+#line 8628 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -8628,7 +8632,7 @@ else - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:8632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:8636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -8645,7 +8649,7 @@ rm -f conftest* - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 8649 "configure" -+#line 8653 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -8663,7 +8667,7 @@ fi - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 8667 "configure" -+#line 8671 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -8684,7 +8688,7 @@ if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext <<EOF --#line 8688 "configure" -+#line 8692 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -8695,7 +8699,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); - exit (0); } - - EOF --if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -8722,12 +8726,12 @@ EOF - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:8726: checking for working const" >&5 -+echo "configure:8730: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8731 "configure" -+#line 8735 "configure" - #include "confdefs.h" - - int main() { -@@ -8776,7 +8780,7 @@ ccp = (char const *const *) p; - - ; return 0; } - EOF --if { (eval echo configure:8780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -8800,12 +8804,12 @@ EOF - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:8804: checking for mode_t" >&5 -+echo "configure:8808: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8809 "configure" -+#line 8813 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -8836,12 +8840,12 @@ EOF - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:8840: checking for off_t" >&5 -+echo "configure:8844: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8845 "configure" -+#line 8849 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -8872,12 +8876,12 @@ EOF - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:8876: checking for pid_t" >&5 -+echo "configure:8880: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8881 "configure" -+#line 8885 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -8908,12 +8912,12 @@ EOF - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:8912: checking for size_t" >&5 -+echo "configure:8916: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8917 "configure" -+#line 8921 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -8951,12 +8955,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for __stdcall""... $ac_c" 1>&6 --echo "configure:8955: checking for __stdcall" >&5 -+echo "configure:8959: checking for __stdcall" >&5 - if eval "test \"`echo '$''{'ac_cv___stdcall'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8960 "configure" -+#line 8964 "configure" - #include "confdefs.h" - template <typename Method> struct foo; - template <> struct foo<void (*)()> {}; -@@ -8965,7 +8969,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:8969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv___stdcall=true - else -@@ -8997,12 +9001,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 --echo "configure:9001: checking for ssize_t" >&5 -+echo "configure:9005: checking for ssize_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9006 "configure" -+#line 9010 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -9010,7 +9014,7 @@ int main() { - ssize_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:9014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_ssize_t=true - else -@@ -9035,12 +9039,12 @@ else - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:9039: checking for st_blksize in struct stat" >&5 -+echo "configure:9043: checking for st_blksize in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9044 "configure" -+#line 9048 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -9048,7 +9052,7 @@ int main() { - struct stat s; s.st_blksize; - ; return 0; } - EOF --if { (eval echo configure:9052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_blksize=yes - else -@@ -9072,12 +9076,12 @@ EOF - fi - - echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 --echo "configure:9076: checking for siginfo_t" >&5 -+echo "configure:9080: checking for siginfo_t" >&5 - if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9081 "configure" -+#line 9085 "configure" - #include "confdefs.h" - #define _POSIX_C_SOURCE 199506L - #include <signal.h> -@@ -9085,7 +9089,7 @@ int main() { - siginfo_t* info; - ; return 0; } - EOF --if { (eval echo configure:9089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_siginfo_t=true - else -@@ -9111,72 +9115,8 @@ else - fi - - --echo $ac_n "checking for the size of void*""... $ac_c" 1>&6 --echo "configure:9116: checking for the size of void*" >&5 --if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_WORD'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- moz_cv_size_of_JS_BYTES_PER_WORD= -- for size in 4 8; do -- cat > conftest.$ac_ext <<EOF --#line 9124 "configure" --#include "confdefs.h" -- --int main() { -- -- int a[sizeof (void*) == $size ? 1 : -1]; -- return 0; -- --; return 0; } --EOF --if { (eval echo configure:9134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- moz_cv_size_of_JS_BYTES_PER_WORD=$size; break --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 --fi --rm -f conftest* -- done -- if test ! "$moz_cv_size_of_JS_BYTES_PER_WORD"; then -- { echo "configure: error: No size found for void*" 1>&2; exit 1; } -- fi -- --fi -- --echo "$ac_t""$moz_cv_size_of_JS_BYTES_PER_WORD" 1>&6 --cat >> confdefs.pytmp <<EOF -- (''' JS_BYTES_PER_WORD ''', r''' $moz_cv_size_of_JS_BYTES_PER_WORD ''') --EOF --cat >> confdefs.h <<EOF --#define JS_BYTES_PER_WORD $moz_cv_size_of_JS_BYTES_PER_WORD --EOF -- -- --if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then -- cat >> confdefs.pytmp <<\EOF -- (''' JS_BITS_PER_WORD_LOG2 ''', r''' 5 ''') --EOF --cat >> confdefs.h <<\EOF --#define JS_BITS_PER_WORD_LOG2 5 --EOF -- --elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then -- cat >> confdefs.pytmp <<\EOF -- (''' JS_BITS_PER_WORD_LOG2 ''', r''' 6 ''') --EOF --cat >> confdefs.h <<\EOF --#define JS_BITS_PER_WORD_LOG2 6 --EOF -- --else -- { echo "configure: error: Unexpected JS_BYTES_PER_WORD" 1>&2; exit 1; } --fi -- -- - echo $ac_n "checking for the alignment of void*""... $ac_c" 1>&6 --echo "configure:9180: checking for the alignment of void*" >&5 -+echo "configure:9120: checking for the alignment of void*" >&5 - if eval "test \"`echo '$''{'moz_cv_align_of_JS_ALIGN_OF_POINTER'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9184,7 +9124,7 @@ else - moz_cv_align_of_JS_ALIGN_OF_POINTER= - for align in 2 4 8 16; do - cat > conftest.$ac_ext <<EOF --#line 9188 "configure" -+#line 9128 "configure" - #include "confdefs.h" - - #include <stddef.h> -@@ -9197,7 +9137,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - moz_cv_align_of_JS_ALIGN_OF_POINTER=$align; break - else -@@ -9223,7 +9163,7 @@ EOF - - - echo $ac_n "checking for the size of double""... $ac_c" 1>&6 --echo "configure:9227: checking for the size of double" >&5 -+echo "configure:9167: checking for the size of double" >&5 - if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_DOUBLE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9231,7 +9171,7 @@ else - moz_cv_size_of_JS_BYTES_PER_DOUBLE= - for size in 6 8 10 12 14; do - cat > conftest.$ac_ext <<EOF --#line 9235 "configure" -+#line 9175 "configure" - #include "confdefs.h" - - int main() { -@@ -9241,7 +9181,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - moz_cv_size_of_JS_BYTES_PER_DOUBLE=$size; break - else -@@ -9270,12 +9210,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9274: checking for $ac_hdr" >&5 -+echo "configure:9214: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9279 "configure" -+#line 9219 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -9283,7 +9223,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -9326,12 +9266,12 @@ fi - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9330: checking for $ac_hdr" >&5 -+echo "configure:9270: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9335 "configure" -+#line 9275 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -9339,7 +9279,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -9382,12 +9322,12 @@ fi - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9386: checking for $ac_hdr" >&5 -+echo "configure:9326: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9391 "configure" -+#line 9331 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -9395,7 +9335,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -9435,12 +9375,12 @@ EOF - fi - - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:9439: checking for uint" >&5 -+echo "configure:9379: checking for uint" >&5 - if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9444 "configure" -+#line 9384 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -9448,7 +9388,7 @@ int main() { - uint foo = 0; - ; return 0; } - EOF --if { (eval echo configure:9452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint=true - else -@@ -9473,12 +9413,12 @@ else - echo "$ac_t""no" 1>&6 - fi - echo $ac_n "checking for uint_t""... $ac_c" 1>&6 --echo "configure:9477: checking for uint_t" >&5 -+echo "configure:9417: checking for uint_t" >&5 - if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9482 "configure" -+#line 9422 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <sys/types.h> -@@ -9486,7 +9426,7 @@ int main() { - uint_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:9490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_uint_t=true - else -@@ -9520,12 +9460,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - - - echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 --echo "configure:9524: checking for uname.domainname" >&5 -+echo "configure:9464: checking for uname.domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9529 "configure" -+#line 9469 "configure" - #include "confdefs.h" - #include <sys/utsname.h> - int main() { -@@ -9533,7 +9473,7 @@ int main() { - (void)uname(res); if (res != 0) { domain = res->domainname; } - ; return 0; } - EOF --if { (eval echo configure:9537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_domainname_field=true - else -@@ -9560,12 +9500,12 @@ else - fi - - echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 --echo "configure:9564: checking for uname.__domainname" >&5 -+echo "configure:9504: checking for uname.__domainname" >&5 - if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9569 "configure" -+#line 9509 "configure" - #include "confdefs.h" - #include <sys/utsname.h> - int main() { -@@ -9573,7 +9513,7 @@ int main() { - (void)uname(res); if (res != 0) { domain = res->__domainname; } - ; return 0; } - EOF --if { (eval echo configure:9577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_uname_us_domainname_field=true - else -@@ -9609,7 +9549,7 @@ cross_compiling=$ac_cv_prog_cc_cross - - if test "$GNU_CC"; then - echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 --echo "configure:9613: checking for visibility(hidden) attribute" >&5 -+echo "configure:9553: checking for visibility(hidden) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9637,7 +9577,7 @@ EOF - - - echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 --echo "configure:9641: checking for visibility(default) attribute" >&5 -+echo "configure:9581: checking for visibility(default) attribute" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9665,7 +9605,7 @@ EOF - - - echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 --echo "configure:9669: checking for visibility pragma support" >&5 -+echo "configure:9609: checking for visibility pragma support" >&5 - if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9690,7 +9630,7 @@ fi - echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 - if test "$ac_cv_visibility_pragma" = "yes"; then - echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 --echo "configure:9694: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 -+echo "configure:9634: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9718,7 +9658,7 @@ fi - echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 - - echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 --echo "configure:9722: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 -+echo "configure:9662: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 - if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9770,7 +9710,7 @@ fi # Sun Studio on Solaris - if test "$GNU_CC"; then - - echo $ac_n "checking for gcc PR49911""... $ac_c" 1>&6 --echo "configure:9774: checking for gcc PR49911" >&5 -+echo "configure:9714: checking for gcc PR49911" >&5 - ac_have_gcc_pr49911="no" - - ac_ext=C -@@ -9787,7 +9727,7 @@ if test "$cross_compiling" = yes; then - true - else - cat > conftest.$ac_ext <<EOF --#line 9791 "configure" -+#line 9731 "configure" - #include "confdefs.h" - - extern "C" void abort(void); -@@ -9828,7 +9768,7 @@ int main(void) { - } - - EOF --if { (eval echo configure:9832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - true - else -@@ -9865,12 +9805,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:9869: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:9809: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 9874 "configure" -+#line 9814 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -9878,7 +9818,7 @@ int main() { - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -9906,7 +9846,7 @@ done - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:9910: checking for opendir in -ldir" >&5 -+echo "configure:9850: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9914,7 +9854,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9918 "configure" -+#line 9858 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9925,7 +9865,7 @@ int main() { - opendir() - ; return 0; } - EOF --if { (eval echo configure:9929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9947,7 +9887,7 @@ fi - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:9951: checking for opendir in -lx" >&5 -+echo "configure:9891: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9955,7 +9895,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 9959 "configure" -+#line 9899 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -9966,7 +9906,7 @@ int main() { - opendir() - ; return 0; } - EOF --if { (eval echo configure:9970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10000,12 +9940,12 @@ esac - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10004: checking for $ac_hdr" >&5 -+echo "configure:9944: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10009 "configure" -+#line 9949 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -10013,7 +9953,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10048,12 +9988,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10052: checking for $ac_hdr" >&5 -+echo "configure:9992: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10057 "configure" -+#line 9997 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -10061,7 +10001,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10095,12 +10035,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10099: checking for $ac_hdr" >&5 -+echo "configure:10039: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10104 "configure" -+#line 10044 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -10108,7 +10048,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10141,12 +10081,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10145: checking for $ac_hdr" >&5 -+echo "configure:10085: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10150 "configure" -+#line 10090 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -10154,7 +10094,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10188,12 +10128,12 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10192: checking for $ac_hdr" >&5 -+echo "configure:10132: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10197 "configure" -+#line 10137 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -10201,7 +10141,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10241,12 +10181,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - NEW_H=new.h - ac_safe=`echo "new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for new""... $ac_c" 1>&6 --echo "configure:10245: checking for new" >&5 -+echo "configure:10185: checking for new" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10250 "configure" -+#line 10190 "configure" - #include "confdefs.h" - - #include <new> -@@ -10254,7 +10194,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10298,12 +10238,12 @@ fi - if test "x$enable_dtrace" = "xyes"; then - ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 --echo "configure:10302: checking for sys/sdt.h" >&5 -+echo "configure:10242: checking for sys/sdt.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10307 "configure" -+#line 10247 "configure" - #include "confdefs.h" - - #include <sys/sdt.h> -@@ -10311,7 +10251,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10353,12 +10293,12 @@ case $target in - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:10357: checking for $ac_hdr" >&5 -+echo "configure:10297: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10362 "configure" -+#line 10302 "configure" - #include "confdefs.h" - - #include <$ac_hdr> -@@ -10366,7 +10306,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10418,12 +10358,12 @@ CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES" - - ac_safe=`echo "linux/perf_event.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for linux/perf_event.h""... $ac_c" 1>&6 --echo "configure:10422: checking for linux/perf_event.h" >&5 -+echo "configure:10362: checking for linux/perf_event.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10427 "configure" -+#line 10367 "configure" - #include "confdefs.h" - - #include <linux/perf_event.h> -@@ -10431,7 +10371,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10446,19 +10386,19 @@ fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for perf_event_open system call""... $ac_c" 1>&6 --echo "configure:10450: checking for perf_event_open system call" >&5 -+echo "configure:10390: checking for perf_event_open system call" >&5 - if eval "test \"`echo '$''{'ac_cv_perf_event_open'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10455 "configure" -+#line 10395 "configure" - #include "confdefs.h" - #include <asm/unistd.h> - int main() { - return sizeof(__NR_perf_event_open); - ; return 0; } - EOF --if { (eval echo configure:10462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_perf_event_open=yes - else -@@ -10494,7 +10434,7 @@ case $target in - ;; - *) - echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 --echo "configure:10498: checking for gethostbyname_r in -lc_r" >&5 -+echo "configure:10438: checking for gethostbyname_r in -lc_r" >&5 - ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10502,7 +10442,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10506 "configure" -+#line 10446 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -10513,7 +10453,7 @@ int main() { - gethostbyname_r() - ; return 0; } - EOF --if { (eval echo configure:10517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10554,14 +10494,14 @@ case $target in - *) - - echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 --echo "configure:10558: checking for library containing dlopen" >&5 -+echo "configure:10498: checking for library containing dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_dlopen="no" - cat > conftest.$ac_ext <<EOF --#line 10565 "configure" -+#line 10505 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -10572,7 +10512,7 @@ int main() { - dlopen() - ; return 0; } - EOF --if { (eval echo configure:10576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_dlopen="none required" - else -@@ -10583,7 +10523,7 @@ rm -f conftest* - test "$ac_cv_search_dlopen" = "no" && for i in dl; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <<EOF --#line 10587 "configure" -+#line 10527 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -10594,7 +10534,7 @@ int main() { - dlopen() - ; return 0; } - EOF --if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_dlopen="-l$i" - break -@@ -10612,12 +10552,12 @@ if test "$ac_cv_search_dlopen" != "no"; then - test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 --echo "configure:10616: checking for dlfcn.h" >&5 -+echo "configure:10556: checking for dlfcn.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10621 "configure" -+#line 10561 "configure" - #include "confdefs.h" - - #include <dlfcn.h> -@@ -10625,7 +10565,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -10662,12 +10602,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE" - for ac_func in dladdr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:10666: checking for $ac_func" >&5 -+echo "configure:10606: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 10671 "configure" -+#line 10611 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -10690,7 +10630,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:10694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -10724,7 +10664,7 @@ if test ! "$GNU_CXX"; then - case $target in - *-aix*) - echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 --echo "configure:10728: checking for demangle in -lC_r" >&5 -+echo "configure:10668: checking for demangle in -lC_r" >&5 - ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10732,7 +10672,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lC_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10736 "configure" -+#line 10676 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -10743,7 +10683,7 @@ int main() { - demangle() - ; return 0; } - EOF --if { (eval echo configure:10747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10776,7 +10716,7 @@ fi - ;; - *) - echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 --echo "configure:10780: checking for demangle in -lC" >&5 -+echo "configure:10720: checking for demangle in -lC" >&5 - ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10784,7 +10724,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lC $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10788 "configure" -+#line 10728 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -10795,7 +10735,7 @@ int main() { - demangle() - ; return 0; } - EOF --if { (eval echo configure:10799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10834,7 +10774,7 @@ case $target in - ;; - *) - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:10838: checking for socket in -lsocket" >&5 -+echo "configure:10778: checking for socket in -lsocket" >&5 - ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -10842,7 +10782,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 10846 "configure" -+#line 10786 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -10853,7 +10793,7 @@ int main() { - socket() - ; return 0; } - EOF --if { (eval echo configure:10857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -10892,7 +10832,7 @@ darwin*) - *) - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:10896: checking for pthread_create in -lpthreads" >&5 -+echo "configure:10836: checking for pthread_create in -lpthreads" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10915,7 +10855,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:10919: checking for pthread_create in -lpthread" >&5 -+echo "configure:10859: checking for pthread_create in -lpthread" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10938,7 +10878,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:10942: checking for pthread_create in -lc_r" >&5 -+echo "configure:10882: checking for pthread_create in -lc_r" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -10961,7 +10901,7 @@ echo " - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:10965: checking for pthread_create in -lc" >&5 -+echo "configure:10905: checking for pthread_create in -lc" >&5 - echo " - #include <pthread.h> - #include <stdlib.h> -@@ -11020,7 +10960,7 @@ then - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:10964: checking whether ${CC-cc} accepts -pthread" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -11043,7 +10983,7 @@ echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 - ac_cv_have_dash_pthreads=no - if test "$ac_cv_have_dash_pthread" = "no"; then - echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 --echo "configure:11047: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:10987: checking whether ${CC-cc} accepts -pthreads" >&5 - echo 'int main() { return 0; }' | cat > conftest.c - ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 - if test $? -eq 0; then -@@ -11148,13 +11088,13 @@ fi - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:11152: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:11092: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <<EOF --#line 11158 "configure" -+#line 11098 "configure" - #include "confdefs.h" - #include <sgtty.h> - Autoconf TIOCGETP -@@ -11172,7 +11112,7 @@ rm -f conftest* - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF --#line 11176 "configure" -+#line 11116 "configure" - #include "confdefs.h" - #include <termio.h> - Autoconf TCGETA -@@ -11194,7 +11134,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:11198: checking for 8-bit clean memcmp" >&5 -+echo "configure:11138: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11202,7 +11142,7 @@ else - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <<EOF --#line 11206 "configure" -+#line 11146 "configure" - #include "confdefs.h" - - main() -@@ -11212,7 +11152,7 @@ main() - } - - EOF --if { (eval echo configure:11216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -11234,12 +11174,12 @@ for ac_func in fchmod flockfile getc_unlocked _getc_nolock getpagesize \ - stat64 statvfs statvfs64 strerror strtok_r truncate64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:11238: checking for $ac_func" >&5 -+echo "configure:11178: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11243 "configure" -+#line 11183 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -11262,7 +11202,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:11266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -11291,14 +11231,14 @@ done - - - cat > conftest.$ac_ext <<EOF --#line 11295 "configure" -+#line 11235 "configure" - #include "confdefs.h" - #include <windows.h> - int main() { - SYSTEMTIME st;FILETIME ft;SystemTimeToFileTime(&st,&ft); - ; return 0; } - EOF --if { (eval echo configure:11302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_systemtimetofiletime="yes" - else -@@ -11318,14 +11258,14 @@ EOF - - fi - cat > conftest.$ac_ext <<EOF --#line 11322 "configure" -+#line 11262 "configure" - #include "confdefs.h" - #include <windows.h> - int main() { - FILETIME ft;GetSystemTimeAsFileTime(&ft); - ; return 0; } - EOF --if { (eval echo configure:11329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_getsystemtimeasfiletime="yes" - else -@@ -11355,19 +11295,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 --echo "configure:11359: checking for wcrtomb" >&5 -+echo "configure:11299: checking for wcrtomb" >&5 - if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11364 "configure" -+#line 11304 "configure" - #include "confdefs.h" - #include <wchar.h> - int main() { - mbstate_t ps={0};wcrtomb(0,'f',&ps); - ; return 0; } - EOF --if { (eval echo configure:11371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_wcrtomb="yes" - else -@@ -11390,19 +11330,19 @@ EOF - - fi - echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 --echo "configure:11394: checking for mbrtowc" >&5 -+echo "configure:11334: checking for mbrtowc" >&5 - if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11399 "configure" -+#line 11339 "configure" - #include "confdefs.h" - #include <wchar.h> - int main() { - mbstate_t ps={0};mbrtowc(0,0,0,&ps); - ; return 0; } - EOF --if { (eval echo configure:11406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_have_mbrtowc="yes" - else -@@ -11434,12 +11374,12 @@ cross_compiling=$ac_cv_prog_cc_cross - fi - - echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 --echo "configure:11438: checking for res_ninit()" >&5 -+echo "configure:11378: checking for res_ninit()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11443 "configure" -+#line 11383 "configure" - #include "confdefs.h" - - #ifdef linux -@@ -11451,7 +11391,7 @@ int main() { - int foo = res_ninit(&_res); - ; return 0; } - EOF --if { (eval echo configure:11455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_res_ninit=yes - else -@@ -11484,12 +11424,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 --echo "configure:11488: checking for gnu_get_libc_version()" >&5 -+echo "configure:11428: checking for gnu_get_libc_version()" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11493 "configure" -+#line 11433 "configure" - #include "confdefs.h" - - #ifdef HAVE_GNU_LIBC_VERSION_H -@@ -11500,7 +11440,7 @@ int main() { - const char *glibc_version = gnu_get_libc_version(); - ; return 0; } - EOF --if { (eval echo configure:11504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_gnu_get_libc_version=yes - else -@@ -11534,7 +11474,7 @@ cross_compiling=$ac_cv_prog_cc_cross - - - echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 --echo "configure:11538: checking for an implementation of va_copy()" >&5 -+echo "configure:11478: checking for an implementation of va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11544,7 +11484,7 @@ else - - else - cat > conftest.$ac_ext <<EOF --#line 11548 "configure" -+#line 11488 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11558,7 +11498,7 @@ else - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_copy=yes - else -@@ -11575,7 +11515,7 @@ fi - - echo "$ac_t""$ac_cv_va_copy" 1>&6 - echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 --echo "configure:11579: checking for an implementation of __va_copy()" >&5 -+echo "configure:11519: checking for an implementation of __va_copy()" >&5 - if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11585,7 +11525,7 @@ else - - else - cat > conftest.$ac_ext <<EOF --#line 11589 "configure" -+#line 11529 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11599,7 +11539,7 @@ else - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv___va_copy=yes - else -@@ -11616,7 +11556,7 @@ fi - - echo "$ac_t""$ac_cv___va_copy" 1>&6 - echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 --echo "configure:11620: checking whether va_lists can be copied by value" >&5 -+echo "configure:11560: checking whether va_lists can be copied by value" >&5 - if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11626,7 +11566,7 @@ else - - else - cat > conftest.$ac_ext <<EOF --#line 11630 "configure" -+#line 11570 "configure" - #include "confdefs.h" - - #include <stdarg.h> -@@ -11640,7 +11580,7 @@ else - } - int main() { f (0, 42); return 0; } - EOF --if { (eval echo configure:11644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_va_val_copy=yes - else -@@ -11710,12 +11650,12 @@ ARM_ABI_PREFIX= - if test "$GNU_CC"; then - if test "$CPU_ARCH" = "arm" ; then - echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6 --echo "configure:11714: checking for ARM EABI" >&5 -+echo "configure:11654: checking for ARM EABI" >&5 - if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11719 "configure" -+#line 11659 "configure" - #include "confdefs.h" - - int main() { -@@ -11728,7 +11668,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:11732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_gcc_arm_eabi="yes" - else -@@ -11753,12 +11693,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 - fi - - echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 --echo "configure:11757: checking for modern C++ template specialization syntax support" >&5 -+echo "configure:11697: checking for modern C++ template specialization syntax support" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11762 "configure" -+#line 11702 "configure" - #include "confdefs.h" - template <class T> struct X { int a; }; - class Y {}; -@@ -11768,7 +11708,7 @@ X<int> int_x; - X<Y> y_x; - ; return 0; } - EOF --if { (eval echo configure:11772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_modern_specialize_template_syntax=yes - else -@@ -11786,12 +11726,12 @@ if test "$ac_cv_cpp_modern_specialize_template_syntax" = no ; then - fi - - echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 --echo "configure:11790: checking whether partial template specialization works" >&5 -+echo "configure:11730: checking whether partial template specialization works" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11795 "configure" -+#line 11735 "configure" - #include "confdefs.h" - template <class T> class Foo {}; - template <class T> class Foo<T*> {}; -@@ -11799,7 +11739,7 @@ int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:11803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_partial_specialization=yes - else -@@ -11823,12 +11763,12 @@ EOF - fi - - echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 --echo "configure:11827: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 -+echo "configure:11767: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11832 "configure" -+#line 11772 "configure" - #include "confdefs.h" - class X { - public: int go(const X&) {return 3;} -@@ -11844,7 +11784,7 @@ int main() { - X x; Y y; y.jo(x); - ; return 0; } - EOF --if { (eval echo configure:11848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cpp_ambiguity_resolving_using=yes - else -@@ -11868,7 +11808,7 @@ EOF - fi - - echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 --echo "configure:11872: checking for C++ dynamic_cast to void*" >&5 -+echo "configure:11812: checking for C++ dynamic_cast to void*" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11876,7 +11816,7 @@ else - ac_cv_cpp_dynamic_cast_void_ptr=no - else - cat > conftest.$ac_ext <<EOF --#line 11880 "configure" -+#line 11820 "configure" - #include "confdefs.h" - class X { int i; public: virtual ~X() { } }; - class Y { int j; public: virtual ~Y() { } }; -@@ -11892,7 +11832,7 @@ class X { int i; public: virtual ~X() { } }; - ((void*)&mdo == dynamic_cast<void*>(suby)))); - } - EOF --if { (eval echo configure:11896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:11836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_cpp_dynamic_cast_void_ptr=yes - else -@@ -11919,19 +11859,19 @@ fi - - - echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 --echo "configure:11923: checking whether C++ requires implementation of unused virtual methods" >&5 -+echo "configure:11863: checking whether C++ requires implementation of unused virtual methods" >&5 - if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11928 "configure" -+#line 11868 "configure" - #include "confdefs.h" - class X {private: virtual void never_called();}; - int main() { - X x; - ; return 0; } - EOF --if { (eval echo configure:11935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_cpp_unused_required=no - else -@@ -11957,12 +11897,12 @@ fi - - - echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 --echo "configure:11961: checking for trouble comparing to zero near std::operator!=()" >&5 -+echo "configure:11901: checking for trouble comparing to zero near std::operator!=()" >&5 - if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 11966 "configure" -+#line 11906 "configure" - #include "confdefs.h" - #include <algorithm> - template <class T> class Foo {}; -@@ -11973,7 +11913,7 @@ int main() { - Foo<int> f; return (0 != f); - ; return 0; } - EOF --if { (eval echo configure:11977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_trouble_comparing_to_zero=no - else -@@ -12003,19 +11943,19 @@ fi - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS" - echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6 --echo "configure:12007: checking for __thread keyword for TLS variables" >&5 -+echo "configure:11947: checking for __thread keyword for TLS variables" >&5 - if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12012 "configure" -+#line 11952 "configure" - #include "confdefs.h" - __thread bool tlsIsMainThread = false; - int main() { - return tlsIsMainThread; - ; return 0; } - EOF --if { (eval echo configure:12019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_thread_keyword=yes - else -@@ -12055,12 +11995,12 @@ fi - MALLOC_H= - ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for malloc.h""... $ac_c" 1>&6 --echo "configure:12059: checking for malloc.h" >&5 -+echo "configure:11999: checking for malloc.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12064 "configure" -+#line 12004 "configure" - #include "confdefs.h" - - #include <malloc.h> -@@ -12068,7 +12008,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:12072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -12091,12 +12031,12 @@ fi - if test "$MALLOC_H" = ""; then - ac_safe=`echo "malloc/malloc.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for malloc/malloc.h""... $ac_c" 1>&6 --echo "configure:12095: checking for malloc/malloc.h" >&5 -+echo "configure:12035: checking for malloc/malloc.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12100 "configure" -+#line 12040 "configure" - #include "confdefs.h" - - #include <malloc/malloc.h> -@@ -12104,7 +12044,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:12108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -12127,12 +12067,12 @@ fi - if test "$MALLOC_H" = ""; then - ac_safe=`echo "sys/malloc.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/malloc.h""... $ac_c" 1>&6 --echo "configure:12131: checking for sys/malloc.h" >&5 -+echo "configure:12071: checking for sys/malloc.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12136 "configure" -+#line 12076 "configure" - #include "confdefs.h" - - #include <sys/malloc.h> -@@ -12140,7 +12080,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:12144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -12176,12 +12116,12 @@ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - for ac_func in strndup posix_memalign memalign valloc - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:12180: checking for $ac_func" >&5 -+echo "configure:12120: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12185 "configure" -+#line 12125 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -12207,7 +12147,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:12211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -12237,19 +12177,19 @@ done - - - echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6 --echo "configure:12241: checking for __attribute__((always_inline))" >&5 -+echo "configure:12181: checking for __attribute__((always_inline))" >&5 - if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12246 "configure" -+#line 12186 "configure" - #include "confdefs.h" - inline void f(void) __attribute__((always_inline)); - int main() { - - ; return 0; } - EOF --if { (eval echo configure:12253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_attribute_always_inline=yes - else -@@ -12264,19 +12204,19 @@ fi - echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6 - - echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6 --echo "configure:12268: checking for __attribute__((malloc))" >&5 -+echo "configure:12208: checking for __attribute__((malloc))" >&5 - if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12273 "configure" -+#line 12213 "configure" - #include "confdefs.h" - void* f(int) __attribute__((malloc)); - int main() { - - ; return 0; } - EOF --if { (eval echo configure:12280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_attribute_malloc=yes - else -@@ -12291,19 +12231,19 @@ fi - echo "$ac_t""$ac_cv_attribute_malloc" 1>&6 - - echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6 --echo "configure:12295: checking for __attribute__((warn_unused_result))" >&5 -+echo "configure:12235: checking for __attribute__((warn_unused_result))" >&5 - if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12300 "configure" -+#line 12240 "configure" - #include "confdefs.h" - int f(void) __attribute__((warn_unused_result)); - int main() { - - ; return 0; } - EOF --if { (eval echo configure:12307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_attribute_warn_unused=yes - else -@@ -12327,19 +12267,19 @@ cross_compiling=$ac_cv_prog_cc_cross - - - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:12331: checking for LC_MESSAGES" >&5 -+echo "configure:12271: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12336 "configure" -+#line 12276 "configure" - #include "confdefs.h" - #include <locale.h> - int main() { - int category = LC_MESSAGES; - ; return 0; } - EOF --if { (eval echo configure:12343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_i18n_lc_messages=yes - else -@@ -12365,12 +12305,12 @@ fi - for ac_func in localeconv - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:12369: checking for $ac_func" >&5 -+echo "configure:12309: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 12374 "configure" -+#line 12314 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -12393,7 +12333,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:12397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -12580,7 +12520,7 @@ fi - # Extract the first word of "nspr-config", so it can be a program name with args. - set dummy nspr-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12584: checking for $ac_word" >&5 -+echo "configure:12524: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12615,7 +12555,7 @@ fi - - min_nspr_version=$NSPR_MINVER - echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 --echo "configure:12619: checking for NSPR - version >= $min_nspr_version" >&5 -+echo "configure:12559: checking for NSPR - version >= $min_nspr_version" >&5 - - no_nspr="" - if test "$NSPR_CONFIG" != "no"; then -@@ -12678,7 +12618,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $NSPR_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 12682 "configure" -+#line 12622 "configure" - #include "confdefs.h" - #include "prlog.h" - int main() { -@@ -12687,7 +12627,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:12691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_NATIVE_NSPR=1 - else -@@ -12729,7 +12669,7 @@ if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then - MOZ_NATIVE_ZLIB= - else - echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 --echo "configure:12733: checking for gzread in -lz" >&5 -+echo "configure:12673: checking for gzread in -lz" >&5 - ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -12737,7 +12677,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lz $LIBS" - cat > conftest.$ac_ext <<EOF --#line 12741 "configure" -+#line 12681 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -12748,7 +12688,7 @@ int main() { - gzread() - ; return 0; } - EOF --if { (eval echo configure:12752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -12772,7 +12712,7 @@ fi - if test "$MOZ_NATIVE_ZLIB" = 1; then - MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` - cat > conftest.$ac_ext <<EOF --#line 12776 "configure" -+#line 12716 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <string.h> -@@ -12783,7 +12723,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:12787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - MOZ_NATIVE_ZLIB=1 - else -@@ -12829,7 +12769,7 @@ if test -n "$MOZ_NATIVE_FFI"; then - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12833: checking for $ac_word" >&5 -+echo "configure:12773: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12873,19 +12813,19 @@ fi - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6 --echo "configure:12877: checking for libffi > 3.0.9" >&5 -+echo "configure:12817: checking for libffi > 3.0.9" >&5 - - if $PKG_CONFIG --exists "libffi > 3.0.9" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 --echo "configure:12884: checking MOZ_FFI_CFLAGS" >&5 -+echo "configure:12824: checking MOZ_FFI_CFLAGS" >&5 - MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"` - echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 --echo "configure:12889: checking MOZ_FFI_LIBS" >&5 -+echo "configure:12829: checking MOZ_FFI_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 -@@ -12921,7 +12861,7 @@ echo "configure:12889: checking MOZ_FFI_LIBS" >&5 - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:12925: checking for $ac_word" >&5 -+echo "configure:12865: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -12965,19 +12905,19 @@ fi - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6 --echo "configure:12969: checking for libffi >= 3.0.9" >&5 -+echo "configure:12909: checking for libffi >= 3.0.9" >&5 - - if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 --echo "configure:12976: checking MOZ_FFI_CFLAGS" >&5 -+echo "configure:12916: checking MOZ_FFI_CFLAGS" >&5 - MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"` - echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 --echo "configure:12981: checking MOZ_FFI_LIBS" >&5 -+echo "configure:12921: checking MOZ_FFI_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`" - echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 -@@ -13112,18 +13052,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" - - if test -n "$MOZ_DEBUG"; then - echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 --echo "configure:13116: checking for valid debug flags" >&5 -+echo "configure:13056: checking for valid debug flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" - cat > conftest.$ac_ext <<EOF --#line 13120 "configure" -+#line 13060 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:13127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:13067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -13201,18 +13141,18 @@ fi - if test "$COMPILE_ENVIRONMENT"; then - if test -n "$MOZ_OPTIMIZE"; then - echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 --echo "configure:13205: checking for valid optimization flags" >&5 -+echo "configure:13145: checking for valid optimization flags" >&5 - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" - cat > conftest.$ac_ext <<EOF --#line 13209 "configure" -+#line 13149 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:13216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:13156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _results=yes - else -@@ -13364,7 +13304,7 @@ EOF - fi - else - echo $ac_n "checking size of int *""... $ac_c" 1>&6 --echo "configure:13368: checking size of int *" >&5 -+echo "configure:13308: checking size of int *" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -13372,7 +13312,7 @@ else - ac_cv_sizeof_int_p=4 - else - cat > conftest.$ac_ext <<EOF --#line 13376 "configure" -+#line 13316 "configure" - #include "confdefs.h" - #include <stdio.h> - int main() -@@ -13383,7 +13323,7 @@ int main() - return(0); - } - EOF --if { (eval echo configure:13387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:13327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_int_p=`cat conftestval` - else -@@ -13687,12 +13627,12 @@ fi - if test -n "$MOZ_VALGRIND"; then - ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 --echo "configure:13691: checking for valgrind/valgrind.h" >&5 -+echo "configure:13631: checking for valgrind/valgrind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 13696 "configure" -+#line 13636 "configure" - #include "confdefs.h" - - #include <valgrind/valgrind.h> -@@ -13700,7 +13640,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:13704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:13644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -13973,7 +13913,7 @@ do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:13977: checking for $ac_word" >&5 -+echo "configure:13917: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14099,12 +14039,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - for ac_func in __cxa_demangle - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:14103: checking for $ac_func" >&5 -+echo "configure:14043: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 14108 "configure" -+#line 14048 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -14130,7 +14070,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:14134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -14184,12 +14124,12 @@ fi - if test -z "$SKIP_LIBRARY_CHECKS"; then - ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 --echo "configure:14188: checking for unwind.h" >&5 -+echo "configure:14128: checking for unwind.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 14193 "configure" -+#line 14133 "configure" - #include "confdefs.h" - - #include <unwind.h> -@@ -14197,7 +14137,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:14201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" - else -@@ -14214,12 +14154,12 @@ fi - for ac_func in _Unwind_Backtrace - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:14218: checking for $ac_func" >&5 -+echo "configure:14158: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 14223 "configure" -+#line 14163 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -14242,7 +14182,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:14246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -14334,7 +14274,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then - # Compiler Options - - echo $ac_n "checking for -pipe support""... $ac_c" 1>&6 --echo "configure:14338: checking for -pipe support" >&5 -+echo "configure:14278: checking for -pipe support" >&5 - if test -n "$GNU_CC" -a -n "$GNU_CXX"; then - CFLAGS="$CFLAGS -pipe" - CXXFLAGS="$CXXFLAGS -pipe" -@@ -14348,16 +14288,16 @@ _SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" - - echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 --echo "configure:14352: checking whether C compiler supports -fprofile-generate" >&5 -+echo "configure:14292: checking whether C compiler supports -fprofile-generate" >&5 - cat > conftest.$ac_ext <<EOF --#line 14354 "configure" -+#line 14294 "configure" - #include "confdefs.h" - - int main() { - return 0; - ; return 0; } - EOF --if { (eval echo configure:14361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - PROFILE_GEN_CFLAGS="-fprofile-generate" - result="yes" -@@ -14421,16 +14361,16 @@ if test "$_PEDANTIC"; then - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS -pedantic ${_WARNINGS_CXXFLAGS} -Wno-long-long" - echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 --echo "configure:14425: checking whether C++ compiler has -pedantic long long bug" >&5 -+echo "configure:14365: checking whether C++ compiler has -pedantic long long bug" >&5 - cat > conftest.$ac_ext <<EOF --#line 14427 "configure" -+#line 14367 "configure" - #include "confdefs.h" - $configure_static_assert_macros - int main() { - CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8) - ; return 0; } - EOF --if { (eval echo configure:14434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="no" - else -@@ -14457,12 +14397,12 @@ fi - _SAVE_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" - echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 --echo "configure:14461: checking for correct overload resolution with const and templates" >&5 -+echo "configure:14401: checking for correct overload resolution with const and templates" >&5 - if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 14466 "configure" -+#line 14406 "configure" - #include "confdefs.h" - - template <class T> -@@ -14492,7 +14432,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:14496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_nscap_nonconst_opeq_bug="no" - else -@@ -14518,19 +14458,19 @@ EOF - fi - - echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6 --echo "configure:14522: checking for tm_zone tm_gmtoff in struct tm" >&5 -+echo "configure:14462: checking for tm_zone tm_gmtoff in struct tm" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_tm_zone_tm_gmtoff'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 14527 "configure" -+#line 14467 "configure" - #include "confdefs.h" - #include <time.h> - int main() { - struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1; - ; return 0; } - EOF --if { (eval echo configure:14534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm_zone_tm_gmtoff="yes" - else -@@ -14572,18 +14512,18 @@ cross_compiling=$ac_cv_prog_cc_cross - - - echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 --echo "configure:14576: checking what kind of list files are supported by the linker" >&5 -+echo "configure:14516: checking what kind of list files are supported by the linker" >&5 - if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo "int main() {return 0;}" > conftest.${ac_ext} -- if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then -+ if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then - echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list -- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then - EXPAND_LIBS_LIST_STYLE=linkerscript - else - echo "conftest.${OBJ_SUFFIX}" > conftest.list -- if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then - EXPAND_LIBS_LIST_STYLE=list - else - EXPAND_LIBS_LIST_STYLE=none -@@ -14603,7 +14543,7 @@ LIBS_DESC_SUFFIX=desc - - if test "$GCC_USE_GNU_LD"; then - echo $ac_n "checking what kind of ordering can be done with the linker""... $ac_c" 1>&6 --echo "configure:14607: checking what kind of ordering can be done with the linker" >&5 -+echo "configure:14547: checking what kind of ordering can be done with the linker" >&5 - if eval "test \"`echo '$''{'EXPAND_LIBS_ORDER_STYLE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -14611,14 +14551,14 @@ else - _SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="${LDFLAGS} -Wl,--section-ordering-file,conftest.order" - cat > conftest.$ac_ext <<EOF --#line 14615 "configure" -+#line 14555 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:14622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - EXPAND_LIBS_ORDER_STYLE=section-ordering-file - else -@@ -14630,7 +14570,7 @@ fi - rm -f conftest* - LDFLAGS="$_SAVE_LDFLAGS" - if test -z "$EXPAND_LIBS_ORDER_STYLE"; then -- if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then - EXPAND_LIBS_ORDER_STYLE=linkerscript - else - EXPAND_LIBS_ORDER_STYLE=none -@@ -14741,7 +14681,7 @@ esac - if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then - if test -n "$JS_WANT_READLINE"; then - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 --echo "configure:14745: checking for readline in -lreadline" >&5 -+echo "configure:14685: checking for readline in -lreadline" >&5 - ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14749,7 +14689,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lreadline $LIBS" - cat > conftest.$ac_ext <<EOF --#line 14753 "configure" -+#line 14693 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -14760,7 +14700,7 @@ int main() { - readline() - ; return 0; } - EOF --if { (eval echo configure:14764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -14990,9 +14930,9 @@ EOF - - - echo $ac_n "checking for posix_fallocate""... $ac_c" 1>&6 --echo "configure:14994: checking for posix_fallocate" >&5 -+echo "configure:14934: checking for posix_fallocate" >&5 - cat > conftest.$ac_ext <<EOF --#line 14996 "configure" -+#line 14936 "configure" - #include "confdefs.h" - #define _XOPEN_SOURCE 600 - #include <fcntl.h> -@@ -15000,7 +14940,7 @@ int main() { - posix_fallocate(0, 0, 0); - ; return 0; } - EOF --if { (eval echo configure:15004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv___posix_fallocate=true - else -@@ -15029,7 +14969,7 @@ if test "$MOZ_X11"; then - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext <<EOF --#line 15033 "configure" -+#line 14973 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -15047,7 +14987,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:15051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:14991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 -@@ -15162,12 +15102,12 @@ fi - for ac_func in setlocale - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:15166: checking for $ac_func" >&5 -+echo "configure:15106: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 15171 "configure" -+#line 15111 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -15190,7 +15130,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:15194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -15220,12 +15160,12 @@ done - for ac_func in localeconv - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:15224: checking for $ac_func" >&5 -+echo "configure:15164: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 15229 "configure" -+#line 15169 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -15248,7 +15188,7 @@ $ac_func(); - - ; return 0; } - EOF --if { (eval echo configure:15252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else --- -1.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch deleted file mode 100644 index 6aeb2f683..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d4a15ad82292ff6d772dcc631df98754d20be31b Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Tue, 18 Mar 2014 11:46:05 -0400 -Subject: [PATCH 2/5] Move JS_BYTES_PER_WORD out of config.h - -Instead define it in terms of the already extant GNU C extension -__SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64 -bit packages of js are co-installed. ---- - -Upstream-status: Pending - - js/src/configure.in | 9 --------- - js/src/js-config.h.in | 1 - - js/src/jstypes.h | 12 ++++++++++++ - 3 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/js/src/configure.in b/js/src/configure.in -index 15605b2..64c7606 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -2345,15 +2345,6 @@ else - AC_MSG_RESULT(no) - fi - --MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8) --if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then -- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5) --elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then -- AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6) --else -- AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD]) --fi -- - MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16) - MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14) - -diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in -index 6889e00..4775420 100644 ---- a/js/src/js-config.h.in -+++ b/js/src/js-config.h.in -@@ -56,7 +56,6 @@ - #undef JS_INT32_TYPE - #undef JS_INT64_TYPE - #undef JS_INTPTR_TYPE --#undef JS_BYTES_PER_WORD - - /* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being - correct. */ -diff --git a/js/src/jstypes.h b/js/src/jstypes.h -index d0cf183..3e7928f 100644 ---- a/js/src/jstypes.h -+++ b/js/src/jstypes.h -@@ -24,6 +24,18 @@ - #include "mozilla/Util.h" - - #include "js-config.h" -+#ifndef JS_BYTES_PER_WORD -+#define JS_BYTES_PER_WORD __SIZEOF_POINTER__ -+#endif -+#ifndef JS_BITS_PER_WORD_LOG2 -+#if JS_BYTES_PER_WORD == 8 -+#define JS_BITS_PER_WORD_LOG2 6 -+#elif JS_BYTES_PER_WORD == 4 -+#define JS_BITS_PER_WORD_LOG2 5 -+#else -+#error Unhandled JS_BYTES_PER_WORD -+#endif -+#endif - - /*********************************************************************** - ** MACROS: JS_EXTERN_API --- -1.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-fix-cannot-find-link.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-fix-cannot-find-link.patch new file mode 100644 index 000000000..4f7ebc68d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-fix-cannot-find-link.patch @@ -0,0 +1,34 @@ +From e6dcee5f8a0f80ce99946b81fa1233611a149fe6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 12 Jul 2018 18:00:52 +0800 +Subject: [PATCH 2/5] fix cannot find link + +.. +|DEBUG: link: Trying 'mips64-wrs-linux-ld --sysroot=tmp-glibc/work/ +mips64-wrs-linux/mozjs/52.8.1-r0/recipe-sysroot ' +|ERROR: Cannot find link +... + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/moz.configure/checks.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/checks.configure b/build/moz.configure/checks.configure +index 8c2dbc0..83bffc3 100644 +--- a/build/moz.configure/checks.configure ++++ b/build/moz.configure/checks.configure +@@ -128,7 +128,7 @@ def check_prog(var, progs, what=None, input=None, allow_missing=False, + + for prog in value or progs: + log.debug('%s: Trying %s', var.lower(), quote(prog)) +- result = find_program(prog, paths) ++ result = find_program(prog.split()[0], paths) + if result: + return result + +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch deleted file mode 100644 index 6e724292a..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 15e710e331d36eb279852b5cd1ba37a9a6005217 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Mon, 2 Mar 2015 19:08:22 +0800 -Subject: [PATCH 3/5] Add AArch64 support - ---- -Upstream-status: Pending - - js/src/assembler/jit/ExecutableAllocator.h | 6 ++++++ - js/src/assembler/wtf/Platform.h | 4 ++++ - js/src/configure.in | 4 ++++ - mfbt/double-conversion/utils.h | 1 + - 4 files changed, 15 insertions(+) - -diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h -index c071c33..90764c3 100644 ---- a/js/src/assembler/jit/ExecutableAllocator.h -+++ b/js/src/assembler/jit/ExecutableAllocator.h -@@ -382,6 +382,12 @@ public: - { - reprotectRegion(start, size, Executable); - } -+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX -+ static void cacheFlush(void* code, size_t size) -+ { -+ intptr_t end = reinterpret_cast<intptr_t>(code) + size; -+ __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end)); -+ } - #else - static void makeWritable(void*, size_t) {} - static void makeExecutable(void*, size_t) {} -diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h -index 0c84896..e8763a7 100644 ---- a/js/src/assembler/wtf/Platform.h -+++ b/js/src/assembler/wtf/Platform.h -@@ -325,6 +325,10 @@ - #define WTF_THUMB_ARCH_VERSION 0 - #endif - -+/* CPU(AArch64) - 64-bit ARM */ -+#if defined(__aarch64__) -+#define WTF_CPU_AARCH64 1 -+#endif - - /* WTF_CPU_ARMV5_OR_LOWER - ARM instruction set v5 or earlier */ - /* On ARMv5 and below the natural alignment is required. -diff --git a/js/src/configure.in b/js/src/configure.in -index 64c7606..0673aca 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -1121,6 +1121,10 @@ arm*) - CPU_ARCH=arm - ;; - -+aarch64) -+ CPU_ARCH=aarch64 -+ ;; -+ - mips|mipsel) - CPU_ARCH="mips" - ;; -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h -index 0eec2d9..fe26dab 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h -@@ -58,6 +58,7 @@ - defined(__mips__) || defined(__powerpc__) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ -+ defined(__aarch64__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) --- -1.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch new file mode 100644 index 000000000..a754ff16c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-workaround-autoconf-2.13-detection-failed.patch @@ -0,0 +1,28 @@ +From 646a78262b18e19721cd41ee515215221dd241b6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 12 Jul 2018 18:12:42 +0800 +Subject: [PATCH 3/5] workaround autoconf 2.13 detection failed + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/moz.configure/old.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure +index b32c3f7..ece47f4 100644 +--- a/build/moz.configure/old.configure ++++ b/build/moz.configure/old.configure +@@ -31,7 +31,7 @@ def autoconf(mozconfig, autoconf): + autoconf = autoconf[0] if autoconf else None + + for ac in (mozconfig_autoconf, autoconf, 'autoconf-2.13', 'autoconf2.13', +- 'autoconf213'): ++ 'autoconf213', 'autoconf'): + if ac: + autoconf = find_program(ac) + if autoconf: +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch new file mode 100644 index 000000000..4cba79c5b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch @@ -0,0 +1,42 @@ +From a46adb74b5ba5e17d676d31d70faca76c1381d15 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 12 Jul 2018 21:25:46 +0800 +Subject: [PATCH 4/5] do not use autoconf 2.13 to refresh old.configure + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/moz.configure/old.configure | 2 +- + js/src/old-configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure +index ece47f4..a73900f 100644 +--- a/build/moz.configure/old.configure ++++ b/build/moz.configure/old.configure +@@ -83,7 +83,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, + old_configure = os.path.join(old_configure_dir, 'js', 'src', + os.path.basename(old_configure)) + +- refresh = True ++ refresh = False + if exists(old_configure): + mtime = getmtime(old_configure) + aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', +diff --git a/js/src/old-configure b/js/src/old-configure +index 75b00e1..8a8ef52 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -619,7 +619,7 @@ if test -z "$srcdir"; then + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. +- srcdir=$ac_confdir ++ srcdir="$ac_confdir/../../" + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch deleted file mode 100644 index 8bd35d405..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 0128c5a9eeee0d3fc0deb9129dd20eb79338c8f4 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Mon, 2 Mar 2015 19:08:59 +0800 -Subject: [PATCH 4/5] mozbug746112-no-decommit-on-large-pages - ---- -Upstream-status: Pending - - js/src/gc/Heap.h | 15 ++++++++++----- - js/src/jsgc.cpp | 15 ++++++++++++--- - 2 files changed, 22 insertions(+), 8 deletions(-) - -diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h -index b8f8c78..1cfd269 100644 ---- a/js/src/gc/Heap.h -+++ b/js/src/gc/Heap.h -@@ -103,26 +103,31 @@ struct Cell - }; - - /* -- * Page size is 4096 by default, except for SPARC, where it is 8192. -+ * Page size must be static to support our arena pointer optimizations, so we -+ * are forced to support each platform with non-4096 pages as a special case. -+ * Note: The freelist supports a maximum arena shift of 15. - * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. - * Bug 692267: Move page size definition to gc/Memory.h and include it - * directly once jsgc.h is no longer an installed header. - */ - #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) - const size_t PageShift = 13; -+const size_t ArenaShift = PageShift; -+#elif defined(__powerpc__) -+const size_t PageShift = 16; -+const size_t ArenaShift = 12; - #else - const size_t PageShift = 12; -+const size_t ArenaShift = PageShift; - #endif - const size_t PageSize = size_t(1) << PageShift; -+const size_t ArenaSize = size_t(1) << ArenaShift; -+const size_t ArenaMask = ArenaSize - 1; - - const size_t ChunkShift = 20; - const size_t ChunkSize = size_t(1) << ChunkShift; - const size_t ChunkMask = ChunkSize - 1; - --const size_t ArenaShift = PageShift; --const size_t ArenaSize = PageSize; --const size_t ArenaMask = ArenaSize - 1; -- - /* - * This is the maximum number of arenas we allow in the FreeCommitted state - * before we trigger a GC_SHRINK to release free arenas to the OS. -diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp -index b3caf05..a258d2d 100644 ---- a/js/src/jsgc.cpp -+++ b/js/src/jsgc.cpp -@@ -251,6 +251,13 @@ static const int BackgroundPhaseLength[] = { - sizeof(BackgroundPhaseStrings) / sizeof(AllocKind) - }; - -+/* Unused memory decommiting requires the arena size match the page size. */ -+static bool -+DecommitEnabled() -+{ -+ return PageSize == ArenaSize; -+} -+ - #ifdef DEBUG - void - ArenaHeader::checkSynchronizedWithFreeList() const -@@ -742,7 +749,8 @@ Chunk::fetchNextDecommittedArena() - decommittedArenas.unset(offset); - - Arena *arena = &arenas[offset]; -- MarkPagesInUse(arena, ArenaSize); -+ if (DecommitEnabled()) -+ MarkPagesInUse(arena, ArenaSize); - arena->aheader.setAsNotAllocated(); - - return &arena->aheader; -@@ -2731,7 +2739,7 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) - chunk->removeFromAvailableList(); - - size_t arenaIndex = Chunk::arenaIndex(aheader->arenaAddress()); -- bool ok; -+ bool ok = true; - { - /* - * If the main thread waits for the decommit to finish, skip -@@ -2741,7 +2749,8 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) - Maybe<AutoUnlockGC> maybeUnlock; - if (!rt->isHeapBusy()) - maybeUnlock.construct(rt); -- ok = MarkPagesUnused(aheader->getArena(), ArenaSize); -+ if (DecommitEnabled()) -+ ok = MarkPagesUnused(aheader->getArena(), ArenaSize); - } - - if (ok) { --- -1.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch deleted file mode 100644 index bc99ecc50..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9c42920c2b635a399bd1f93833efdeb1696f17ee Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Mon, 2 Mar 2015 19:09:57 +0800 -Subject: [PATCH 5/5] aarch64-64k-page - ---- -Upstream-status: Pending - - js/src/gc/Heap.h | 2 +- - js/src/gc/Memory.cpp | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h -index 1cfd269..f4dbcda 100644 ---- a/js/src/gc/Heap.h -+++ b/js/src/gc/Heap.h -@@ -113,7 +113,7 @@ struct Cell - #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) - const size_t PageShift = 13; - const size_t ArenaShift = PageShift; --#elif defined(__powerpc__) -+#elif defined(__powerpc__) || defined(__aarch64__) - const size_t PageShift = 16; - const size_t ArenaShift = 12; - #else -diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..e5ad018 100644 ---- a/js/src/gc/Memory.cpp -+++ b/js/src/gc/Memory.cpp -@@ -302,8 +302,11 @@ GetPageFaultCount() - void - InitMemorySubsystem() - { -+ /* aarch64 may have 64KB or 4KB pages */ -+#ifndef __aarch64__ - if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) - MOZ_CRASH(); -+#endif - } - - void * --- -1.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch new file mode 100644 index 000000000..38e4698f2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch @@ -0,0 +1,38 @@ +From 55d833dc3c194f1eb7841f308ad3b9ec3800d3b3 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 13 Jul 2018 15:48:32 +0800 +Subject: [PATCH 5/5] fix do_compile failed on mips + +Link with var-OS_LDFLAGS to fix the issue. +Such as on mips: +... +|mips-wrsmllib32-linux-g++ -meb -mabi=32 -mhard-float ... -o libmozjs-52.so +|/usr/include/c++/8.1.0/bits/atomic_base.h:514: error: undefined +reference to '__atomic_fetch_add_8' +... + +In recipe, set OS_LDFLAGS="-Wl,-latomic" could fix the issue. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + config/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/config.mk b/config/config.mk +index 4e3fd1a..d847ffa 100644 +--- a/config/config.mk ++++ b/config/config.mk +@@ -523,7 +523,7 @@ EXPAND_MKSHLIB_ARGS = --uselist + ifdef SYMBOL_ORDER + EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) + endif +-EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) ++EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) $(OS_LDFLAGS) + + # $(call CHECK_SYMBOLS,lib,PREFIX,dep_name,test) + # Checks that the given `lib` doesn't contain dependency on symbols with a +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch new file mode 100644 index 000000000..32a977ce2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch @@ -0,0 +1,158 @@ +From 04e8a611e958f0da1ccac61acae3a6f1a5168b20 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 13 Jul 2018 18:08:14 +0800 +Subject: [PATCH] support musl + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + memory/jemalloc/src/src/pages.c | 1 - + memory/mozjemalloc/jemalloc.c | 7 +++---- + mozglue/misc/TimeStamp_darwin.cpp | 1 - + mozglue/misc/TimeStamp_posix.cpp | 1 - + nsprpub/pr/src/misc/prsystem.c | 1 - + python/psutil/psutil/_psutil_bsd.c | 1 - + python/psutil/psutil/_psutil_osx.c | 1 - + python/psutil/psutil/arch/bsd/process_info.c | 1 - + python/psutil/psutil/arch/osx/process_info.c | 1 - + 9 files changed, 3 insertions(+), 12 deletions(-) + +diff --git a/memory/jemalloc/src/src/pages.c b/memory/jemalloc/src/src/pages.c +index 647952a..7b964c8 100644 +--- a/memory/jemalloc/src/src/pages.c ++++ b/memory/jemalloc/src/src/pages.c +@@ -2,7 +2,6 @@ + #include "jemalloc/internal/jemalloc_internal.h" + + #ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT +-#include <sys/sysctl.h> + #endif + + /******************************************************************************/ +diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c +index 5d4d83a..c618de9 100644 +--- a/memory/mozjemalloc/jemalloc.c ++++ b/memory/mozjemalloc/jemalloc.c +@@ -332,7 +332,6 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib/malloc.c 180599 2008-07-18 19:35:44Z ja + #include <sys/time.h> + #include <sys/types.h> + #if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) +-#include <sys/sysctl.h> + #endif + #include <sys/uio.h> + #ifndef MOZ_MEMORY +@@ -674,7 +673,7 @@ static bool malloc_initialized = false; + #elif defined(MOZ_MEMORY_DARWIN) + static malloc_mutex_t init_lock = {OS_SPINLOCK_INIT}; + #elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) +-static malloc_mutex_t init_lock = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; ++static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; + #elif defined(MOZ_MEMORY) + static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; + #else +@@ -1644,7 +1643,7 @@ malloc_mutex_init(malloc_mutex_t *mutex) + pthread_mutexattr_t attr; + if (pthread_mutexattr_init(&attr) != 0) + return (true); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); + if (pthread_mutex_init(mutex, &attr) != 0) { + pthread_mutexattr_destroy(&attr); + return (true); +@@ -1709,7 +1708,7 @@ malloc_spin_init(malloc_spinlock_t *lock) + pthread_mutexattr_t attr; + if (pthread_mutexattr_init(&attr) != 0) + return (true); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); + if (pthread_mutex_init(lock, &attr) != 0) { + pthread_mutexattr_destroy(&attr); + return (true); +diff --git a/mozglue/misc/TimeStamp_darwin.cpp b/mozglue/misc/TimeStamp_darwin.cpp +index f30bc98..3998c9c 100644 +--- a/mozglue/misc/TimeStamp_darwin.cpp ++++ b/mozglue/misc/TimeStamp_darwin.cpp +@@ -18,7 +18,6 @@ + + #include <mach/mach_time.h> + #include <sys/time.h> +-#include <sys/sysctl.h> + #include <time.h> + #include <unistd.h> + +diff --git a/mozglue/misc/TimeStamp_posix.cpp b/mozglue/misc/TimeStamp_posix.cpp +index 05dedde..d9e30f2 100644 +--- a/mozglue/misc/TimeStamp_posix.cpp ++++ b/mozglue/misc/TimeStamp_posix.cpp +@@ -21,7 +21,6 @@ + #if defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) + #include <sys/param.h> +-#include <sys/sysctl.h> + #endif + + #if defined(__DragonFly__) || defined(__FreeBSD__) +diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c +index eba85fb..54b57bb 100644 +--- a/nsprpub/pr/src/misc/prsystem.c ++++ b/nsprpub/pr/src/misc/prsystem.c +@@ -27,7 +27,6 @@ + || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN) + #define _PR_HAVE_SYSCTL + #include <sys/param.h> +-#include <sys/sysctl.h> + #endif + + #if defined(DARWIN) +diff --git a/python/psutil/psutil/_psutil_bsd.c b/python/psutil/psutil/_psutil_bsd.c +index 7b6e561..0a91262 100644 +--- a/python/psutil/psutil/_psutil_bsd.c ++++ b/python/psutil/psutil/_psutil_bsd.c +@@ -16,7 +16,6 @@ + #include <fcntl.h> + #include <paths.h> + #include <sys/types.h> +-#include <sys/sysctl.h> + #include <sys/param.h> + #include <sys/user.h> + #include <sys/proc.h> +diff --git a/python/psutil/psutil/_psutil_osx.c b/python/psutil/psutil/_psutil_osx.c +index 3ebf8ff..b3910ba 100644 +--- a/python/psutil/psutil/_psutil_osx.c ++++ b/python/psutil/psutil/_psutil_osx.c +@@ -13,7 +13,6 @@ + #include <stdlib.h> + #include <stdio.h> + #include <utmpx.h> +-#include <sys/sysctl.h> + #include <sys/vmmeter.h> + #include <libproc.h> + #include <sys/proc_info.h> +diff --git a/python/psutil/psutil/arch/bsd/process_info.c b/python/psutil/psutil/arch/bsd/process_info.c +index 4d73924..46f288d 100644 +--- a/python/psutil/psutil/arch/bsd/process_info.c ++++ b/python/psutil/psutil/arch/bsd/process_info.c +@@ -15,7 +15,6 @@ + #include <stdio.h> + #include <string.h> + #include <sys/types.h> +-#include <sys/sysctl.h> + #include <sys/param.h> + #include <sys/user.h> + #include <sys/proc.h> +diff --git a/python/psutil/psutil/arch/osx/process_info.c b/python/psutil/psutil/arch/osx/process_info.c +index b6dd5bb..62a838f 100644 +--- a/python/psutil/psutil/arch/osx/process_info.c ++++ b/python/psutil/psutil/arch/osx/process_info.c +@@ -16,7 +16,6 @@ + #include <stdlib.h> + #include <stdio.h> + #include <signal.h> +-#include <sys/sysctl.h> + #include <libproc.h> + + #include "process_info.h" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch index 6432e1fb7..9194e346a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch @@ -1,4 +1,4 @@ -From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001 +From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001 From: Maciej Borzecki <maciej.borzecki@open-rnd.pl> Date: Tue, 5 Jan 2016 22:04:17 +0100 Subject: [PATCH] fix cross compilation on i586 targets @@ -10,37 +10,26 @@ regenerate configure, similar fix is applied there. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl> + +Rebase to 52.8.1 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - js/src/configure | 2 +- - js/src/configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + js/src/old-configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/js/src/configure b/js/src/configure -index d019b0fdba44233596541de94307010d85a8e32e..5aa40f757a3dbb7d6887175046f44212c15c2eac 100755 ---- a/js/src/configure -+++ b/js/src/configure -@@ -5555,7 +5555,7 @@ TARGET_MD_ARCH=unix +diff --git a/js/src/old-configure b/js/src/old-configure +index 8a8ef52..d7afcff 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -3964,7 +3964,7 @@ IMPORT_LIB_SUFFIX= DIRENT_INO=d_ino MOZ_USER_DIR=".mozilla" --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' -+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' - - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' - -diff --git a/js/src/configure.in b/js/src/configure.in -index 0673aca12f6d83035549ade2a4a83906bf91f0f0..39b22724f9535ac1a6dba04658c91e4ef667fc47 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -919,7 +919,7 @@ TARGET_MD_ARCH=unix - DIRENT_INO=d_ino - 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" --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' -+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' -- -2.5.0 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch deleted file mode 100644 index 83f454319..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 1d1fa95c8ff7697e46343385a79a8f7e5c514a87 Mon Sep 17 00:00:00 2001 -From: Zheng Xu <zheng.xu@linaro.org> -Date: Fri, 2 Sep 2016 17:40:05 +0800 -Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits - are clear. r=ehoogeveen - -There might be 48-bit VA on arm64 depending on kernel configuration. -Manually mmap heap memory to align with the assumption made by JS engine. - -Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146 - -Upstream-status: Backport - ---- - js/src/gc/Memory.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 71 insertions(+), 2 deletions(-) - -diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index e5ad018..4149adf 100644 ---- a/js/src/gc/Memory.cpp -+++ b/js/src/gc/Memory.cpp -@@ -309,6 +309,75 @@ InitMemorySubsystem() - #endif - } - -+static inline void * -+MapMemory(size_t length, int prot, int flags, int fd, off_t offset) -+{ -+#if defined(__ia64__) -+ /* -+ * The JS engine assumes that all allocated pointers have their high 17 bits clear, -+ * which ia64's mmap doesn't support directly. However, we can emulate it by passing -+ * mmap an "addr" parameter with those bits clear. The mmap will return that address, -+ * or the nearest available memory above that address, providing a near-guarantee -+ * that those bits are clear. If they are not, we return NULL below to indicate -+ * out-of-memory. -+ * -+ * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual -+ * address space. -+ * -+ * See Bug 589735 for more information. -+ */ -+ void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset); -+ if (region == MAP_FAILED) -+ return MAP_FAILED; -+ /* -+ * If the allocated memory doesn't have its upper 17 bits clear, consider it -+ * as out of memory. -+ */ -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ JS_ALWAYS_TRUE(0 == munmap(region, length)); -+ return MAP_FAILED; -+ } -+ return region; -+#elif defined(__aarch64__) -+ /* -+ * There might be similar virtual address issue on arm64 which depends on -+ * hardware and kernel configurations. But the work around is slightly -+ * different due to the different mmap behavior. -+ * -+ * TODO: Merge with the above code block if this implementation works for -+ * ia64 and sparc64. -+ */ -+ const uintptr_t start = UINT64_C(0x0000070000000000); -+ const uintptr_t end = UINT64_C(0x0000800000000000); -+ const uintptr_t step = ChunkSize; -+ /* -+ * Optimization options if there are too many retries in practice: -+ * 1. Examine /proc/self/maps to find an available address. This file is -+ * not always available, however. In addition, even if we examine -+ * /proc/self/maps, we may still need to retry several times due to -+ * racing with other threads. -+ * 2. Use a global/static variable with lock to track the addresses we have -+ * allocated or tried. -+ */ -+ uintptr_t hint; -+ void* region = MAP_FAILED; -+ for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) { -+ region = mmap((void*)hint, length, prot, flags, fd, offset); -+ if (region != MAP_FAILED) { -+ if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) { -+ if (munmap(region, length)) { -+ MOZ_ASSERT(errno == ENOMEM); -+ } -+ region = MAP_FAILED; -+ } -+ } -+ } -+ return region == MAP_FAILED ? NULL : region; -+#else -+ return mmap(NULL, length, prot, flags, fd, offset); -+#endif -+} -+ - void * - MapAlignedPages(size_t size, size_t alignment) - { -@@ -322,12 +391,12 @@ MapAlignedPages(size_t size, size_t alignment) - - /* Special case: If we want page alignment, no further work is needed. */ - if (alignment == PageSize) { -- return mmap(NULL, size, prot, flags, -1, 0); -+ return MapMemory(size, prot, flags, -1, 0); - } - - /* Overallocate and unmap the region's edges. */ - size_t reqSize = Min(size + 2 * alignment, 2 * size); -- void *region = mmap(NULL, reqSize, prot, flags, -1, 0); -+ void *region = MapMemory(reqSize, prot, flags, -1, 0); - if (region == MAP_FAILED) - return NULL; - diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch new file mode 100644 index 000000000..4354a9dee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch @@ -0,0 +1,70 @@ +Add RISC-V support + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1318905] + +Signed-off-by: Ricardo Salveti <ricardo@foundries.io> + +diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess +index d5d667d..1277a86 100755 +--- a/build/autoconf/config.guess ++++ b/build/autoconf/config.guess +@@ -1029,6 +1029,9 @@ EOF + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 6fe6591..56e6730 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -362,6 +362,9 @@ def split_triplet(triplet): + elif cpu.startswith('aarch64'): + canonical_cpu = 'aarch64' + endianness = 'little' ++ elif cpu in ('riscv32', 'riscv64'): ++ canonical_cpu = cpu ++ endianness = 'little' + else: + die('Unknown CPU type: %s' % cpu) + +diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +index 15dd4bf..4f37218 100644 +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -60,7 +60,8 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || defined(__aarch64__) ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index dfc7cf8..4f8d666 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -48,6 +48,8 @@ CPU_bitness = { + 'mips64': 64, + 'ppc': 32, + 'ppc64': 64, ++ 'riscv32': 32, ++ 'riscv64': 64, + 's390': 32, + 's390x': 64, + 'sparc': 32, +@@ -79,6 +81,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('s390', '__s390__'), + ('ppc64', '__powerpc64__'), + ('ppc', '__powerpc__'), ++ ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), ++ ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), + ('Alpha', '__alpha__'), + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch new file mode 100644 index 000000000..5487cdbe6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch @@ -0,0 +1,74 @@ +From 2fb531ac753500314336ccd508cb2d53f5e768e5 Mon Sep 17 00:00:00 2001 +From: Till Schneidereit <till@tillschneidereit.net> +Date: Thu, 1 Oct 2015 12:59:09 +0200 +Subject: Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all platforms + +Otherwise, build fails not being able to find HashBytes. + +Patch ported forward to mozjs52 by Philip Chimento +<philip.chimento@gmail.com>. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 + +Upstream-Status: Backport + +Signed-off-by: Ricardo Salveti <ricardo@foundries.io> +--- + js/src/old-configure | 20 ++++++++++++-------- + mozglue/build/moz.build | 2 +- + 2 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/js/src/old-configure b/js/src/old-configure +index d7afcff..8a6f142 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -8546,21 +8546,25 @@ if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then + fi + + +-case "${OS_TARGET}" in +-Android|WINNT|Darwin) ++if test "$JS_STANDALONE"; then + MOZ_GLUE_IN_PROGRAM= +- ;; +-*) +- MOZ_GLUE_IN_PROGRAM=1 +- cat >> confdefs.pytmp <<\EOF ++else ++ case "${OS_TARGET}" in ++ Android|WINNT|Darwin) ++ MOZ_GLUE_IN_PROGRAM= ++ ;; ++ *) ++ MOZ_GLUE_IN_PROGRAM=1 ++ cat >> confdefs.pytmp <<\EOF + (''' MOZ_GLUE_IN_PROGRAM ''', ' 1 ') + EOF + cat >> confdefs.h <<\EOF + #define MOZ_GLUE_IN_PROGRAM 1 + EOF + +- ;; +-esac ++ ;; ++ esac ++fi + + if test "$MOZ_MEMORY"; then + if test "x$MOZ_DEBUG" = "x1"; then +diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build +index d289747..e3be5a2 100644 +--- a/mozglue/build/moz.build ++++ b/mozglue/build/moz.build +@@ -6,7 +6,7 @@ + + # Build mozglue as a shared lib on Windows, OSX and Android. + # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in +-if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): ++if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']: + SharedLibrary('mozglue') + else: + Library('mozglue') +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch deleted file mode 100644 index 43c459042..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch +++ /dev/null @@ -1,18 +0,0 @@ -fix the compile error of powerpc64 - -Upstream-status: Accepted - - fix the following error - |error: 'jsuword' does not name a type - - ---- a/js/src/jsval.hold 2015-04-24 01:15:06.692970731 -0500 -+++ b/js/src/jsval.h 2015-04-24 01:15:41.792969478 -0500 -@@ -304,7 +304,6 @@ - int32_t i32; - uint32_t u32; - JSWhyMagic why; -- jsuword word; - } payload; - } s; - double asDouble; diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch deleted file mode 100644 index abde01bcd..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix the compile error do to perl update - -Upstream-status: Inappropriate - - -Signed-of-by: Armin Kuster <akuster808@gmail.com> - -Index: src/config/milestone.pl -=================================================================== ---- src.orig/config/milestone.pl -+++ src/config/milestone.pl -@@ -55,7 +55,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi - # - my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); - --if (defined(@TEMPLATE_FILE)) { -+if (@TEMPLATE_FILE) { - my $TFILE; - - foreach $TFILE (@TEMPLATE_FILE) { diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb deleted file mode 100644 index 49b7f156e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" -HOMEPAGE = "http://www.mozilla.org/js/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/${BPN}${PV}.tar.gz \ - file://0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch \ - file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ - file://0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch;patchdir=../../ \ - file://0003-Add-AArch64-support.patch;patchdir=../../ \ - file://0004-mozbug746112-no-decommit-on-large-pages.patch;patchdir=../../ \ - file://0005-aarch64-64k-page.patch;patchdir=../../ \ - file://0001-regenerate-configure.patch;patchdir=../../ \ - file://fix-the-compile-error-of-powerpc64.patch;patchdir=../../ \ - file://fix_milestone_compile_issue.patch \ - file://0010-fix-cross-compilation-on-i586-targets.patch;patchdir=../../ \ - file://Manually_mmap_heap_memory_esr17.patch;patchdir=../../ \ - file://0001-compare-the-first-character-of-string-to-be-null-or-.patch;patchdir=../../ \ - " - -SRC_URI[md5sum] = "20b6f8f1140ef6e47daa3b16965c9202" -SRC_URI[sha256sum] = "321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba" - -S = "${WORKDIR}/${BPN}${PV}/js/src" - -inherit autotools pkgconfig perlnative pythonnative - -DEPENDS += "nspr zlib" - -# Host specific flags need to be defined, otherwise target flags will be passed to the host -export HOST_CFLAGS = "${BUILD_CFLAGS}" -export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" -export HOST_LDFLAGS = "${BUILD_LDFLAGS}" - -# nspr's package-config is ignored so set libs manually -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ - --build=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ - --enable-threadsafe \ - --disable-static \ -" -EXTRA_OECONF_append_armv4 = " \ - --disable-methodjit \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" - -# mozjs requires autoreconf 2.13 -do_configure() { - export HOST_CFLAGS="${BUILD_CFLAGS}" - export HOST_CXXFLAGS="${BUILD_CPPFLAGS}" - export HOST_LDFLAGS="${BUILD_LDFLAGS}" - ( cd ${S} - gnu-configize --force - mv config.guess config.sub build/autoconf ) - ${S}/configure ${EXTRA_OECONF} -} - -# patch.bbclass will try to apply the patches already present and fail, so clean them out -do_unpack() { - tar -xvf ${DL_DIR}/mozjs17.0.0.tar.gz -C ${WORKDIR}/ - rm -rf ${WORKDIR}/${BPN}${PV}/patches -} - - -PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} += "${libdir}/lib*.so" -FILES_${PN}-dev += "${bindir}/js17-config" - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:2172: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r2,r1,LSR#20' -#| {standard input}:2173: Error: unshifted register required -- `bic r2,r2,#(1<<11)' -#| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' -#| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' -#| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb new file mode 100644 index 000000000..0dfe2f848 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb @@ -0,0 +1,111 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" + +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.orig.tar.xz \ + file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ + file://0010-fix-cross-compilation-on-i586-targets.patch \ + file://0001-do-not-create-python-environment.patch \ + file://0002-fix-cannot-find-link.patch \ + file://0003-workaround-autoconf-2.13-detection-failed.patch \ + file://0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch \ + file://0005-fix-do_compile-failed-on-mips.patch \ + file://disable-mozglue-in-stand-alone-builds.patch \ + file://add-riscv-support.patch \ + file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ + " +SRC_URI_append_libc-musl = " \ + file://0006-support-musl.patch \ + " +SRC_URI_append_mipsarchn32 = " \ + file://0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ + " + +SRC_URI[md5sum] = "c9473c625ee0a9edaaac8b742ff24c5f" +SRC_URI[sha256sum] = "f9324a6724233ab15f10381fe13e635e89d725ef1e78025a0a7d36c58a84a0f9" + +inherit autotools pkgconfig perlnative pythonnative + +inherit distro_features_check +CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" + +DEPENDS += "nspr zlib" + +# Disable null pointer optimization in gcc >= 6 +# https://bugzilla.redhat.com/show_bug.cgi?id=1328045 +CFLAGS += "-fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks" +CXXFLAGS += "-fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks" + +# nspr's package-config is ignored so set libs manually +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --disable-tests \ + --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},,virtual/libx11" + +EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" +EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" + +do_configure() { + export SHELL="/bin/sh" + export TMP="${B}" + ${S}/js/src/configure ${EXTRA_OECONF} +} + +do_compile_prepend() { + export SHELL="/bin/sh" + export S + export PYTHONPATH + cd ${S} + for sub_dir in python testing/mozbase; do + for module_dir in `ls $sub_dir -1`;do + [ $module_dir = "virtualenv" ] && continue + if [ -d "${S}/$sub_dir/$module_dir" ];then + PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" + fi + done + done + PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + cd - +} + +do_install_prepend() { + export SHELL="/bin/sh" + export S + export PYTHONPATH + cd ${S} + for sub_dir in python testing/mozbase; do + for module_dir in `ls $sub_dir -1`;do + [ $module_dir = "virtualenv" ] && continue + if [ -d "${S}/$sub_dir/$module_dir" ];then + PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" + fi + done + done + PYTHONPATH="$PYTHONPATH:${S}/config:${S}/build" + cd - +} + +PACKAGES =+ "lib${BPN}" +FILES_lib${BPN} += "${libdir}/lib*.so" +FILES_${PN}-dev += "${bindir}/js52-config" + +# Fails to build with thumb-1 (qemuarm) +#| {standard input}: Assembler messages: +#| {standard input}:2172: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r2,r1,LSR#20' +#| {standard input}:2173: Error: unshifted register required -- `bic r2,r2,#(1<<11)' +#| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' +#| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' +#| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" + +DISABLE_STATIC = "" diff --git a/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb index 13e67cba1..419b3ee6e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb @@ -2,25 +2,23 @@ SUMMARY = "Set of CLI tools for Openlmi providers" DESCRIPTION = "openlmi-tools is a set of command line tools for Openlmi providers." HOMEPAGE = "http://www.openlmi.org/" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" +LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e" SECTION = "System/Management" inherit setuptools -DEPENDS = "python-native pywbem-native python-m2crypto pywbem" +DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem" SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ " SRC_URI[md5sum] = "e156246cb7b49753db82f4ddf7f03e50" SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953fce9e4" -do_compile_prepend() { - cd cli +S = "${WORKDIR}/${BP}/cli" + +do_configure_prepend() { sed 's/@@VERSION@@/$(VERSION)/g' setup.py.skel >setup.py } -do_install_prepend() { - cd cli -} python() { if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split(): diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch new file mode 100644 index 000000000..49afa56f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch @@ -0,0 +1,162 @@ +From f78643d2388dd0697f83f17880403253a0596d83 Mon Sep 17 00:00:00 2001 +From: Vitezslav Crhonek <vcrhonek@redhat.com> +Date: Wed, 5 Sep 2018 11:23:46 -0700 +Subject: [PATCH 1/2] Port to OpenSSL 1.1.0 + +Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/99] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/wsman-curl-client-transport.c | 6 +++- + src/server/shttpd/io_ssl.c | 17 ---------- + src/server/shttpd/shttpd.c | 20 ++++-------- + src/server/shttpd/ssl.h | 46 --------------------------- + 4 files changed, 12 insertions(+), 77 deletions(-) + +diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c +index cd7f517a..e64ad097 100644 +--- a/src/lib/wsman-curl-client-transport.c ++++ b/src/lib/wsman-curl-client-transport.c +@@ -241,12 +241,16 @@ write_handler( void *ptr, size_t size, size_t nmemb, void *data) + static int ssl_certificate_thumbprint_verify_callback(X509_STORE_CTX *ctx, void *arg) + { + unsigned char *thumbprint = (unsigned char *)arg; +- X509 *cert = ctx->cert; + EVP_MD *tempDigest; + + unsigned char tempFingerprint[EVP_MAX_MD_SIZE]; + unsigned int tempFingerprintLen; + tempDigest = (EVP_MD*)EVP_sha1( ); ++ ++ X509 *cert = X509_STORE_CTX_get_current_cert(ctx); ++ if(!cert) ++ return 0; ++ + if ( X509_digest(cert, tempDigest, tempFingerprint, &tempFingerprintLen ) <= 0) + return 0; + if(!memcmp(tempFingerprint, thumbprint, tempFingerprintLen)) +diff --git a/src/server/shttpd/io_ssl.c b/src/server/shttpd/io_ssl.c +index 6de0db2a..7ac669e4 100644 +--- a/src/server/shttpd/io_ssl.c ++++ b/src/server/shttpd/io_ssl.c +@@ -11,23 +11,6 @@ + #include "defs.h" + + #if !defined(NO_SSL) +-struct ssl_func ssl_sw[] = { +- {"SSL_free", {0}}, +- {"SSL_accept", {0}}, +- {"SSL_connect", {0}}, +- {"SSL_read", {0}}, +- {"SSL_write", {0}}, +- {"SSL_get_error", {0}}, +- {"SSL_set_fd", {0}}, +- {"SSL_new", {0}}, +- {"SSL_CTX_new", {0}}, +- {"SSLv23_server_method", {0}}, +- {"SSL_library_init", {0}}, +- {"SSL_CTX_use_PrivateKey_file", {0}}, +- {"SSL_CTX_use_certificate_file",{0}}, +- {NULL, {0}} +-}; +- + void + _shttpd_ssl_handshake(struct stream *stream) + { +diff --git a/src/server/shttpd/shttpd.c b/src/server/shttpd/shttpd.c +index 5876392e..4c1dbf32 100644 +--- a/src/server/shttpd/shttpd.c ++++ b/src/server/shttpd/shttpd.c +@@ -1476,20 +1476,14 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) + int retval = FALSE; + EC_KEY* key; + +- /* Load SSL library dynamically */ +- if ((lib = dlopen(SSL_LIB, RTLD_LAZY)) == NULL) { +- _shttpd_elog(E_LOG, NULL, "set_ssl: cannot load %s", SSL_LIB); +- return (FALSE); +- } +- +- for (fp = ssl_sw; fp->name != NULL; fp++) +- if ((fp->ptr.v_void = dlsym(lib, fp->name)) == NULL) { +- _shttpd_elog(E_LOG, NULL,"set_ssl: cannot find %s", fp->name); +- return (FALSE); +- } +- + /* Initialize SSL crap */ ++ debug("Initialize SSL"); ++ SSL_load_error_strings(); ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_library_init(); ++ #else ++ OPENSSL_init_ssl(0, NULL); ++ #endif + + if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL) + _shttpd_elog(E_LOG, NULL, "SSL_CTX_new error"); +@@ -1532,7 +1526,7 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) + if (strncasecmp(protocols[idx].name, ssl_disabled_protocols, blank_ptr-ssl_disabled_protocols) == 0) { + //_shttpd_elog(E_LOG, NULL, "SSL: disable %s protocol", protocols[idx].name); + debug("SSL: disable %s protocol", protocols[idx].name); +- SSL_CTX_ctrl(CTX, SSL_CTRL_OPTIONS, protocols[idx].opt, NULL); ++ SSL_CTX_set_options(CTX, protocols[idx].opt); + break; + } + } +diff --git a/src/server/shttpd/ssl.h b/src/server/shttpd/ssl.h +index a863f2c7..8dad0109 100644 +--- a/src/server/shttpd/ssl.h ++++ b/src/server/shttpd/ssl.h +@@ -12,50 +12,4 @@ + + #include <openssl/ssl.h> + +-#else +- +-/* +- * Snatched from OpenSSL includes. I put the prototypes here to be independent +- * from the OpenSSL source installation. Having this, shttpd + SSL can be +- * built on any system with binary SSL libraries installed. +- */ +- +-typedef struct ssl_st SSL; +-typedef struct ssl_method_st SSL_METHOD; +-typedef struct ssl_ctx_st SSL_CTX; +- +-#define SSL_ERROR_WANT_READ 2 +-#define SSL_ERROR_WANT_WRITE 3 +-#define SSL_ERROR_SYSCALL 5 +-#define SSL_FILETYPE_PEM 1 +- + #endif +- +-/* +- * Dynamically loaded SSL functionality +- */ +-struct ssl_func { +- const char *name; /* SSL function name */ +- union variant ptr; /* Function pointer */ +-}; +- +-extern struct ssl_func ssl_sw[]; +- +-#define FUNC(x) ssl_sw[x].ptr.v_func +- +-#define SSL_free(x) (* (void (*)(SSL *)) FUNC(0))(x) +-#define SSL_accept(x) (* (int (*)(SSL *)) FUNC(1))(x) +-#define SSL_connect(x) (* (int (*)(SSL *)) FUNC(2))(x) +-#define SSL_read(x,y,z) (* (int (*)(SSL *, void *, int)) FUNC(3))((x),(y),(z)) +-#define SSL_write(x,y,z) \ +- (* (int (*)(SSL *, const void *,int)) FUNC(4))((x), (y), (z)) +-#define SSL_get_error(x,y)(* (int (*)(SSL *, int)) FUNC(5))((x), (y)) +-#define SSL_set_fd(x,y) (* (int (*)(SSL *, int)) FUNC(6))((x), (y)) +-#define SSL_new(x) (* (SSL * (*)(SSL_CTX *)) FUNC(7))(x) +-#define SSL_CTX_new(x) (* (SSL_CTX * (*)(SSL_METHOD *)) FUNC(8))(x) +-#define SSLv23_server_method() (* (SSL_METHOD * (*)(void)) FUNC(9))() +-#define SSL_library_init() (* (int (*)(void)) FUNC(10))() +-#define SSL_CTX_use_PrivateKey_file(x,y,z) (* (int (*)(SSL_CTX *, \ +- const char *, int)) FUNC(11))((x), (y), (z)) +-#define SSL_CTX_use_certificate_file(x,y,z) (* (int (*)(SSL_CTX *, \ +- const char *, int)) FUNC(12))((x), (y), (z)) +-- +2.18.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch new file mode 100644 index 000000000..5ae2e0006 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch @@ -0,0 +1,48 @@ +From 75669b077bd54bedbc086c60cbe137e7f4c685b5 Mon Sep 17 00:00:00 2001 +From: Vitezslav Crhonek <vcrhonek@redhat.com> +Date: Mon, 24 Apr 2017 11:28:39 +0200 +Subject: [PATCH 2/2] Check OpenSSL version number to allow builds with older + version + +Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/99] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/wsman-curl-client-transport.c | 4 ++++ + src/server/shttpd/shttpd.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c +index e64ad097..4fc047e8 100644 +--- a/src/lib/wsman-curl-client-transport.c ++++ b/src/lib/wsman-curl-client-transport.c +@@ -247,7 +247,11 @@ static int ssl_certificate_thumbprint_verify_callback(X509_STORE_CTX *ctx, void + unsigned int tempFingerprintLen; + tempDigest = (EVP_MD*)EVP_sha1( ); + ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L ++ X509 *cert = ctx->cert; ++ #else + X509 *cert = X509_STORE_CTX_get_current_cert(ctx); ++ #endif + if(!cert) + return 0; + +diff --git a/src/server/shttpd/shttpd.c b/src/server/shttpd/shttpd.c +index 4c1dbf32..161720c8 100644 +--- a/src/server/shttpd/shttpd.c ++++ b/src/server/shttpd/shttpd.c +@@ -1526,7 +1526,11 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) + if (strncasecmp(protocols[idx].name, ssl_disabled_protocols, blank_ptr-ssl_disabled_protocols) == 0) { + //_shttpd_elog(E_LOG, NULL, "SSL: disable %s protocol", protocols[idx].name); + debug("SSL: disable %s protocol", protocols[idx].name); ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L ++ SSL_CTX_ctrl(CTX, SSL_CTRL_OPTIONS, protocols[idx].opt, NULL); ++ #else + SSL_CTX_set_options(CTX, protocols[idx].opt); ++ #endif + break; + } + } +-- +2.18.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.5.bb index f618f02b5..5fba3855c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.5.bb @@ -15,13 +15,15 @@ DEPENDS = "curl libxml2 openssl libpam" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" -PV = "2.6.3" +SRCREV = "e90e5c96e3006c372bf45e0185e33c9250e67df6" +PV = "2.6.5" SRC_URI = "git://github.com/Openwsman/openwsman.git \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ + file://0001-Port-to-OpenSSL-1.1.0.patch \ + file://0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch \ " S = "${WORKDIR}/git" @@ -68,3 +70,4 @@ FILES_${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ " INSANE_SKIP_${PN} = "dev-so" +RDEPENDS_${PN} = "ruby" diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index d986da904..13479a90f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -17,26 +17,9 @@ SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6 S = "${WORKDIR}/${BPN}_${PV}" do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/bin/* ${D}${bindir} -} - -# all3: to build bin/7za, bin/7z (with its plugins), bin/7zr and bin/7zCon.sfx -EXTRA_OEMAKE_class-native = "all3" - -do_install_class-native() { - install -d ${D}${bindir} - install -d ${D}${bindir}/Codecs - install -m 0755 ${S}/bin/7* ${D}${bindir} - install -m 0755 ${S}/bin/Codecs/* ${D}${bindir}/Codecs - - # Create a shell script wrapper to execute next to 7z.so - mv ${D}${bindir}/7z ${D}${bindir}/7z.bin - cat > ${D}${bindir}/7z << 'EOF' -#!/bin/sh -exec "$(dirname "$0")"/7z.bin "$@" -EOF - chmod 0755 ${D}${bindir}/7z + install -d ${D}${bindir} + install -m 0755 ${S}/bin/* ${D}${bindir} + ln -s 7za ${D}${bindir}/7z } BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch b/meta-openembedded/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch new file mode 100644 index 000000000..9ff85b12a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch @@ -0,0 +1,64 @@ +From 2650bb3bd3644784359be373252b0436873ca8cb Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@siemens.com> +Date: Fri, 28 Sep 2018 16:44:37 +0200 +Subject: [PATCH] Make resulting cmake config relocatable + +This change avoids hardcoded install prefix in the p8-platform-config.cmake. +Especially important when doing cross compilation with Yocto for example. + +Upstream-Status: Submitted [https://github.com/Pulse-Eight/platform/pull/38] + +--- + CMakeLists.txt | 4 ---- + p8-platform-config.cmake.in | 13 +++++++++---- + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7144b0b..f2db66e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,10 +22,6 @@ if(WIN32) + src/windows/os-threads.cpp) + endif() + +-set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") +-IF(WIN32) +- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") +-ENDIF(WIN32) + set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + + if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") +diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in +index 47f30f1..b08e96c 100644 +--- a/p8-platform-config.cmake.in ++++ b/p8-platform-config.cmake.in +@@ -9,17 +9,22 @@ + # p8-platform_LIBRARY_DIRS - directories in which the libraries are situated + # + # propagate these properties from one build system to the other ++get_filename_component(_p8-platform_rootdir ${CMAKE_CURRENT_LIST_DIR}/../ ABSOLUTE) ++ + set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") +-set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) +-set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") ++set (p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include" "${_p8-platform_rootdir}/include/p8-platform") ++if(WIN32) ++ list(APPEND p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include/p8-platform/windows") ++endif(WIN32) ++set (p8-platform_LIBRARY_DIRS "${_p8-platform_rootdir}") + set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") + set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") + + # libraries come from the build tree where this file was generated + if(WIN32) +- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") ++ set (p8-platform_LIBRARY "${_p8-platform_rootdir}/p8-platform.lib") + else(WIN32) +- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") ++ set (p8-platform_LIBRARY "-L${_p8-platform_rootdir} -lp8-platform") + endif(WIN32) + set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") + mark_as_advanced (p8-platform_LIBRARY) +-- +2.11.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb index f6347c2a4..0690d4ba3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -4,10 +4,11 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0" +PV = "2.1.0.1" -SRC_URI = "git://github.com/Pulse-Eight/platform.git" -SRCREV = "d7bceb64541cb046421cbcd4c98d91e9bf24822f" +SRC_URI = "git://github.com/Pulse-Eight/platform.git \ + file://0001-Make-resulting-cmake-config-relocatable.patch" +SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb new file mode 100644 index 000000000..95d879dc6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -0,0 +1,22 @@ +SUMMARY = "PAM cached credentials module" +HOMEPAGE = "https://www.padl.com/OSS/pam_ccreds.html" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "libpam openssl db" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" + +SRC_URI = "git://github.com/PADL/pam_ccreds" + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF += "--libdir=${base_libdir} " + +FILES_${PN} += "${base_libdir}/security/pam*" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb new file mode 100644 index 000000000..c59a259fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "PAM searchless LDAP authentication module" +HOMEPAGE = "https://github.com/rmbreak/pam_ldapdb" +BUGTRACKER = "https://github.com/rmbreak/pam_ldapdb/issues" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41ab94182d94be9bb35e2a8b933f1e7d" + +DEPENDS = "libpam openldap" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +SRC_URI = "https://github.com/rmbreak/pam_ldapdb/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" +SRC_URI[md5sum] = "2dd4f1370fcfe995ee0ad09611109b87" +SRC_URI[sha256sum] = "8ed92b36523556bb5d9bf3eb33a1035e46041d4be767c8d62136930c0ca0e45b" + +S = "${WORKDIR}/pam_ldapdb-${PV}" + +do_install () { + oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security +} + +FILES_${PN} += "${base_libdir}/security/pam_ldapdb.so" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index 1638c41c8..2a461fc11 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -11,7 +11,7 @@ SRC_URI = "http://sourceforge.net/projects/pamsshagentauth/files/pam_ssh_agent_a SRC_URI[md5sum] = "8dbe90ab3625e545036333e6f51ccf1d" SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763" -DEPENDS += "libpam openssl" +DEPENDS += "libpam openssl10" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch new file mode 100644 index 000000000..747538b0c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch @@ -0,0 +1,29 @@ +From 2a22dc96c3bbb5c9bbcc008f58d4f5c64e3d19e6 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Mon, 23 Jul 2018 11:23:39 -0700 +Subject: [PATCH] jemalloc/jemalloc.cfg: Specify the host when building + jemalloc + +To avoid this error: + configure: error: cannot run C compiled programs. + If you meant to cross compile, use `--host'. +when cross compiling specify the host when configuring jemalloc. + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [configuration] +--- + src/jemalloc/jemalloc.cfg | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/jemalloc/jemalloc.cfg b/src/jemalloc/jemalloc.cfg +index 196129de6..79ebbab1c 100644 +--- a/src/jemalloc/jemalloc.cfg ++++ b/src/jemalloc/jemalloc.cfg +@@ -3,3 +3,4 @@ + --with-private-namespace=je_vmem_ + --disable-xmalloc + --disable-munmap ++--host=${HOST_SYS} +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch new file mode 100644 index 000000000..bd1b97c24 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch @@ -0,0 +1,26 @@ +From 460a96e390cb80278784cfe36629e280fe7ffef7 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Mon, 23 Jul 2018 11:31:17 -0700 +Subject: [PATCH 2/2] Makefile: Don't install the docs + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [disable feature] +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 224a315f6..ce7f84afb 100644 +--- a/Makefile ++++ b/Makefile +@@ -144,7 +144,6 @@ rpm dpkg: pkg-clean source + + install uninstall: + $(MAKE) -C src $@ +- $(MAKE) -C doc $@ + + .PHONY: all clean clobber test check cstyle check-license install uninstall\ + source rpm dpkg pkg-clean pcheck check-remote format doc $(SUBDIRS) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch new file mode 100644 index 000000000..f75d94197 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch @@ -0,0 +1,34 @@ +From a7f07dca2468ea226d2f07fc0105166e75cadaf8 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Thu, 6 Sep 2018 16:18:50 -0700 +Subject: [PATCH] Makefile: Don't build the examples + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [disable feature] +--- + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 4b50dd8b5..e00501e31 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -38,13 +38,13 @@ include $(TOP)/src/version.inc + + TARGETS = libpmem libvmem libpmemblk libpmemlog libpmemobj libpmempool\ + libpmemcto libvmmalloc tools +-ALL_TARGETS = $(TARGETS) common librpmem examples benchmarks ++ALL_TARGETS = $(TARGETS) common librpmem benchmarks + + SCOPE_DIRS = $(TARGETS) common librpmem rpmem_common + + DEBUG_RELEASE_TARGETS = common libpmem libvmem libpmemblk libpmemlog libpmemobj\ + libpmempool libvmmalloc librpmem libpmemcto +-RELEASE_TARGETS = tools examples benchmarks ++RELEASE_TARGETS = tools benchmarks + + CLEAN_NO_JE_TARGETS = $(ALL_TARGETS) rpmem_common test + CLEAN_TARGETS = $(CLEAN_NO_JE_TARGETS) jemalloc +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch new file mode 100644 index 000000000..624f17bd4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch @@ -0,0 +1,30 @@ +From 33affa9ee97691efb73f439fcdba4adb8625a26a Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Mon, 10 Sep 2018 12:59:48 -0700 +Subject: [PATCH] os_posix: Manually implement secure_getenv() if required + +Manually implement the secure_getenv() if we need to, this is required +if using musl. + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Pending +--- + src/common/os_posix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/os_posix.c b/src/common/os_posix.c +index 2d70a0a29..fb09b6ce0 100644 +--- a/src/common/os_posix.c ++++ b/src/common/os_posix.c +@@ -261,7 +261,7 @@ os_setenv(const char *name, const char *value, int overwrite) + /* + * secure_getenv -- provide GNU secure_getenv for FreeBSD + */ +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || !HAVE___SECURE_GETENV + static char * + secure_getenv(const char *name) + { +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch new file mode 100644 index 000000000..75c35f865 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch @@ -0,0 +1,30 @@ +From 92e63699ea83074298971b0251f002562be4dbd3 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Mon, 10 Sep 2018 13:23:37 -0700 +Subject: [PATCH 2/3] pmempool: Remove unused __USE_UNIX98 define + +Remove the unused __USE_UNIX98 to fix musl build failures. + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Pending +--- + src/tools/pmempool/info.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/tools/pmempool/info.c b/src/tools/pmempool/info.c +index b4010bf35..7b890a123 100644 +--- a/src/tools/pmempool/info.c ++++ b/src/tools/pmempool/info.c +@@ -45,9 +45,6 @@ + #include <inttypes.h> + #include <assert.h> + #include <sys/param.h> +-#ifndef __FreeBSD__ +-#define __USE_UNIX98 +-#endif + #include <unistd.h> + #include <sys/mman.h> + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch new file mode 100644 index 000000000..2042fdb25 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch @@ -0,0 +1,29 @@ +From a88e806f9ce8cc071e81abad688643d53f393176 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Mon, 10 Sep 2018 14:18:38 -0700 +Subject: [PATCH 3/3] Makefile.inc: Allow extra libs to be specified + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Pending +--- + src/Makefile.inc | 2 ++ + src/common.inc | 2 ++ + src/tools/Makefile.inc | 1 + + 3 files changed, 5 insertions(+) + +diff --git a/src/common.inc b/src/common.inc +index 032cb83ea..2d5c4bedf 100644 +--- a/src/common.inc ++++ b/src/common.inc +@@ -74,6 +74,8 @@ GCOV_CFLAGS=-fprofile-arcs -ftest-coverage --coverage + GCOV_LDFLAGS=-fprofile-arcs -ftest-coverage + GCOV_LIBS=-lgcov + ++LIBS += $(EXTRA_LIBS) ++ + osdep = $(1)_$(shell uname -s | tr "[:upper:]" "[:lower:]")$(2) + get_arch = $(shell $(CC) -dumpmachine | awk -F'[/-]' '{print $$1}') + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb new file mode 100644 index 000000000..3da22a970 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb @@ -0,0 +1,64 @@ +SUMMARY = "Persistent Memory Development Kit" +DESCRIPTION = "Persistent Memory Development Kit" +HOMEPAGE = "http://pmem.io" +SECTION = "libs" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7db1106255a1baa80391fd2e21eebab7" +DEPENDS = "ndctl" + +# Required to have the fts.h header for musl +DEPENDS_append_libc-musl = " fts" + +SRC_URI = "https://github.com/pmem/${BPN}/archive/${PV}.tar.gz \ + file://0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch \ + file://0002-Makefile-Don-t-install-the-docs.patch \ + file://0003-Makefile-Don-t-build-the-examples.patch \ + file://0005-pmempool-Remove-unused-__USE_UNIX98-define.patch \ + file://0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch \ + " + +SRC_URI_append_libc-musl = " file://0004-os_posix-Manually-implement-secure_getenv-if-require.patch" + +SRC_URI[md5sum] = "bde73bca9ef5b90911deb0fdcfb15ccf" +SRC_URI[sha256sum] = "df7e658e75d28cd80f6d2ff7b9fc9ae2885d52f8923fdbacecfd46215115fb4c" + +inherit autotools-brokensep pkgconfig + +# Fix jemalloc error: +# | configure: error: cannot run C compiled programs. +# | If you meant to cross compile, use `--host'. +# +# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] +EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}'" + +# Fix the missing fts libs when using musl +EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install + + # Copy these into the standard directories + install -d ${D}${bindir}/ + mv ${D}/usr/local/bin/pmempool ${D}${bindir}/ + mv ${D}/usr/local/bin/daxio ${D}${bindir}/ + + install -d ${D}${libdir} + mv ${D}/usr/local/lib/*so* ${D}${libdir}/ + + install -d ${D}${libdir}/pkgconfig + mv ${D}/usr/local/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig/ + + install -d ${D}${includedir} + mv ${D}/usr/local/include/* ${D}${includedir}/ + + # Remove uneeded files + rm -rf ${D}/usr/local/ +} + +# Include these by default otherwise the SDK is not very useful +FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" +FILES_${PN} += "${libdir}/*so*" +FILES_${PN} += "${libdir}/pkgconfig/*.pc" +FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/*" + +COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch index 4e3af876e..3b0ef5e5a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch @@ -12,16 +12,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Upstream-Status: Pending +Rebase to 0.115 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- configure.ac | 2 +- src/polkitbackend/polkitbackendinteractiveauthority.c | 6 +++++- - src/polkitbackend/polkitbackendjsauthority.c | 5 ++--- - 3 files changed, 8 insertions(+), 5 deletions(-) + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 07982d1..21590b2 100644 +index 8b3e1b1..1c392df 100644 --- a/configure.ac +++ b/configure.ac -@@ -158,7 +158,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], +@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_SUBST(EXPAT_LIBS) @@ -31,10 +34,10 @@ index 07982d1..21590b2 100644 if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index 7019356..cf39d77 100644 +index cb6fdab..de3f752 100644 --- a/src/polkitbackend/polkitbackendinteractiveauthority.c +++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2213,7 +2213,7 @@ get_users_in_group (PolkitIdentity *group, +@@ -2224,7 +2224,7 @@ get_users_in_group (PolkitIdentity *group, out: return ret; } @@ -43,7 +46,7 @@ index 7019356..cf39d77 100644 static GList * get_users_in_net_group (PolkitIdentity *group, gboolean include_root) -@@ -2270,6 +2270,8 @@ get_users_in_net_group (PolkitIdentity *group, +@@ -2285,6 +2285,8 @@ get_users_in_net_group (PolkitIdentity *group, return ret; } @@ -52,7 +55,7 @@ index 7019356..cf39d77 100644 /* ---------------------------------------------------------------------------------------------------- */ static void -@@ -2355,10 +2357,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, +@@ -2369,10 +2371,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, { user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE)); } @@ -65,43 +68,26 @@ index 7019356..cf39d77 100644 else { g_warning ("Unsupported identity"); -diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c -index 097dcc5..e59b3f7 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.c -+++ b/src/polkitbackend/polkitbackendjsauthority.c -@@ -1498,7 +1498,6 @@ js_polkit_spawn (JSContext *cx, - - /* ---------------------------------------------------------------------------------------------------- */ - -- - static JSBool - js_polkit_user_is_in_netgroup (JSContext *cx, - unsigned argc, -@@ -1518,6 +1517,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - user = JS_EncodeString (cx, user_str); - netgroup = JS_EncodeString (cx, netgroup_str); +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 517f3c6..6042dd2 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + user = JS_EncodeString (cx, args[0].toString()); + netgroup = JS_EncodeString (cx, args[1].toString()); +#if defined HAVE_INNETGR if (innetgr (netgroup, NULL, /* host */ user, -@@ -1525,6 +1525,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1509,6 +1510,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, { - is_in_netgroup = JS_TRUE; + is_in_netgroup = true; } +#endif JS_free (cx, netgroup); JS_free (cx, user); -@@ -1536,8 +1537,6 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - return ret; - } - -- -- - /* ---------------------------------------------------------------------------------------------------- */ - - typedef struct -- -2.7.0 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch index 74647efce..c491abf4a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch @@ -4,9 +4,18 @@ Upstream-Status:Inappropriate [configuration] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> ---- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 -+++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 -@@ -350,10 +350,10 @@ +Upstream-Status: Inappropriate [oe specific] +Rebase to 0.115 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 36df239..8b3e1b1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -471,10 +471,10 @@ elif test x$with_os_type = xfreebsd -o x$with_os_type = xnetbsd; then PAM_FILE_INCLUDE_PASSWORD=system PAM_FILE_INCLUDE_SESSION=system else @@ -21,3 +30,6 @@ Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> fi AC_SUBST(PAM_FILE_INCLUDE_AUTH) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.115.bb index f34928fe3..ad0f66a5e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.115.bb @@ -24,10 +24,13 @@ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar. file://0001-make-netgroup-support-configurable.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ " -SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" -SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" +SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082" +SRC_URI[sha256sum] = "2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131" -EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages" +EXTRA_OECONF = "--with-os-type=moblin \ + --disable-man-pages \ + --disable-libelogind \ + " do_compile_prepend () { export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" @@ -40,6 +43,7 @@ FILES_${PN}_append = " \ ${nonarch_libdir}/${BPN}-1 \ ${datadir}/dbus-1 \ ${datadir}/${BPN}-1 \ + ${datadir}/gettext \ " FILES_${PN}-examples = "${bindir}/*example*" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch deleted file mode 100644 index 2b3b58793..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- redis-3.0.2/deps/hiredis/Makefile.orig 2016-05-06 19:36:26.179003036 -0700 -+++ redis-3.0.2/deps/hiredis/Makefile 2016-05-06 19:40:15.341340736 -0700 -@@ -25,7 +25,7 @@ - - # Fallback to gcc when $CC is not in $PATH. - CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') --OPTIMIZATION?=-O3 -+OPTIMIZATION?=-O2 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings - DEBUG?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) -@@ -68,6 +68,7 @@ - - $(STLIBNAME): $(OBJ) - $(STLIB_MAKE_CMD) $(OBJ) -+ $(RANLIB) $@ - - dynamic: $(DYLIBNAME) - static: $(STLIBNAME) diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index f9f1c0dbd..421f306de 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch @@ -8,23 +8,23 @@ as CC has spaces in it, just skip it if one was already passed in. Signed-off-by: Venture Research <tech@ventureresearch.com> -Update to work with 3.0.x -Signed-off-by: Armin Kuster <akuster808@gmail.com> +Update to work with 4.0.8 +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- deps/hiredis/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: deps/hiredis/Makefile -=================================================================== +diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile +index 9a4de836..271c06ba 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile -@@ -24,7 +24,7 @@ endef +@@ -36,7 +36,7 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') + CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings - DEBUG?= -g -ggdb diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch index b768a7749..6745f3d0e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch @@ -11,15 +11,15 @@ jemalloc wasn't building correctly. Signed-off-by: Venture Research <tech@ventureresearch.com> -Update to work with 3.0.x -Signed-off-by: Armin Kuster <akuster808@gmail.com> +Update to work with 4.0.8 +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: src/Makefile -=================================================================== +diff --git a/src/Makefile b/src/Makefile +index 86e0b3fe..a810180b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,8 @@ @@ -29,6 +29,6 @@ Index: src/Makefile -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +# use fake uname option to force use of generic libc +uname_S := "USE_LIBC_MALLOC" + uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') OPTIMIZATION?=-O2 DEPENDENCY_TARGETS=hiredis linenoise lua - diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf b/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf index ab024ad85..75037d6dc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf @@ -1,4 +1,9 @@ -# Redis configuration file example +# Redis configuration file example. +# +# Note that in order to read the configuration file, Redis must be +# started with the file path as first argument: +# +# ./redis-server /path/to/redis.conf # Note on units: when memory size is needed, it is possible to specify # it in the usual form of 1k 5GB 4M and so forth: @@ -12,48 +17,160 @@ # # units are case insensitive so 1GB 1Gb 1gB are all the same. -# By default Redis does not run as a daemon. Use 'yes' if you need it. -# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +################################## INCLUDES ################################### + +# Include one or more other config files here. This is useful if you +# have a standard template that goes to all Redis servers but also need +# to customize a few per-server settings. Include files can include +# other files, so use this wisely. # -# OE: run as a daemon. +# Notice option "include" won't be rewritten by command "CONFIG REWRITE" +# from admin or Redis Sentinel. Since Redis always uses the last processed +# line as value of a configuration directive, you'd better put includes +# at the beginning of this file to avoid overwriting config change at runtime. # -daemonize yes +# If instead you are interested in using includes to override configuration +# options, it is better to use include as the last line. +# +# include /path/to/local.conf +# include /path/to/other.conf -# When running daemonized, Redis writes a pid file in /var/run/redis.pid by -# default. You can specify a custom pid file location here. -pidfile /var/run/redis.pid +################################## MODULES ##################################### + +# Load modules at startup. If the server is not able to load modules +# it will abort. It is possible to use multiple loadmodule directives. +# +# loadmodule /path/to/my_module.so +# loadmodule /path/to/other_module.so + +################################## NETWORK ##################################### -# Accept connections on the specified port, default is 6379. +# By default, if no "bind" configuration directive is specified, Redis listens +# for connections from all the network interfaces available on the server. +# It is possible to listen to just one or multiple selected interfaces using +# the "bind" configuration directive, followed by one or more IP addresses. +# +# Examples: +# +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 +# +# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the +# internet, binding to all the interfaces is dangerous and will expose the +# instance to everybody on the internet. So by default we uncomment the +# following bind directive, that will force Redis to listen only into +# the IPv4 lookback interface address (this means Redis will be able to +# accept connections only from clients running into the same computer it +# is running). +# +# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES +# JUST COMMENT THE FOLLOWING LINE. +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +bind 127.0.0.1 + +# Protected mode is a layer of security protection, in order to avoid that +# Redis instances left open on the internet are accessed and exploited. +# +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. +# +# By default protected mode is enabled. You should disable it only if +# you are sure you want clients from other hosts to connect to Redis +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. +protected-mode yes + +# Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 -# If you want you can bind a single interface, if the bind option is not -# specified all the interfaces will listen for incoming connections. -# -bind 127.0.0.1 +# TCP listen() backlog. +# +# In high requests-per-second environments you need an high backlog in order +# to avoid slow clients connections issues. Note that the Linux kernel +# will silently truncate it to the value of /proc/sys/net/core/somaxconn so +# make sure to raise both the value of somaxconn and tcp_max_syn_backlog +# in order to get the desired effect. +tcp-backlog 511 -# Specify the path for the unix socket that will be used to listen for +# Unix socket. +# +# Specify the path for the Unix socket that will be used to listen for # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # # unixsocket /tmp/redis.sock -# unixsocketperm 755 +# unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) timeout 0 -# Set server verbosity to 'debug' -# it can be one of: +# TCP keepalive. +# +# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence +# of communication. This is useful for two reasons: +# +# 1) Detect dead peers. +# 2) Take the connection alive from the point of view of network +# equipment in the middle. +# +# On Linux, the specified value (in seconds) is the period used to send ACKs. +# Note that to close the connection the double of the time is needed. +# On other kernels the period depends on the kernel configuration. +# +# A reasonable value for this option is 300 seconds, which is the new +# Redis default starting with Redis 3.2.1. +tcp-keepalive 300 + +################################# GENERAL ##################################### + +# OE: run as a daemon. +daemonize yes + +# If you run Redis from upstart or systemd, Redis can interact with your +# supervision tree. Options: +# supervised no - no supervision interaction +# supervised upstart - signal upstart by putting Redis into SIGSTOP mode +# supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# supervised auto - detect upstart or systemd method based on +# UPSTART_JOB or NOTIFY_SOCKET environment variables +# Note: these supervision methods only signal "process is ready." +# They do not enable continuous liveness pings back to your supervisor. +supervised no + +# If a pid file is specified, Redis writes it where specified at startup +# and removes it at exit. +# +# When the server runs non daemonized, no pid file is created if none is +# specified in the configuration. When the server is daemonized, the pid file +# is used even if not specified, defaulting to "/var/run/redis.pid". +# +# Creating a pid file is best effort: if Redis is not able to create it +# nothing bad happens, the server will start and run normally. + +# When running daemonized, Redis writes a pid file in /var/run/redis.pid by +# default. You can specify a custom pid file location here. +pidfile /var/run/redis.pid + +# Specify the server verbosity level. +# This can be one of: # debug (a lot of information, useful for development/testing) # verbose (many rarely useful info, but not a mess like the debug level) # notice (moderately verbose, what you want in production probably) # warning (only very important / critical messages are logged) loglevel notice -# Specify the log file name. Also 'stdout' can be used to force +# Specify the log file name. Also the empty string can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -# logfile /var/log/redis.log +logfile "" # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. @@ -62,7 +179,7 @@ syslog-enabled yes # Specify the syslog identity. syslog-ident redis -# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. +# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 # Set the number of databases. The default database is DB 0, you can select @@ -70,7 +187,15 @@ syslog-ident redis # dbid is a number between 0 and 'databases'-1 databases 16 -################################ SNAPSHOTTING ################################# +# By default Redis shows an ASCII art logo only when started to log to the +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. +# +# However it is possible to force the pre-4.0 behavior and always show a +# ASCII art logo in startup logs by setting the following option to yes. +always-show-logo yes + +################################ SNAPSHOTTING ################################ # # Save the DB on disk: # @@ -84,7 +209,7 @@ databases 16 # after 300 sec (5 min) if at least 10 keys changed # after 60 sec if at least 10000 keys changed # -# Note: you can disable saving at all commenting all the "save" lines. +# Note: you can disable saving completely by commenting out all "save" lines. # # It is also possible to remove all the previously configured save # points by adding a save directive with a single empty string argument @@ -103,16 +228,16 @@ save 30 1000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. -# This will make the user aware (in an hard way) that data is not persisting +# This will make the user aware (in a hard way) that data is not persisting # on disk properly, otherwise chances are that no one will notice and some -# distater will happen. +# disaster will happen. # # If the background saving process will start working again Redis will # automatically allow writes again. # # However if you have setup your proper monitoring of the Redis server # and persistence, you may want to disable this feature so that Redis will -# continue to work as usually even if there are problems with disk, +# continue to work as usual even if there are problems with disk, # permissions, and so forth. stop-writes-on-bgsave-error yes @@ -122,7 +247,7 @@ stop-writes-on-bgsave-error yes # the dataset will likely be bigger if you have compressible values or keys. rdbcompression yes -# Since verison 5 of RDB a CRC64 checksum is placed at the end of the file. +# Since version 5 of RDB a CRC64 checksum is placed at the end of the file. # This makes the format more resistant to corruption but there is a performance # hit to pay (around 10%) when saving and loading RDB files, so you can disable it # for maximum performances. @@ -138,18 +263,27 @@ dbfilename dump.rdb # # The DB will be written inside this directory, with the filename specified # above using the 'dbfilename' configuration directive. -# -# Also the Append Only File will be created inside this directory. -# +# +# The Append Only File will also be created inside this directory. +# # Note that you must specify a directory here, not a file name. dir /var/lib/redis/ ################################# REPLICATION ################################# # Master-Slave replication. Use slaveof to make a Redis instance a copy of -# another Redis server. Note that the configuration is local to the slave -# so for example it is possible to configure the slave to save the DB with a -# different interval, or to listen to another port, and so on. +# another Redis server. A few things to understand ASAP about Redis replication. +# +# 1) Redis replication is asynchronous, but you can configure a master to +# stop accepting writes if it appears to be not connected with at least +# a given number of slaves. +# 2) Redis slaves are able to perform a partial resynchronization with the +# master if the replication link is lost for a relatively small amount of +# time. You may want to configure the replication backlog size (see the next +# sections of this file) with a sensible value depending on your needs. +# 3) Replication is automatic and does not need user intervention. After a +# network partition slaves automatically try to reconnect to masters +# and resynchronize with them. # # slaveof <masterip> <masterport> @@ -160,14 +294,14 @@ dir /var/lib/redis/ # # masterauth <master-password> -# When a slave lost the connection with the master, or when the replication +# When a slave loses its connection with the master, or when the replication # is still in progress, the slave can act in two different ways: # # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) if slave-serve-stale data is set to 'no' the slave will reply with +# 2) if slave-serve-stale-data is set to 'no' the slave will reply with # an error "SYNC with master in progress" to all the kind of commands # but to INFO and SLAVEOF. # @@ -184,19 +318,65 @@ slave-serve-stale-data yes # Note: read only slaves are not designed to be exposed to untrusted clients # on the internet. It's just a protection layer against misuse of the instance. # Still a read only slave exports by default all the administrative commands -# such as CONFIG, DEBUG, and so forth. To a limited extend you can improve +# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve # security of read only slaves using 'rename-command' to shadow all the # administrative / dangerous commands. slave-read-only yes +# Replication SYNC strategy: disk or socket. +# +# ------------------------------------------------------- +# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY +# ------------------------------------------------------- +# +# New slaves and reconnecting slaves that are not able to continue the replication +# process just receiving differences, need to do what is called a "full +# synchronization". An RDB file is transmitted from the master to the slaves. +# The transmission can happen in two different ways: +# +# 1) Disk-backed: The Redis master creates a new process that writes the RDB +# file on disk. Later the file is transferred by the parent +# process to the slaves incrementally. +# 2) Diskless: The Redis master creates a new process that directly writes the +# RDB file to slave sockets, without touching the disk at all. +# +# With disk-backed replication, while the RDB file is generated, more slaves +# can be queued and served with the RDB file as soon as the current child producing +# the RDB file finishes its work. With diskless replication instead once +# the transfer starts, new slaves arriving will be queued and a new transfer +# will start when the current one terminates. +# +# When diskless replication is used, the master waits a configurable amount of +# time (in seconds) before starting the transfer in the hope that multiple slaves +# will arrive and the transfer can be parallelized. +# +# With slow disks and fast (large bandwidth) networks, diskless replication +# works better. +repl-diskless-sync no + +# When diskless replication is enabled, it is possible to configure the delay +# the server waits in order to spawn the child that transfers the RDB via socket +# to the slaves. +# +# This is important since once the transfer starts, it is not possible to serve +# new slaves arriving, that will be queued for the next RDB transfer, so the server +# waits a delay in order to let more slaves arrive. +# +# The delay is specified in seconds, and by default is 5 seconds. To disable +# it entirely just set it to 0 seconds and the transfer will start ASAP. +repl-diskless-sync-delay 5 + # Slaves send PINGs to server in a predefined interval. It's possible to change # this interval with the repl_ping_slave_period option. The default value is 10 # seconds. # # repl-ping-slave-period 10 -# The following option sets a timeout for both Bulk transfer I/O timeout and -# master data or ping response timeout. The default value is 60 seconds. +# The following option sets the replication timeout for: +# +# 1) Bulk transfer I/O during SYNC, from the point of view of slave. +# 2) Master timeout from the point of view of slaves (data, pings). +# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings). # # It is important to make sure that this value is greater than the value # specified for repl-ping-slave-period otherwise a timeout will be detected @@ -204,13 +384,54 @@ slave-read-only yes # # repl-timeout 60 +# Disable TCP_NODELAY on the slave socket after SYNC? +# +# If you select "yes" Redis will use a smaller number of TCP packets and +# less bandwidth to send data to slaves. But this can add a delay for +# the data to appear on the slave side, up to 40 milliseconds with +# Linux kernels using a default configuration. +# +# If you select "no" the delay for data to appear on the slave side will +# be reduced but more bandwidth will be used for replication. +# +# By default we optimize for low latency, but in very high traffic conditions +# or when the master and slaves are many hops away, turning this to "yes" may +# be a good idea. +repl-disable-tcp-nodelay no + +# Set the replication backlog size. The backlog is a buffer that accumulates +# slave data when slaves are disconnected for some time, so that when a slave +# wants to reconnect again, often a full resync is not needed, but a partial +# resync is enough, just passing the portion of data the slave missed while +# disconnected. +# +# The bigger the replication backlog, the longer the time the slave can be +# disconnected and later be able to perform a partial resynchronization. +# +# The backlog is only allocated once there is at least a slave connected. +# +# repl-backlog-size 1mb + +# After a master has no longer connected slaves for some time, the backlog +# will be freed. The following option configures the amount of seconds that +# need to elapse, starting from the time the last slave disconnected, for +# the backlog buffer to be freed. +# +# Note that slaves never free the backlog for timeout, since they may be +# promoted to masters later, and should be able to correctly "partially +# resynchronize" with the slaves: hence they should always accumulate backlog. +# +# A value of 0 means to never release the backlog. +# +# repl-backlog-ttl 3600 + # The slave priority is an integer number published by Redis in the INFO output. # It is used by Redis Sentinel in order to select a slave to promote into a # master if the master is no longer working correctly. # # A slave with a low priority number is considered better for promotion, so # for instance if there are three slaves with priority 10, 100, 25 Sentinel will -# pick the one wtih priority 10, that is the lowest. +# pick the one with priority 10, that is the lowest. # # However a special priority of 0 marks the slave as not able to perform the # role of master, so a slave with priority of 0 will never be selected by @@ -219,6 +440,57 @@ slave-read-only yes # By default the priority is 100. slave-priority 100 +# It is possible for a master to stop accepting writes if there are less than +# N slaves connected, having a lag less or equal than M seconds. +# +# The N slaves need to be in "online" state. +# +# The lag in seconds, that must be <= the specified value, is calculated from +# the last ping received from the slave, that is usually sent every second. +# +# This option does not GUARANTEE that N replicas will accept the write, but +# will limit the window of exposure for lost writes in case not enough slaves +# are available, to the specified number of seconds. +# +# For example to require at least 3 slaves with a lag <= 10 seconds use: +# +# min-slaves-to-write 3 +# min-slaves-max-lag 10 +# +# Setting one or the other to 0 disables the feature. +# +# By default min-slaves-to-write is set to 0 (feature disabled) and +# min-slaves-max-lag is set to 10. + +# A Redis master is able to list the address and port of the attached +# slaves in different ways. For example the "INFO replication" section +# offers this information, which is used, among other tools, by +# Redis Sentinel in order to discover slave instances. +# Another place where this info is available is in the output of the +# "ROLE" command of a master. +# +# The listed IP and address normally reported by a slave is obtained +# in the following way: +# +# IP: The address is auto detected by checking the peer address +# of the socket used by the slave to connect with the master. +# +# Port: The port is communicated by the slave during the replication +# handshake, and is normally the port that the slave is using to +# list for connections. +# +# However when port forwarding or Network Address Translation (NAT) is +# used, the slave may be actually reachable via different IP and port +# pairs. The following two options can be used by a slave in order to +# report to its master a specific set of IP and port, so that both INFO +# and ROLE will report those values. +# +# There is no need to use both the options if you need to override just +# the port or the IP address. +# +# slave-announce-ip 5.5.5.5 +# slave-announce-port 1234 + ################################## SECURITY ################################### # Require clients to issue AUTH <PASSWORD> before processing any other @@ -227,7 +499,7 @@ slave-priority 100 # # This should stay commented out for backward compatibility and because most # people do not need auth (e.g. they run their own servers). -# +# # Warning: since Redis is pretty fast an outside user can try up to # 150k passwords per second against a good box. This means that you should # use a very strong password otherwise it will be very easy to break. @@ -238,23 +510,26 @@ slave-priority 100 # # It is possible to change the name of dangerous commands in a shared # environment. For instance the CONFIG command may be renamed into something -# of hard to guess so that it will be still available for internal-use -# tools but not available for general clients. +# hard to guess so that it will still be available for internal-use tools +# but not available for general clients. # # Example: # # rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 # -# It is also possible to completely kill a command renaming it into +# It is also possible to completely kill a command by renaming it into # an empty string: # # rename-command CONFIG "" +# +# Please note that changing the name of commands that are logged into the +# AOF file or transmitted to slaves may cause problems. -################################### LIMITS #################################### +################################### CLIENTS #################################### # Set the max number of connected clients at the same time. By default # this limit is set to 10000 clients, however if the Redis server is not -# able ot configure the process file limit to allow for the specified limit +# able to configure the process file limit to allow for the specified limit # the max number of allowed clients is set to the current file limit # minus 32 (as Redis reserves a few file descriptors for internal uses). # @@ -263,17 +538,19 @@ slave-priority 100 # # maxclients 10000 -# Don't use more memory than the specified amount of bytes. +############################## MEMORY MANAGEMENT ################################ + +# Set a memory usage limit to the specified amount of bytes. # When the memory limit is reached Redis will try to remove keys -# accordingly to the eviction policy selected (see maxmemmory-policy). +# according to the eviction policy selected (see maxmemory-policy). # # If Redis can't remove keys according to the policy, or if the policy is # set to 'noeviction', Redis will start to reply with errors to commands # that would use more memory, like SET, LPUSH, and so on, and will continue # to reply to read-only commands like GET. # -# This option is usually useful when using Redis as an LRU cache, or to set -# an hard memory limit for an instance (using the 'noeviction' policy). +# This option is usually useful when using Redis as an LRU or LFU cache, or to +# set a hard memory limit for an instance (using the 'noeviction' policy). # # WARNING: If you have slaves attached to an instance with maxmemory on, # the size of the output buffers needed to feed the slaves are subtracted @@ -289,19 +566,27 @@ slave-priority 100 # maxmemory <bytes> # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory -# is reached? You can select among five behavior: -# -# volatile-lru -> remove the key with an expire set using an LRU algorithm -# allkeys-lru -> remove any key accordingly to the LRU algorithm -# volatile-random -> remove a random key with an expire set -# allkeys-random -> remove a random key, any key -# volatile-ttl -> remove the key with the nearest expire time (minor TTL) -# noeviction -> don't expire at all, just return an error on write operations -# -# Note: with all the kind of policies, Redis will return an error on write -# operations, when there are not suitable keys for eviction. -# -# At the date of writing this commands are: set setnx setex append +# is reached. You can select among five behaviors: +# +# volatile-lru -> Evict using approximated LRU among the keys with an expire set. +# allkeys-lru -> Evict any key using approximated LRU. +# volatile-lfu -> Evict using approximated LFU among the keys with an expire set. +# allkeys-lfu -> Evict any key using approximated LFU. +# volatile-random -> Remove a random key among the ones with an expire set. +# allkeys-random -> Remove a random key, any key. +# volatile-ttl -> Remove the key with the nearest expire time (minor TTL) +# noeviction -> Don't evict anything, just return an error on write operations. +# +# LRU means Least Recently Used +# LFU means Least Frequently Used +# +# Both LRU, LFU and volatile-ttl are implemented using approximated +# randomized algorithms. +# +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append # incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd # sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby # zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby @@ -309,15 +594,67 @@ slave-priority 100 # # The default is: # -# maxmemory-policy volatile-lru +# maxmemory-policy noeviction -# LRU and minimal TTL algorithms are not precise algorithms but approximated -# algorithms (in order to save memory), so you can select as well the sample -# size to check. For instance for default Redis will check three keys and -# pick the one that was used less recently, you can change the sample size -# using the following configuration directive. +# LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated +# algorithms (in order to save memory), so you can tune it for speed or +# accuracy. For default Redis will check five keys and pick the one that was +# used less recently, you can change the sample size using the following +# configuration directive. +# +# The default of 5 produces good enough results. 10 Approximates very closely +# true LRU but costs more CPU. 3 is faster but not very accurate. # -# maxmemory-samples 3 +# maxmemory-samples 5 + +############################# LAZY FREEING #################################### + +# Redis has two primitives to delete keys. One is called DEL and is a blocking +# deletion of the object. It means that the server stops processing new commands +# in order to reclaim all the memory associated with an object in a synchronous +# way. If the key deleted is associated with a small object, the time needed +# in order to execute the DEL command is very small and comparable to most other +# O(1) or O(log_N) commands in Redis. However if the key is associated with an +# aggregated value containing millions of elements, the server can block for +# a long time (even seconds) in order to complete the operation. +# +# For the above reasons Redis also offers non blocking deletion primitives +# such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and +# FLUSHDB commands, in order to reclaim memory in background. Those commands +# are executed in constant time. Another thread will incrementally free the +# object in the background as fast as possible. +# +# DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled. +# It's up to the design of the application to understand when it is a good +# idea to use one or the other. However the Redis server sometimes has to +# delete keys or flush the whole database as a side effect of other operations. +# Specifically Redis deletes objects independently of a user call in the +# following scenarios: +# +# 1) On eviction, because of the maxmemory and maxmemory policy configurations, +# in order to make room for new data, without going over the specified +# memory limit. +# 2) Because of expire: when a key with an associated time to live (see the +# EXPIRE command) must be deleted from memory. +# 3) Because of a side effect of a command that stores data on a key that may +# already exist. For example the RENAME command may delete the old key +# content when it is replaced with another one. Similarly SUNIONSTORE +# or SORT with STORE option may delete existing keys. The SET command +# itself removes any old content of the specified key in order to replace +# it with the specified string. +# 4) During replication, when a slave performs a full resynchronization with +# its master, the content of the whole database is removed in order to +# load the RDB file just transfered. +# +# In all the above cases the default is to delete objects in a blocking way, +# like if DEL was called. However you can configure each case specifically +# in order to instead release memory in a non-blocking way like if UNLINK +# was called, using the following configuration directives: + +lazyfree-lazy-eviction no +lazyfree-lazy-expire no +lazyfree-lazy-server-del no +slave-lazy-flush no ############################## APPEND ONLY MODE ############################### @@ -339,24 +676,24 @@ slave-priority 100 # # Please check http://redis.io/topics/persistence for more information. -# # OE: changed default to enable this appendonly yes # The name of the append only file (default: "appendonly.aof") -# appendfilename appendonly.aof + +appendfilename "appendonly.aof" # The fsync() call tells the Operating System to actually write data on disk -# instead to wait for more data in the output buffer. Some OS will really flush +# instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. # # Redis supports three different modes: # # no: don't fsync, just let the OS flush the data when it wants. Faster. -# always: fsync after every write to the append only log . Slow, Safest. +# always: fsync after every write to the append only log. Slow, Safest. # everysec: fsync only one time every second. Compromise. # -# The default is "everysec" that's usually the right compromise between +# The default is "everysec", as that's usually the right compromise between # speed and data safety. It's up to you to understand if you can relax this to # "no" that will let the operating system flush the output buffer when # it wants, for better performances (but if you can live with the idea of @@ -384,21 +721,22 @@ appendfsync everysec # that will prevent fsync() from being called in the main process while a # BGSAVE or BGREWRITEAOF is in progress. # -# This means that while another child is saving the durability of Redis is -# the same as "appendfsync none", that in practical terms means that it is -# possible to lost up to 30 seconds of log in the worst scenario (with the +# This means that while another child is saving, the durability of Redis is +# the same as "appendfsync none". In practical terms, this means that it is +# possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). -# +# # If you have latency problems turn this to "yes". Otherwise leave it as # "no" that is the safest pick from the point of view of durability. + no-appendfsync-on-rewrite no # Automatic rewrite of the append only file. # Redis is able to automatically rewrite the log file implicitly calling -# BGREWRITEAOF when the AOF log size will growth by the specified percentage. -# +# BGREWRITEAOF when the AOF log size grows by the specified percentage. +# # This is how it works: Redis remembers the size of the AOF file after the -# latest rewrite (or if no rewrite happened since the restart, the size of +# latest rewrite (if no rewrite has happened since the restart, the size of # the AOF at startup is used). # # This base size is compared to the current size. If the current size is @@ -413,6 +751,44 @@ no-appendfsync-on-rewrite no auto-aof-rewrite-percentage 100 auto-aof-rewrite-min-size 64mb +# An AOF file may be found to be truncated at the end during the Redis +# startup process, when the AOF data gets loaded back into memory. +# This may happen when the system where Redis is running +# crashes, especially when an ext4 filesystem is mounted without the +# data=ordered option (however this can't happen when Redis itself +# crashes or aborts but the operating system still works correctly). +# +# Redis can either exit with an error when this happens, or load as much +# data as possible (the default now) and start if the AOF file is found +# to be truncated at the end. The following option controls this behavior. +# +# If aof-load-truncated is set to yes, a truncated AOF file is loaded and +# the Redis server starts emitting a log to inform the user of the event. +# Otherwise if the option is set to no, the server aborts with an error +# and refuses to start. When the option is set to no, the user requires +# to fix the AOF file using the "redis-check-aof" utility before to restart +# the server. +# +# Note that if the AOF file will be found to be corrupted in the middle +# the server will still exit with an error. This option only applies when +# Redis will try to read more data from the AOF file but not enough bytes +# will be found. +aof-load-truncated yes + +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, and continues loading the AOF +# tail. +# +# This is currently turned off by default in order to avoid the surprise +# of a format change, but will at some point be used as the default. +aof-use-rdb-preamble no + ################################ LUA SCRIPTING ############################### # Max execution time of a Lua script in milliseconds. @@ -421,16 +797,157 @@ auto-aof-rewrite-min-size 64mb # still in execution after the maximum allowed time and will start to # reply to queries with an error. # -# When a long running script exceed the maximum execution time only the +# When a long running script exceeds the maximum execution time only the # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be # used to stop a script that did not yet called write commands. The second -# is the only way to shut down the server in the case a write commands was -# already issue by the script but the user don't want to wait for the natural +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural # termination of the script. # # Set it to 0 or a negative value for unlimited execution without warnings. lua-time-limit 5000 +################################ REDIS CLUSTER ############################### +# +# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however +# in order to mark it as "mature" we need to wait for a non trivial percentage +# of users to deploy it in production. +# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +# +# Normal Redis instances can't be part of a Redis Cluster; only nodes that are +# started as cluster nodes can. In order to start a Redis instance as a +# cluster node enable the cluster support uncommenting the following: +# +# cluster-enabled yes + +# Every cluster node has a cluster configuration file. This file is not +# intended to be edited by hand. It is created and updated by Redis nodes. +# Every Redis Cluster node requires a different cluster configuration file. +# Make sure that instances running in the same system do not have +# overlapping cluster configuration file names. +# +# cluster-config-file nodes-6379.conf + +# Cluster node timeout is the amount of milliseconds a node must be unreachable +# for it to be considered in failure state. +# Most other internal time limits are multiple of the node timeout. +# +# cluster-node-timeout 15000 + +# A slave of a failing master will avoid to start a failover if its data +# looks too old. +# +# There is no simple way for a slave to actually have an exact measure of +# its "data age", so the following two checks are performed: +# +# 1) If there are multiple slaves able to failover, they exchange messages +# in order to try to give an advantage to the slave with the best +# replication offset (more data from the master processed). +# Slaves will try to get their rank by offset, and apply to the start +# of the failover a delay proportional to their rank. +# +# 2) Every single slave computes the time of the last interaction with +# its master. This can be the last ping or command received (if the master +# is still in the "connected" state), or the time that elapsed since the +# disconnection with the master (if the replication link is currently down). +# If the last interaction is too old, the slave will not try to failover +# at all. +# +# The point "2" can be tuned by user. Specifically a slave will not perform +# the failover if, since the last interaction with the master, the time +# elapsed is greater than: +# +# (node-timeout * slave-validity-factor) + repl-ping-slave-period +# +# So for example if node-timeout is 30 seconds, and the slave-validity-factor +# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the +# slave will not try to failover if it was not able to talk with the master +# for longer than 310 seconds. +# +# A large slave-validity-factor may allow slaves with too old data to failover +# a master, while a too small value may prevent the cluster from being able to +# elect a slave at all. +# +# For maximum availability, it is possible to set the slave-validity-factor +# to a value of 0, which means, that slaves will always try to failover the +# master regardless of the last time they interacted with the master. +# (However they'll always try to apply a delay proportional to their +# offset rank). +# +# Zero is the only value able to guarantee that when all the partitions heal +# the cluster will always be able to continue. +# +# cluster-slave-validity-factor 10 + +# Cluster slaves are able to migrate to orphaned masters, that are masters +# that are left without working slaves. This improves the cluster ability +# to resist to failures as otherwise an orphaned master can't be failed over +# in case of failure if it has no working slaves. +# +# Slaves migrate to orphaned masters only if there are still at least a +# given number of other working slaves for their old master. This number +# is the "migration barrier". A migration barrier of 1 means that a slave +# will migrate only if there is at least 1 other working slave for its master +# and so forth. It usually reflects the number of slaves you want for every +# master in your cluster. +# +# Default is 1 (slaves migrate only if their masters remain with at least +# one slave). To disable migration just set it to a very large value. +# A value of 0 can be set but is useful only for debugging and dangerous +# in production. +# +# cluster-migration-barrier 1 + +# By default Redis Cluster nodes stop accepting queries if they detect there +# is at least an hash slot uncovered (no available node is serving it). +# This way if the cluster is partially down (for example a range of hash slots +# are no longer covered) all the cluster becomes, eventually, unavailable. +# It automatically returns available as soon as all the slots are covered again. +# +# However sometimes you want the subset of the cluster which is working, +# to continue to accept queries for the part of the key space that is still +# covered. In order to do so, just set the cluster-require-full-coverage +# option to no. +# +# cluster-require-full-coverage yes + +# In order to setup your cluster make sure to read the documentation +# available at http://redis.io web site. + +########################## CLUSTER DOCKER/NAT support ######################## + +# In certain deployments, Redis Cluster nodes address discovery fails, because +# addresses are NAT-ted or because ports are forwarded (the typical case is +# Docker and other containers). +# +# In order to make Redis Cluster working in such environments, a static +# configuration where each node knows its public address is needed. The +# following two options are used for this scope, and are: +# +# * cluster-announce-ip +# * cluster-announce-port +# * cluster-announce-bus-port +# +# Each instruct the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. +# +# If the above options are not used, the normal Redis Cluster auto-detection +# will be used instead. +# +# Note that when remapped, the bus port may not be at the fixed offset of +# clients port + 10000, so you can specify any port and bus-port depending +# on how they get remapped. If the bus-port is not set, a fixed offset of +# 10000 will be used as usually. +# +# Example: +# +# cluster-announce-ip 10.1.1.5 +# cluster-announce-port 6379 +# cluster-announce-bus-port 6380 + ################################## SLOW LOG ################################### # The Redis Slow Log is a system to log queries that exceeded a specified @@ -439,7 +956,7 @@ lua-time-limit 5000 # but just the time needed to actually execute the command (this is the only # stage of command execution where the thread is blocked and can not serve # other requests in the meantime). -# +# # You can configure the slow log with two parameters: one tells Redis # what is the execution time, in microseconds, to exceed in order for the # command to get logged, and the other parameter is the length of the @@ -455,6 +972,73 @@ slowlog-log-slower-than 10000 # You can reclaim memory used by the slow log with SLOWLOG RESET. slowlog-max-len 128 +################################ LATENCY MONITOR ############################## + +# The Redis latency monitoring subsystem samples different operations +# at runtime in order to collect data related to possible sources of +# latency of a Redis instance. +# +# Via the LATENCY command this information is available to the user that can +# print graphs and obtain reports. +# +# The system only logs operations that were performed in a time equal or +# greater than the amount of milliseconds specified via the +# latency-monitor-threshold configuration directive. When its value is set +# to zero, the latency monitor is turned off. +# +# By default latency monitoring is disabled since it is mostly not needed +# if you don't have latency issues, and collecting data has a performance +# impact, that while very small, can be measured under big load. Latency +# monitoring can easily be enabled at runtime using the command +# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed. +latency-monitor-threshold 0 + +############################# EVENT NOTIFICATION ############################## + +# Redis can notify Pub/Sub clients about events happening in the key space. +# This feature is documented at http://redis.io/topics/notifications +# +# For instance if keyspace events notification is enabled, and a client +# performs a DEL operation on key "foo" stored in the Database 0, two +# messages will be published via Pub/Sub: +# +# PUBLISH __keyspace@0__:foo del +# PUBLISH __keyevent@0__:del foo +# +# It is possible to select the events that Redis will notify among a set +# of classes. Every class is identified by a single character: +# +# K Keyspace events, published with __keyspace@<db>__ prefix. +# E Keyevent events, published with __keyevent@<db>__ prefix. +# g Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ... +# $ String commands +# l List commands +# s Set commands +# h Hash commands +# z Sorted set commands +# x Expired events (events generated every time a key expires) +# e Evicted events (events generated when a key is evicted for maxmemory) +# A Alias for g$lshzxe, so that the "AKE" string means all the events. +# +# The "notify-keyspace-events" takes as argument a string that is composed +# of zero or multiple characters. The empty string means that notifications +# are disabled. +# +# Example: to enable list and generic events, from the point of view of the +# event name, use: +# +# notify-keyspace-events Elg +# +# Example 2: to get the stream of the expired keys subscribing to channel +# name __keyevent@0__:expired use: +# +# notify-keyspace-events Ex +# +# By default all notifications are disabled because most users don't need +# this feature and the feature has some overhead. Note that if you don't +# specify at least one of K or E, no events will be delivered. +notify-keyspace-events "" + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a @@ -463,14 +1047,39 @@ slowlog-max-len 128 hash-max-ziplist-entries 512 hash-max-ziplist-value 64 -# Similarly to hashes, small lists are also encoded in a special way in order -# to save a lot of space. The special representation is only used when -# you are under the following limits: -list-max-ziplist-entries 512 -list-max-ziplist-value 64 +# Lists are also encoded in a special way to save a lot of space. +# The number of entries allowed per internal list node can be specified +# as a fixed maximum size or a maximum number of elements. +# For a fixed maximum size, use -5 through -1, meaning: +# -5: max size: 64 Kb <-- not recommended for normal workloads +# -4: max size: 32 Kb <-- not recommended +# -3: max size: 16 Kb <-- probably not recommended +# -2: max size: 8 Kb <-- good +# -1: max size: 4 Kb <-- good +# Positive numbers mean store up to _exactly_ that number of elements +# per list node. +# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), +# but if your use case is unique, adjust the settings as necessary. +list-max-ziplist-size -2 + +# Lists may also be compressed. +# Compress depth is the number of quicklist ziplist nodes from *each* side of +# the list to *exclude* from compression. The head and tail of the list +# are always uncompressed for fast push/pop operations. Settings are: +# 0: disable all list compression +# 1: depth 1 means "don't start compressing until after 1 node into the list, +# going from either the head or tail" +# So: [head]->node->node->...->node->[tail] +# [head], [tail] will always be uncompressed; inner nodes will compress. +# 2: [head]->[next]->node->node->...->node->[prev]->[tail] +# 2 here means: don't compress head or head->next or tail->prev or tail, +# but compress all nodes between them. +# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail] +# etc. +list-compress-depth 0 # Sets have a special encoding in just one case: when a set is composed -# of just strings that happens to be integers in radix 10 in the range +# of just strings that happen to be integers in radix 10 in the range # of 64 bit signed integers. # The following configuration setting sets the limit in the size of the # set in order to use this special memory saving encoding. @@ -482,20 +1091,34 @@ set-max-intset-entries 512 zset-max-ziplist-entries 128 zset-max-ziplist-value 64 +# HyperLogLog sparse representation bytes limit. The limit includes the +# 16 bytes header. When an HyperLogLog using the sparse representation crosses +# this limit, it is converted into the dense representation. +# +# A value greater than 16000 is totally useless, since at that point the +# dense representation is more memory efficient. +# +# The suggested value is ~ 3000 in order to have the benefits of +# the space efficient encoding without slowing down too much PFADD, +# which is O(N) with the sparse encoding. The value can be raised to +# ~ 10000 when CPU is not a concern, but space is, and the data set is +# composed of many HyperLogLogs with cardinality in the 0 - 15000 range. +hll-sparse-max-bytes 3000 + # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in # order to help rehashing the main Redis hash table (the one mapping top-level # keys to values). The hash table implementation Redis uses (see dict.c) -# performs a lazy rehashing: the more operation you run into an hash table +# performs a lazy rehashing: the more operation you run into a hash table # that is rehashing, the more rehashing "steps" are performed, so if the # server is idle the rehashing is never complete and some more memory is used # by the hash table. -# +# # The default is to use this millisecond 10 times every second in order to -# active rehashing the main dictionaries, freeing memory when possible. +# actively rehash the main dictionaries, freeing memory when possible. # # If unsure: # use "activerehashing no" if you have hard latency requirements and it is -# not a good thing in your environment that Redis can reply form time to time +# not a good thing in your environment that Redis can reply from time to time # to queries with 2 milliseconds delay. # # use "activerehashing yes" if you don't have such hard requirements but @@ -509,9 +1132,9 @@ activerehashing yes # # The limit can be set differently for the three different classes of clients: # -# normal -> normal clients -# slave -> slave clients and MONITOR clients -# pubsub -> clients subcribed to at least one pubsub channel or pattern +# normal -> normal clients including MONITOR clients +# slave -> slave clients +# pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: # @@ -534,17 +1157,158 @@ activerehashing yes # Instead there is a default limit for pubsub and slave clients, since # subscribers and slaves receive data in a push fashion. # -# Both the hard or the soft limit can be disabled just setting it to zero. +# Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit slave 256mb 64mb 60 client-output-buffer-limit pubsub 32mb 8mb 60 -################################## INCLUDES ################################### +# Client query buffers accumulate new commands. They are limited to a fixed +# amount by default in order to avoid that a protocol desynchronization (for +# instance due to a bug in the client) will lead to unbound memory usage in +# the query buffer. However you can configure it here if you have very special +# needs, such us huge multi/exec requests or alike. +# +# client-query-buffer-limit 1gb -# Include one or more other config files here. This is useful if you -# have a standard template that goes to all Redis server but also need -# to customize a few per-server settings. Include files can include -# other files, so use this wisely. +# In the Redis protocol, bulk requests, that are, elements representing single +# strings, are normally limited ot 512 mb. However you can change this limit +# here. # -# include /path/to/local.conf -# include /path/to/other.conf +# proto-max-bulk-len 512mb + +# Redis calls an internal function to perform many background tasks, like +# closing connections of clients in timeout, purging expired keys that are +# never requested, and so forth. +# +# Not all tasks are performed with the same frequency, but Redis checks for +# tasks to perform according to the specified "hz" value. +# +# By default "hz" is set to 10. Raising the value will use more CPU when +# Redis is idle, but at the same time will make Redis more responsive when +# there are many keys expiring at the same time, and timeouts may be +# handled with more precision. +# +# The range is between 1 and 500, however a value over 100 is usually not +# a good idea. Most users should use the default of 10 and raise this up to +# 100 only in environments where very low latency is required. +hz 10 + +# When a child rewrites the AOF file, if the following option is enabled +# the file will be fsync-ed every 32 MB of data generated. This is useful +# in order to commit the file to the disk more incrementally and avoid +# big latency spikes. +aof-rewrite-incremental-fsync yes + +# Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good +# idea to start with the default settings and only change them after investigating +# how to improve the performances and how the keys LFU change over time, which +# is possible to inspect via the OBJECT FREQ command. +# +# There are two tunable parameters in the Redis LFU implementation: the +# counter logarithm factor and the counter decay time. It is important to +# understand what the two parameters mean before changing them. +# +# The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis +# uses a probabilistic increment with logarithmic behavior. Given the value +# of the old counter, when a key is accessed, the counter is incremented in +# this way: +# +# 1. A random number R between 0 and 1 is extracted. +# 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1). +# 3. The counter is incremented only if R < P. +# +# The default lfu-log-factor is 10. This is a table of how the frequency +# counter changes with a different number of accesses with different +# logarithmic factors: +# +# +--------+------------+------------+------------+------------+------------+ +# | factor | 100 hits | 1000 hits | 100K hits | 1M hits | 10M hits | +# +--------+------------+------------+------------+------------+------------+ +# | 0 | 104 | 255 | 255 | 255 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# | 1 | 18 | 49 | 255 | 255 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# | 10 | 10 | 18 | 142 | 255 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# | 100 | 8 | 11 | 49 | 143 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# +# NOTE: The above table was obtained by running the following commands: +# +# redis-benchmark -n 1000000 incr foo +# redis-cli object freq foo +# +# NOTE 2: The counter initial value is 5 in order to give new objects a chance +# to accumulate hits. +# +# The counter decay time is the time, in minutes, that must elapse in order +# for the key counter to be divided by two (or decremented if it has a value +# less <= 10). +# +# The default value for the lfu-decay-time is 1. A Special value of 0 means to +# decay the counter every time it happens to be scanned. +# +# lfu-log-factor 10 +# lfu-decay-time 1 + +########################### ACTIVE DEFRAGMENTATION ####################### +# +# WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested +# even in production and manually tested by multiple engineers for some +# time. +# +# What is active defragmentation? +# ------------------------------- +# +# Active (online) defragmentation allows a Redis server to compact the +# spaces left between small allocations and deallocations of data in memory, +# thus allowing to reclaim back memory. +# +# Fragmentation is a natural process that happens with every allocator (but +# less so with Jemalloc, fortunately) and certain workloads. Normally a server +# restart is needed in order to lower the fragmentation, or at least to flush +# away all the data and create it again. However thanks to this feature +# implemented by Oran Agra for Redis 4.0 this process can happen at runtime +# in an "hot" way, while the server is running. +# +# Basically when the fragmentation is over a certain level (see the +# configuration options below) Redis will start to create new copies of the +# values in contiguous memory regions by exploiting certain specific Jemalloc +# features (in order to understand if an allocation is causing fragmentation +# and to allocate it in a better place), and at the same time, will release the +# old copies of the data. This process, repeated incrementally for all the keys +# will cause the fragmentation to drop back to normal values. +# +# Important things to understand: +# +# 1. This feature is disabled by default, and only works if you compiled Redis +# to use the copy of Jemalloc we ship with the source code of Redis. +# This is the default with Linux builds. +# +# 2. You never need to enable this feature if you don't have fragmentation +# issues. +# +# 3. Once you experience fragmentation, you can enable this feature when +# needed with the command "CONFIG SET activedefrag yes". +# +# The configuration parameters are able to fine tune the behavior of the +# defragmentation process. If you are not sure about what they mean it is +# a good idea to leave the defaults untouched. + +# Enabled active defragmentation +# activedefrag yes + +# Minimum amount of fragmentation waste to start active defrag +# active-defrag-ignore-bytes 100mb + +# Minimum percentage of fragmentation to start active defrag +# active-defrag-threshold-lower 10 + +# Maximum percentage of fragmentation at which we use maximum effort +# active-defrag-threshold-upper 100 + +# Minimal effort for defrag in CPU percentage +# active-defrag-cycle-min 25 + +# Maximal effort for defrag in CPU percentage +# active-defrag-cycle-max 75 diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch new file mode 100644 index 000000000..23b2f2aaf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch @@ -0,0 +1,72 @@ +From c486455e0691f9915018b9d8b133200a6c61a3c5 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Thu, 24 May 2018 09:58:42 -0700 +Subject: [PATCH] Remove atomics + +Based on this patch: +https://github.com/patrikx3/lede-redis/blob/master/redis/patches/010-redis.patch + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +--- + deps/jemalloc/src/pages.c | 22 +--------------------- + src/atomicvar.h | 4 ++-- + 2 files changed, 3 insertions(+), 23 deletions(-) + +diff --git a/deps/jemalloc/src/pages.c b/deps/jemalloc/src/pages.c +index 83a167f6..8e82c78d 100644 +--- a/deps/jemalloc/src/pages.c ++++ b/deps/jemalloc/src/pages.c +@@ -147,27 +147,7 @@ pages_purge(void *addr, size_t size) + { + bool unzeroed; + +-#ifdef _WIN32 +- VirtualAlloc(addr, size, MEM_RESET, PAGE_READWRITE); +- unzeroed = true; +-#elif defined(JEMALLOC_HAVE_MADVISE) +-# ifdef JEMALLOC_PURGE_MADVISE_DONTNEED +-# define JEMALLOC_MADV_PURGE MADV_DONTNEED +-# define JEMALLOC_MADV_ZEROS true +-# elif defined(JEMALLOC_PURGE_MADVISE_FREE) +-# define JEMALLOC_MADV_PURGE MADV_FREE +-# define JEMALLOC_MADV_ZEROS false +-# else +-# error "No madvise(2) flag defined for purging unused dirty pages." +-# endif +- int err = madvise(addr, size, JEMALLOC_MADV_PURGE); +- unzeroed = (!JEMALLOC_MADV_ZEROS || err != 0); +-# undef JEMALLOC_MADV_PURGE +-# undef JEMALLOC_MADV_ZEROS +-#else +- /* Last resort no-op. */ +- unzeroed = true; +-#endif ++ unzeroed = false; + return (unzeroed); + } + +diff --git a/src/atomicvar.h b/src/atomicvar.h +index 84a5bbc5..f9b563c2 100644 +--- a/src/atomicvar.h ++++ b/src/atomicvar.h +@@ -68,7 +68,7 @@ + * is reported. */ + // #define __ATOMIC_VAR_FORCE_SYNC_MACROS + +-#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) ++#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) + /* Implementation using __atomic macros. */ + + #define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED) +@@ -82,7 +82,7 @@ + #define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED) + #define REDIS_ATOMIC_API "atomic-builtin" + +-#elif defined(HAVE_ATOMIC) ++#elif defined(CONFIG_EDAC_ATOMIC_SCRUB) && defined(HAVE_ATOMIC) + /* Implementation using __sync macros. */ + + #define atomicIncr(var,count) __sync_add_and_fetch(&var,(count)) +-- +2.17.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_3.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.8.bb index 9395b33b0..80d36d2ba 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_3.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.8.bb @@ -13,11 +13,13 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://redis.conf \ file://init-redis-server \ file://redis.service \ - file://hiredis-update-Makefile-to-add-symbols-to-staticlib.patch \ " -SRC_URI[md5sum] = "87be8867447f62524b584813e5a7bd14" -SRC_URI[sha256sum] = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f" +SRC_URI_append_mips = " file://remove-atomics.patch" +SRC_URI_append_arm = " file://remove-atomics.patch" + +SRC_URI[md5sum] = "c75b11e4177e153e4dc1d8dd3a6174e4" +SRC_URI[sha256sum] = "ff0c38b8c156319249fec61e5018cf5b5fe63a65b61690bec798f4c998c232ad" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb index 797bcaaee..ff9957480 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.0.bb @@ -4,13 +4,13 @@ HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d" -DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native" +DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native python-setuptools-native" -SRCREV = "61f116744262c4c18922dcf806e496715f199669" -PV = "1.6.0" +SRCREV = "bfc82d5242855628b826018479df00e0ec4e8360" +PV = "1.7.0" SRC_URI = "\ - git://github.com/oetiker/rrdtool-1.x.git;branch=1.6;protocol=http; \ + git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http; \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch new file mode 100644 index 000000000..68b686346 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-fix-jump-misses-init-error.patch @@ -0,0 +1,71 @@ +From 3e5a0cb440c788e2383e40ab23ac1cf01d96961b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 24 Jul 2018 01:30:25 -0700 +Subject: [PATCH] src/tcp.c: fix jump-misses-init error + +Fix below jump-misses-init error + +| In file included from ../../git/src/tcp.c:51: +| ../../git/src/tcp.c: In function 'relpTcpConnect': +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] +| goto finalize_it; \ +| ^~~~ +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' +| ABORT_FINALIZE(RELP_RET_IO_ERR); +| ^~~~~~~~~~~~~~ +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here +| finalize_it: +| ^~~~~~~~~~~ +| ../../git/src/tcp.c:1991:6: note: 'r' declared here +| int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len); +| ^ +| In file included from ../../git/src/tcp.c:51: +| ../../git/src/relp.h:220:3: error: jump skips variable initialization [-Werror=jump-misses-init] +| goto finalize_it; \ +| ^~~~ +| ../../git/src/tcp.c:1951:3: note: in expansion of macro 'ABORT_FINALIZE' +| ABORT_FINALIZE(RELP_RET_IO_ERR); +| ^~~~~~~~~~~~~~ +| ../../git/src/tcp.c:2005:1: note: label 'finalize_it' defined here +| finalize_it: +| ^~~~~~~~~~~ +| ../../git/src/tcp.c:1989:12: note: 'len' declared here +| socklen_t len = sizeof so_error; +| ^~~ + +Upstream-Status: Submitted[https://github.com/rsyslog/librelp/pull/117] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/tcp.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/tcp.c b/src/tcp.c +index f35eb84..fb34dc7 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -1936,6 +1936,9 @@ relpTcpConnect(relpTcp_t *const pThis, + struct addrinfo hints; + struct addrinfo *reslocal = NULL; + struct pollfd pfd; ++ int so_error; ++ socklen_t len = sizeof so_error; ++ int r; + + ENTER_RELPFUNC; + RELPOBJ_assert(pThis, Tcp); +@@ -1985,10 +1988,8 @@ relpTcpConnect(relpTcp_t *const pThis, + ABORT_FINALIZE(RELP_RET_TIMED_OUT); + } + +- int so_error; +- socklen_t len = sizeof so_error; + +- int r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len); ++ r = getsockopt(pThis->sock, SOL_SOCKET, SO_ERROR, &so_error, &len); + if (r == -1 || so_error != 0) { + pThis->pEngine->dbgprint("socket has an error %d\n", so_error); + ABORT_FINALIZE(RELP_RET_IO_ERR); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch new file mode 100644 index 000000000..5a62e1584 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-src-tcp.c-increase-the-size-of-szHname.patch @@ -0,0 +1,53 @@ +From d8950ad273d79ec516468289adbd427e681dbc66 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 30 Jul 2018 01:22:56 -0700 +Subject: [PATCH] src/tcp.c: increase the size of szHname + +Increase the size of szHname to fix below +error: +| ../../git/src/tcp.c: In function 'relpTcpSetRemHost': +| ../../git/src/tcp.c:352:57: error: '%s' directive output may be truncated writing up to 1024 bytes into a region of size 1011 [-Werror=format-truncation=] +| snprintf((char*)szHname, NI_MAXHOST, "[MALICIOUS:IP=%s]", szIP); +| ^~ ~~~~ +| In file included from /poky-build/tmp/work/i586-poky-linux/librelp/1.2.16-r0/recipe-sysroot/usr/include/stdio.h:862, +| from ../../git/src/tcp.c:38: +| /poky-build/tmp/work/i586-poky-linux/librelp/1.2.16-r0/recipe-sysroot/usr/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' output between 16 and 1040 bytes into a destination of size 1025 +| return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| __bos (__s), __fmt, __va_arg_pack ()); +| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| cc1: all warnings being treated as errors +| Makefile:536: recipe for target 'librelp_la-tcp.lo' failed + +Upstream-Status: Submitted[https://github.com/rsyslog/librelp/pull/118] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tcp.c b/src/tcp.c +index fb34dc7..2c38b0b 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -319,7 +319,7 @@ relpTcpSetRemHost(relpTcp_t *const pThis, struct sockaddr *pAddr) + relpEngine_t *pEngine; + int error; + unsigned char szIP[NI_MAXHOST] = ""; +- unsigned char szHname[NI_MAXHOST] = ""; ++ unsigned char szHname[1045] = ""; + struct addrinfo hints, *res; + size_t len; + +@@ -349,7 +349,7 @@ relpTcpSetRemHost(relpTcp_t *const pThis, struct sockaddr *pAddr) + if(getaddrinfo((char*)szHname, NULL, &hints, &res) == 0) { + freeaddrinfo (res); + /* OK, we know we have evil, so let's indicate this to our caller */ +- snprintf((char*)szHname, NI_MAXHOST, "[MALICIOUS:IP=%s]", szIP); ++ snprintf((char*)szHname, sizeof(szHname), "[MALICIOUS:IP=%s]", szIP); + pEngine->dbgprint("Malicious PTR record, IP = \"%s\" HOST = \"%s\"", szIP, szHname); + iRet = RELP_RET_MALICIOUS_HNAME; + } +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.16.bb index 28047eb54..17478efe4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.16.bb @@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9" DEPENDS = "gmp nettle libidn zlib gnutls" -SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https" +SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \ + file://0001-src-tcp.c-fix-jump-misses-init-error.patch \ + file://0001-src-tcp.c-increase-the-size-of-szHname.patch \ +" -SRCREV = "fc512e337bfc7c92770246dbff5f482b879498b9" +SRCREV = "5e849ff060be0c7dce972e194c54fdacfee0adc2" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch index ca88dd3f7..6ce8b7a9c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch @@ -1,6 +1,6 @@ -From 9739095de6ae5f844354756ae968f5f8864eb3e3 Mon Sep 17 00:00:00 2001 +From 7baf35b88d742032a2dc456c396843e17e866f8e Mon Sep 17 00:00:00 2001 From: Ming Liu <peter.x.liu@external.atlascopco.com> -Date: Sun, 26 Feb 2017 14:10:21 +0100 +Date: Wed, 27 Jun 2018 14:04:57 +0800 Subject: [PATCH] Include sys/time.h struct timeval is defined in sys/time.h with a musl libc. @@ -8,13 +8,13 @@ struct timeval is defined in sys/time.h with a musl libc. Upstream-Status: Inappropriate [musl libc specific] Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> - +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- tests/msleep.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/msleep.c b/tests/msleep.c -index 26a8206..ca818be 100644 +index 98dbece..96f6950 100644 --- a/tests/msleep.c +++ b/tests/msleep.c @@ -26,11 +26,7 @@ @@ -26,6 +26,7 @@ index 26a8206..ca818be 100644 -#else -#include <time.h> -#endif - - int main(int argc, char *argv[]) - { + #if defined(HAVE_SYS_SELECT_H) + #include <sys/select.h> + #endif +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf index 324ae6d82..dbfefb759 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -84,3 +84,8 @@ $ActionQueueMaxDiskSpace 10m # 1gb space limit (use as much as possible) # UDP Syslog Server: #$ModLoad imudp.so # provides UDP syslog reception #$UDPServerRun 514 # start a UDP syslog server at standard port 514 + +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 94ec517b2..5f8568fce 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -9,7 +9,7 @@ delaycompress compress postrotate - /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true + @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true endscript } @@ -34,6 +34,6 @@ delaycompress sharedscripts postrotate - /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true + @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true endscript } diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 162d239a1..035258726 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch @@ -3,7 +3,7 @@ From: Roy Li <rongqing.li@windriver.com> Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt -Upstream-status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] libgcrypt does no longer provide libgcrypt-config, and provide *.pc, so we should use pkgconfig to check diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb index 476540d0a..1fb439015 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb @@ -30,8 +30,11 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "3805617f65a4b4bea34606487a5255a0" -SRC_URI[sha256sum] = "220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738" +SRC_URI[md5sum] = "e0942b4b88a13602a6b6352bf9f05091" +SRC_URI[sha256sum] = "295c289b4c8abd8f8f3fe35a83249b739cedabe82721702b910255f9faf147e7" + +UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig systemd update-rc.d ptest @@ -40,7 +43,7 @@ EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" # first line is default yes in configure PACKAGECONFIG ??= " \ rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ - imdiag gnutls imfile \ + fmhttp imdiag gnutls imfile \ ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ " @@ -49,6 +52,7 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp," PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," +PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl," PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," @@ -63,6 +67,7 @@ PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," +PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," @@ -82,10 +87,14 @@ do_install_ptest() { # do NOT need to rebuild Makefile itself sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + # do NOT need to rebuild $(check_PROGRAMS) + sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # fix the srcdir, top_srcdir sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + # fix the abs_top_builddir + sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # valgrind is not compatible with arm and mips, # so remove related test cases if there is no valgrind. @@ -121,6 +130,12 @@ do_install_append() { install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + + if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then + install -d 0755 ${D}${sysconfdir}/rsyslog.d + echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf + fi } FILES_${PN} += "${bindir}" @@ -146,5 +161,6 @@ VALGRIND_mips64 = "" VALGRIND_mips64n32 = "" VALGRIND_arm = "" VALGRIND_aarch64 = "" +VALGRIND_riscv64 = "" RDEPENDS_${PN}-ptest += "make diffutils gzip bash gawk coreutils procps" RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch new file mode 100644 index 000000000..e4bde80a0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-fix-compile-failure-with-libc-musl.patch @@ -0,0 +1,80 @@ +From c51c2c543f3c78b2a68acc61f786f903f2e0fec8 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 9 Sep 2018 07:28:09 -0400 +Subject: [PATCH] fix compile failure with libc musl + +The lack of random_r in musl: +[snip] +|main.c:1393:7: warning: implicit declaration of function 'random_r'; +did you mean 'random'? [-Wimplicit-function-declaration] +| rv = random_r(&rand_data, &val); +| ^~~~~~~~ +| random +|main.c:1408:30: error: invalid application of 'sizeof' to incomplete +type 'struct random_data' +| memset(&rand_data, 0, sizeof(rand_data)); +[snip] + +s/random_r/random/, s/initstate_r/initstate/ and remove `static struct +random_data rand_data' + +Here is the man of `random_r()': +[snip] +The random_r() function is like random(3), except that instead of using +state information maintained in a global variable +[snip] + +So use random without state information is OK. + +Upstream-Status: Submitted [sanlock-devel@lists.fedorahosted.org] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/main.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/main.c b/src/main.c +index f60b4d3..602c400 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -84,7 +84,6 @@ static char command[COMMAND_MAX]; + static int cmd_argc; + static char **cmd_argv; + static struct thread_pool pool; +-static struct random_data rand_data; + static char rand_state[32]; + static pthread_mutex_t rand_mutex = PTHREAD_MUTEX_INITIALIZER; + static const char *run_dir = NULL; +@@ -1386,16 +1385,15 @@ int get_rand(int a, int b); + + int get_rand(int a, int b) + { +- int32_t val; +- int rv; ++ long int rv; + + pthread_mutex_lock(&rand_mutex); +- rv = random_r(&rand_data, &val); ++ rv = random(); + pthread_mutex_unlock(&rand_mutex); + if (rv < 0) + return rv; + +- return a + (int) (((float)(b - a + 1)) * val / (RAND_MAX+1.0)); ++ return a + (int) (((float)(b - a + 1)) * rv / (RAND_MAX+1.0)); + } + + static void setup_host_name(void) +@@ -1405,9 +1403,7 @@ static void setup_host_name(void) + uuid_t uu; + + memset(rand_state, 0, sizeof(rand_state)); +- memset(&rand_data, 0, sizeof(rand_data)); +- +- initstate_r(time(NULL), rand_state, sizeof(rand_state), &rand_data); ++ initstate(time(NULL), rand_state, sizeof(rand_state)); + + /* use host name from command line */ + +-- +2.8.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb new file mode 100644 index 000000000..c51bccce3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.6.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "A shared storage lock manager" +DESCRIPTION = "sanlock is a lock manager built on shared storage. Hosts with access \ +to the storage can perform locking. An application running on the \ +hosts is given a small amount of space on the shared block device or \ +file, and uses sanlock for its own application-specific synchronization. \ +Internally, the sanlock daemon manages locks using two disk-based \ +lease algorithms: delta leases and paxos leases." +HOMEPAGE = "https://pagure.io/sanlock" +SECTION = "utils" + +LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" + +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-fix-compile-failure-with-libc-musl.patch \ + " +SRCREV = "90b2ffa77edd46bea007b7bb39bfd4d2db2ff7af" +S = "${WORKDIR}/git" + +DEPENDS = "libaio util-linux" + +inherit distutils + +do_configure[noexec] = "1" + +do_compile_prepend () { + oe_runmake -C wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" + oe_runmake -C src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" + cd ${S}/python +} + +do_install_prepend () { + oe_runmake -C wdmd DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake -C src DESTDIR=${D} LIBDIR=${libdir} install + cd ${S}/python +} diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch new file mode 100644 index 000000000..7279d84a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch @@ -0,0 +1,31 @@ +From ad6ca4f392bf549239b1ed3b2b372070eb127e7f Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 11 Jul 2018 11:06:04 +0800 +Subject: [PATCH] Makefile.am: fix sfcbinst2mof_DEPENDENCIES + +Fixed build with automake 1.16.1: +/path/to/i586-poky-linux/8.1.0/ld: cannot find -lsfcBrokerCore +collect2: error: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 34ac319..47deed7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -360,6 +360,7 @@ sfcbproc_SOURCES=sfcbproc.c + + sfcbinst2mof_SOURCES=sfcbinst2mof.c + sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore ++sfcbinst2mof_DEPENDENCIES = libsfcBrokerCore.la libsfcFileRepository.la + + sfcbtrace_SOURCES=sfcbtrace.c + sfcbtrace_LDADD = -lsfcBrokerCore +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 10ffaaa31..91c50027d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -25,6 +25,7 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://sblim-sfcb-1.4.9-fix-ftbfs.patch \ file://0001-include-stdint.h-system-header-for-UINT16_MAX.patch \ file://0001-Replace-need-for-error.h-when-it-does-not-exist.patch \ + file://sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch \ " SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" @@ -67,14 +68,8 @@ do_install() { } pkg_postinst_${PN} () { - OPTS="" - if [ x"$D" != "x" ]; then - OPTS="--root=$D" - if type systemctl >/dev/null 2>/dev/null; then - systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} - fi - exit 1 + $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} fi ${datadir}/sfcb/genSslCert.sh ${sysconfdir}/sfcb diff --git a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index e202d16eb..77d3cfeef 100644 --- a/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -33,16 +33,14 @@ INITSCRIPT_PARAMS_${PN}-diskmon = "defaults 80 20" INITSCRIPT_NAME_${PN}-raidmon = "sgraid" INITSCRIPT_PARAMS_${PN}-raidmon = "defaults 80 20" -PACKAGES =+ "${PN}-diskmon ${PN}-diskmon-dbg" -PACKAGES =+ "${PN}-raidmon ${PN}-raidmon-dbg" +PACKAGES =+ "${PN}-diskmon" +PACKAGES =+ "${PN}-raidmon" -FILES_${PN}-dbg += "/usr/share/scsirastools/.debug" +RPROVIDES_${PN}-dbg += "${PN}-diskmon-dbg ${PN}-raidmon-dbg" FILES_${PN}-diskmon = "${sbindir}/sgdiskmon ${sysconfdir}/init.d/sgdisk" -FILES_${PN}-diskmon-dbg = "${sbindir}/.debug/sgdiskmon" FILES_${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" -FILES_${PN}-raidmon-dbg = "${sbindir}/.debug/sgraidmon" RDEPENDS_${PN} += "bash" RDEPENDS_${PN}-diskmon += "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb new file mode 100644 index 000000000..cec569f62 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A utility to manage self encrypting drives that conform \ +to the Trusted Computing Group OPAL 2.0 SSC specification." +SUMMARY = "The Drive Trust Alliance Self Encrypting Drive Utility" +HOMEPAGE = "https://github.com/Drive-Trust-Alliance/sedutil" +SECTION = "console/utils" +LICENSE = "GPLv3" + +LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" + +BASEPV = "1.15.1" +PV = "${BASEPV}+git${SRCPV}" +SRCREV = "358cc758948be788284d5faba46ccf4cc1813796" +SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch new file mode 100644 index 000000000..91e64d217 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch @@ -0,0 +1,28 @@ +From f28aa188e5b0ea85369febe657b8807b8025038b Mon Sep 17 00:00:00 2001 +From: chrfranke <authors@smartmontools.org> +Date: Wed, 8 Nov 2017 06:15:50 +0000 +Subject: [PATCH] os_linux.cpp: Use 'realpath()' (BSD, POSIX) instead of + 'canonicalize_file_name()' (GNU extension). This fixes build on systems with + musl libc (#921). + +git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@4603 4ea69e1a-61f1-4043-bf83-b5c94c648137 + +Upstream-Status: Backport [https://www.smartmontools.org/ticket/921] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + os_linux.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os_linux.cpp b/os_linux.cpp +index 134d5bc..935f9c7 100644 +--- a/os_linux.cpp ++++ b/os_linux.cpp +@@ -3176,7 +3176,7 @@ static bool is_hpsa(const char * name) + { + char path[128]; + snprintf(path, sizeof(path), "/sys/block/%s/device", name); +- char * syshostpath = canonicalize_file_name(path); ++ char * syshostpath = realpath(name, (char *)0); + if (!syshostpath) + return false; + diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb index 1a1767e11..c77c10551 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Control and monitor storage systems using S.M.A.R.T" -DESCRIPTION = \ -"The smartmontools package contains two utility programs (smartctl \ +DESCRIPTION = "\ +The smartmontools package contains two utility programs (smartctl \ and smartd) to control and monitor storage systems using the Self-\ Monitoring, Analysis and Reporting Technology System (SMART) built \ into most modern ATA and SCSI hard disks. In many cases, these \ @@ -13,10 +13,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ - file://initd.smartd \ - file://smartmontools.default \ - file://smartd.service \ -" + file://initd.smartd \ + file://smartmontools.default \ + file://smartd.service \ + file://0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch \ + " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" diff --git a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb new file mode 100644 index 000000000..9f37c5fc2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.7.bb @@ -0,0 +1,25 @@ +# +# Copyright (C) 2014 Wind River Systems, Inc. +# Released under the BSD-3-Clause license (see COPYING.BSD-3 for the terms) +# +SUMMARY = "A compression/decompression library" +DESCRIPTION = "Snappy is a fast data compression and decompression library \ +It was designed to be very fast and stable, but not to achieve a high \ +compression ratio." + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" + +SRC_URI = "https://src.fedoraproject.org/repo/pkgs/snappy/snappy-1.1.7.tar.gz/sha512/32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf/snappy-1.1.7.tar.gz" + +SRC_URI[md5sum] = "ee9086291c9ae8deb4dac5e0b85bf54a" +SRC_URI[sha256sum] = "3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4" + +inherit cmake pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo," +TARGET_CFLAGS += "-fPIC" + +EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \ + ' diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 3c019eb7c..6ce3cab11 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" -SRCREV = "d1248b0f22ea8dc3b9d84a61bd35a83309bdb4b4" +SRCREV = "6003f9997587e6a563cebf1f246bcd0eb6deff3d" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-build-when-S-B.patch b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-build-when-S-B.patch new file mode 100644 index 000000000..51756b891 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-build-when-S-B.patch @@ -0,0 +1,28 @@ +From ad907b1aff217fe3b431ae052025ba8ba6cacc01 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Jun 2018 23:14:58 -0700 +Subject: [PATCH] Fix build when S != B + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 4392c06..2c5cae4 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -69,7 +69,7 @@ install: + $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL) -m 0755 tiptop $(DESTDIR)$(bindir) + $(INSTALL) -d $(DESTDIR)$(man1dir) +- $(INSTALL) -m 0644 tiptop.1 $(DESTDIR)$(man1dir) ++ $(INSTALL) -m 0644 $(srcdir)/tiptop.1 $(DESTDIR)$(man1dir) + ln $(DESTDIR)$(bindir)/tiptop $(DESTDIR)$(bindir)/ptiptop + ln $(DESTDIR)$(man1dir)/tiptop.1 $(DESTDIR)$(man1dir)/ptiptop.1 + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch new file mode 100644 index 000000000..ae676ae44 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch @@ -0,0 +1,28 @@ +From 848983a30dc99248ec45632bfc31718716a86e9d Mon Sep 17 00:00:00 2001 +From: Tomasz Buchert <tomasz@debian.org> +Date: Fri, 7 Jul 2017 21:15:58 +0200 +Subject: [PATCH] Fix parallel build problems (by Adrian Bunk) + +Taken from debian +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 32ab563..1993c9b 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -59,8 +59,9 @@ lex.yy.c: calc.lex + lex.yy.o: lex.yy.c + $(CC) $(CFLAGS) -I$(srcdir) -c lex.yy.c + ++y.tab.c: y.tab.h + +-y.tab.c y.tab.h: calc.y ++y.tab.h: calc.y + $(YACC) -d $(srcdir)/calc.y + + y.tab.o: y.tab.c diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch new file mode 100644 index 000000000..cecb70bc9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch @@ -0,0 +1,32 @@ +From 89dd9d8705408dccd5c5e47d22eba6fd6ec22b50 Mon Sep 17 00:00:00 2001 +From: Tomasz Buchert <tomasz@debian.org> +Date: Thu, 9 Jul 2015 16:07:23 +0200 +Subject: [PATCH] fix reproducibility of build process + +The upstream Makefile sets macros that depend on +a particular platform where the package is built. +We don't set them which fixes the problem. + +Taken from debian +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile.in | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 1993c9b..4392c06 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -48,9 +48,7 @@ Makefile: Makefile.in ../config.status + + + version.o: version.c +- $(CC) $(CFLAGS) -DCOMPILE_HOST="\""`hostname`"\"" \ +- -DCOMPILE_DATE="\"`date`\"" \ +- -c $(srcdir)/version.c ++ $(CC) $(CFLAGS) -c $(srcdir)/version.c + + + lex.yy.c: calc.lex diff --git a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb index 0a00a366e..cf67a08b3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb @@ -2,15 +2,20 @@ SUMMARY = "Hardware performance monitoring counters" HOMEPAGE = "http://tiptop.gforge.inria.fr/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "ncurses libxml2" +DEPENDS = "ncurses libxml2 bison-native flex-native" -SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz" +SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz \ + file://0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch \ + file://0002-fix-reproducibility-of-build-process.patch \ + file://0001-Fix-build-when-S-B.patch \ + " SRC_URI[md5sum] = "46ca0fdf0236f02dd2b96d347626d2a2" SRC_URI[sha256sum] = "51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182" -inherit autotools-brokensep +inherit autotools + EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" -COMPATIBLE_HOST = "(i.86|x86_64|arm|powerpc).*-linux" +COMPATIBLE_HOST = "(i.86|x86_64|arm|powerpc|aarch64).*-linux" do_configure_prepend () { # Two bugs in configure.ac when cross-compiling. diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch new file mode 100644 index 000000000..4b17087ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch @@ -0,0 +1,49 @@ +From d314f26e024aaf15bf4ab22ceb98501148d0eac8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 May 2018 19:53:33 -0700 +Subject: [PATCH] Replace strncpy with memcpy + +gcc8 detects that strncpy is overwiritng the null terminating character +the source strings are already initialized to 0 so memcpy would do the same +job + +Fixes +rn2903.c:153:5: error: 'strncpy' output may be truncated copying 16 bytes from a string of length 511 [-Werror=stringop-truncation] + strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ecezo/ecezo.c | 2 +- + src/rn2903/rn2903.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ecezo/ecezo.c b/src/ecezo/ecezo.c +index 6a195fc1..56c6dab3 100644 +--- a/src/ecezo/ecezo.c ++++ b/src/ecezo/ecezo.c +@@ -488,7 +488,7 @@ int ecezo_send_command(const ecezo_context dev, char *cmd, char *buffer, + // our write buffer + char writeBuffer[ECEZO_MAX_BUFFER_LEN]; + +- strncpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN); ++ memcpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN-1); + writeBuffer[ECEZO_MAX_BUFFER_LEN - 1] = 0; + + int writelen = strlen(writeBuffer); +diff --git a/src/rn2903/rn2903.c b/src/rn2903/rn2903.c +index f30a33ae..01a011da 100644 +--- a/src/rn2903/rn2903.c ++++ b/src/rn2903/rn2903.c +@@ -150,7 +150,7 @@ static rn2903_context _rn2903_postinit(rn2903_context dev, + rn2903_close(dev); + return NULL; + } +- strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); ++ memcpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); + + return dev; + } +-- +2.17.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch new file mode 100644 index 000000000..a0a47411d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch @@ -0,0 +1,33 @@ +From 48a580bd402cf6a3ee9e42013653219bfeb3caf6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 18:39:16 -0700 +Subject: [PATCH] include sys/types.h for uint definition + +uint is defined in sys/types.h, therefore this +header needs to be included, it gets exposed with +musl where this header is not getting included indirectly +as it is happening when building on glibc + +Fixes build errors on musl e.g. +upm/src/kx122/kx122.hpp:456:31: error: 'uint' has not been declared +| void setBufferThreshold(uint samples); +| ^~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/intel-iot-devkit/upm/pull/656] + src/kx122/kx122.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/kx122/kx122.h b/src/kx122/kx122.h +index 1622ed50..56e5215e 100644 +--- a/src/kx122/kx122.h ++++ b/src/kx122/kx122.h +@@ -31,6 +31,7 @@ extern "C"{ + #include <assert.h> + #include <unistd.h> + #include <math.h> ++#include <sys/types.h> + + #include <mraa/i2c.h> + #include <mraa/spi.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index d742a5e46..babe5f489 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "cc7fec9ae0228add9011bf1c2cd5e0ca2ba0d4f0" +SRCREV = "dc45cd78595c7c24c8a8574c63bb48b5bb99c5aa" PV = "1.6.0-git${SRCPV}" -SRC_URI = " \ - git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ -" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://0001-Replace-strncpy-with-memcpy.patch \ + file://0001-include-sys-types.h-for-uint-definition.patch \ + " S = "${WORKDIR}/git" @@ -21,7 +22,6 @@ COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" inherit distutils3-base cmake - # override this in local.conf to get needed bindings. # BINDINGS_pn-upm="python" # will result in only the python bindings being built/packaged. diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch b/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch deleted file mode 100644 index 03edb1390..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 18415c0b4c6e50ed9b99dfdae8d210590d0ab72e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 28 Apr 2017 04:50:30 -0400 -Subject: [PATCH] explicitly support python3 by pkg-config - -The PYTHON_CPPFLAGS and -lpython$(PYTHON_VERSION) is hardcoded, -use pkg-config to replace - -Upstream-Status: Inappropriate [wr-installer specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.am | 5 ++--- - configure.ac | 2 ++ - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4569bbf..7a8daf4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 - AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \ - $(libcryptsetup_CFLAGS) $(nss_CFLAGS) - LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' --PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) - - ## Targets - SUBDIRS = po -@@ -63,9 +62,9 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \ - $(LTLIBINTL) $(libcryptsetup_LIBS) $(nss_LIBS) - - python__volume_key_la_SOURCES = python/volume_key_wrap.c --python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -+python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(python3_CFLAGS) - python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) --python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \ -+python__volume_key_la_LIBADD = lib/libvolume_key.la $(python3_LIBS) \ - $(glib_LIBS) $(nss_LIBS) - - src_volume_key_SOURCES = src/volume_key.c -diff --git a/configure.ac b/configure.ac -index ff35dd0..0928a6c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,6 +27,8 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz no-define subdir-objects -Wall]) - AC_PROG_CC - AM_PROG_CC_C_O - LT_INIT([disable-static]) -+ -+PKG_CHECK_MODULES(python3, [python3]) - AM_PATH_PYTHON - - dnl Not gpg2, it cannot receive passphrases from gpgme --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.11.bb index febf3f256..c41b20c45 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.11.bb @@ -9,10 +9,9 @@ HOMEPAGE = "https://pagure.io/volume_key" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \ - file://0001-explicitly-support-python3-by-pkg-config.patch \ " -SRC_URI[md5sum] = "a2d14931177c660e1f3ebbcf5f47d8e2" -SRC_URI[sha256sum] = "450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6" +SRC_URI[md5sum] = "30df56c7743eb7c965293b3d61194232" +SRC_URI[sha256sum] = "e6b279c25ae477b555f938db2e41818f90c8cde942b0eec92f70b6c772095f6d" SRCNAME = "volume_key" S = "${WORKDIR}/${SRCNAME}-${PV}" @@ -25,6 +24,7 @@ DEPENDS += " \ cryptsetup \ nss \ gpgme \ + swig-native \ " RDEPENDS_python3-${PN} += "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb index 86e6d30e2..de7516457 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit pkgconfig -EXTRA_OEMAKE = "CC='${CC}' LD='${LD}'" +EXTRA_OEMAKE = "CC='${CC}' LD='${LD}' LIBRARY_PATH=${baselib}" do_install() { oe_runmake install PREFIX=${D}${exec_prefix} INSTALL=install |