diff --git a/meta-citadel/conf/layer.conf b/meta-citadel/conf/layer.conf index c85372d..d50e0e6 100644 --- a/meta-citadel/conf/layer.conf +++ b/meta-citadel/conf/layer.conf @@ -12,7 +12,7 @@ BBFILE_COLLECTIONS += "citadel" BBFILE_PATTERN_citadel = "^${LAYERDIR}/" BBFILE_PRIORITY_citadel = "5" -LAYERSERIES_COMPAT_citadel = "thud warrior zeus" +LAYERSERIES_COMPAT_citadel = "dunfell" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb index 79657b0..5c410b3 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb @@ -40,7 +40,6 @@ SRC_URI = "\ file://sudo-citadel \ file://citadel-ifconfig.sh \ file://00-storage-tmpfiles.conf \ - file://NetworkManager.conf \ file://share/dot.bashrc \ file://share/dot.profile \ file://share/dot.vimrc \ @@ -56,6 +55,7 @@ SRC_URI = "\ file://systemd/x11-session-switcher.service \ file://systemd/citadel-installer-backend.service \ file://systemd/installer-session-switcher.service \ + file://systemd/user/gnome-session@citadel-installer.target.d/session.conf \ file://skel/profile \ file://skel/bashrc \ file://skel/vimrc \ @@ -77,7 +77,7 @@ RDEPENDS_${PN} = "bash wireless-regdb-static" inherit allarch systemd useradd -SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path iptables.service sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service" +SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service" do_install() { install -m 0755 -d ${D}/storage @@ -88,7 +88,7 @@ do_install() { install -m 0755 -d ${D}${sysconfdir}/skel install -m 0755 -d ${D}${sysconfdir}/tmpfiles.d install -m 0755 -d ${D}${sysconfdir}/udev/rules.d - install -m 0755 -d ${D}${sysconfdir}/NetworkManager +# install -m 0755 -d ${D}${sysconfdir}/NetworkManager install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d install -m 0755 -d ${D}${sysconfdir}/modprobe.d install -m 0755 -d ${D}${sysconfdir}/sudoers.d @@ -107,17 +107,21 @@ do_install() { install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab install -m 0440 ${WORKDIR}/sudo-citadel ${D}${sysconfdir}/sudoers.d/citadel install -m 0644 ${WORKDIR}/00-storage-tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager + #install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager install -d ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/systemd/zram-swap.service ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/systemd/iptables.service ${D}${systemd_system_unitdir} +# install -m 644 ${WORKDIR}/systemd/iptables.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/sway-session-switcher.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/x11-session-switcher.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir} + install -d ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d + install -m 644 ${WORKDIR}/systemd/user/gnome-session@citadel-installer.target.d/session.conf ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d + install -m 644 ${WORKDIR}/systemd/watch-run-user.path ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/watch-run-user.service ${D}${systemd_system_unitdir} install -m 644 ${WORKDIR}/systemd/launch-default-realm.path ${D}${systemd_system_unitdir} diff --git a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override index e356a67..063303d 100644 --- a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override +++ b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override @@ -3,7 +3,7 @@ natural-scroll=true tap-to-click=true [org.gnome.desktop.background] -picture-uri='file:///usr/share/backgrounds/gnome/Icescape.jpg' +picture-uri='file:///usr/share/backgrounds/gnome/Icetwigs.jpg' [org.gnome.desktop.screensaver] picture-uri='file:////usr/share/gnome-control-center/pixmaps/noise-texture-light.png' diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf b/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf new file mode 100644 index 0000000..d5882fe --- /dev/null +++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf @@ -0,0 +1,4 @@ +[Unit] +Wants=org.gnome.SettingsDaemon.XSettings.target + +Requires=org.gnome.Shell.target diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb index 712d75d..ef2d89b 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb @@ -21,6 +21,7 @@ RDEPENDS_${PN} = "\ iso-codes \ libgudev \ networkmanager \ + iwd \ polkit \ network-manager-applet \ clutter-1.0 \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb index 50cc9ff..dd26633 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb @@ -17,7 +17,6 @@ RDEPENDS_${PN} = "\ mutter \ nautilus \ gjs \ - caribou \ gvfs \ gnome-keyring \ gnome-session \ diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend index 8e914b4..b718d74 100644 --- a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -1,7 +1,4 @@ # Append recipe from meta-openembedded/meta-networking -PACKAGECONFIG = "gnutls dhclient systemd wifi" -EXTRA_OECONF_remove = "--with-nmtui=yes" -EXTRA_OECONF += "--disable-ovs --with-nmtui=no" SRC_URI += "\ file://watch-resolvconf.path \ diff --git a/meta-citadel/recipes-core/systemd/systemd/50-udev-default.rules b/meta-citadel/recipes-core/systemd/systemd/50-udev-default.rules deleted file mode 100644 index cc439a8..0000000 --- a/meta-citadel/recipes-core/systemd/systemd/50-udev-default.rules +++ /dev/null @@ -1,91 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# run a command on remove events -ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}" -ACTION=="remove", GOTO="default_end" - -SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" - -# select "system RTC" or just use the first one -SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" -SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100" - -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" -ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" - -ACTION!="add", GOTO="default_end" - -SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" -SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666" -SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" -SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" -SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" -SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" -SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" -KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" - -SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - -SUBSYSTEM=="input", GROUP="input" -SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0664" - -SUBSYSTEM=="video4linux", GROUP="video" -SUBSYSTEM=="graphics", GROUP="video" -SUBSYSTEM=="drm", KERNEL!="renderD*", GROUP="video" -SUBSYSTEM=="dvb", GROUP="video" -SUBSYSTEM=="media", GROUP="video" -SUBSYSTEM=="cec", GROUP="video" - -SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="video", MODE="0666" -SUBSYSTEM=="kfd", GROUP="video", MODE="0666" - -# When using static_node= with non-default permissions, also update -# tmpfiles.d/static-nodes-permissions.conf.in to keep permissions synchronized. - -SUBSYSTEM=="sound", GROUP="audio", \ - OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" - -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664" - -SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video" -SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video" -SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video" -SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video" - -KERNEL=="parport[0-9]*", GROUP="lp" -SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp" -SUBSYSTEM=="ppdev", GROUP="lp" -KERNEL=="lp[0-9]*", GROUP="lp" -KERNEL=="irlpt[0-9]*", GROUP="lp" -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" - -SUBSYSTEM=="block", GROUP="disk" -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom" -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" -KERNEL=="sch[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd", GROUP="cdrom" - -SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" -KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" -KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" -KERNEL=="btrfs-control", GROUP="disk" -KERNEL=="rawctl", GROUP="disk" -SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk" -SUBSYSTEM=="aoe", GROUP="disk", MODE="0220" -SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" - -KERNEL=="rfkill", MODE="0664" -KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" - -KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" - -# The static_node is required on s390x and ppc (they are using MODULE_ALIAS) -KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm" - -KERNEL=="udmabuf", GROUP="kvm" - -SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm" - -LABEL="default_end" diff --git a/meta-citadel/recipes-core/systemd/systemd_%.bbappend b/meta-citadel/recipes-core/systemd/systemd_%.bbappend index 42408f9..35c3204 100644 --- a/meta-citadel/recipes-core/systemd/systemd_%.bbappend +++ b/meta-citadel/recipes-core/systemd/systemd_%.bbappend @@ -12,15 +12,7 @@ PACKAGECONFIG = "\ nss polkit randomseed seccomp timedated utmp timesyncd kmod sysusers gshadow \ " -SRC_URI += "\ - file://50-udev-default.rules \ - " - - do_install_append() { rm -f ${D}${sysconfdir}/tmpfiles.d/00-create-volatile.conf ln -s rescue.target ${D}${systemd_unitdir}/system/kbrequest.target - rm -f ${D}${libdir}/udev/rules.d/50-udev-default.rules - install -d ${D}{$libdir}/udev/rules.d - install -m 644 ${WORKDIR}/50-udev-default.rules ${D}{$libdir}/udev/rules.d/ } diff --git a/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_38.bb b/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb similarity index 88% rename from meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_38.bb rename to meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb index d6c4381..edc9ae4 100644 --- a/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_38.bb +++ b/meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb @@ -2,7 +2,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" SRC_URI = "git://github.com/home-sweet-gnome/dash-to-panel.git;protocol=https" -SRCREV = "a1bf1c0c61bb18b76e994c8c64b1877536ccc877" +SRCREV = "48a69e529614d1da456802b818e7d7f0d4d1d642" S = "${WORKDIR}/git" diff --git a/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.patch b/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.patch deleted file mode 100644 index 8714c85..0000000 --- a/meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.patch +++ /dev/null @@ -1,323 +0,0 @@ -From e0460ca5f7d65d17729e9eedffe3f0506e6ba3a3 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Fri, 5 Apr 2019 07:36:45 -0400 -Subject: [PATCH] Make GOA, CUPS, and User Accounts optional - ---- - meson.build | 13 +++++++++++++ - meson_options.txt | 7 ++++++- - panels/background/bg-pictures-source.c | 20 ++++++++++++++++++++ - panels/background/meson.build | 15 +++++++++++---- - panels/meson.build | 15 ++++++++++++--- - shell/cc-panel-loader.c | 6 ++++++ - tests/meson.build | 2 +- - 7 files changed, 69 insertions(+), 9 deletions(-) - -diff --git a/meson.build b/meson.build -index e89ea52..d7926c9 100644 ---- a/meson.build -+++ b/meson.build -@@ -112,6 +112,13 @@ if not libhandy_dep.found() - libhandy_dep = libhandy.get_variable('libhandy_dep') - endif - -+enable_goa = get_option('online_accounts') -+enable_cups = get_option('cups') -+enable_user_accounts = get_option('user_accounts') -+config_h.set('WITH_GOA', enable_goa, description: 'Define to enable support for Gnome Online Accounts') -+config_h.set('WITH_CUPS', enable_goa, description: 'Define to enable support for CUPS') -+config_h.set('WITH_USER_ACCOUNTS', enable_user_accounts, description: 'Define to enable user accounts panel') -+ - goa_req_version = '>= 3.25.3' - pulse_req_version = '>= 2.0' - -@@ -122,7 +129,9 @@ gio_dep = dependency('gio-2.0') - glib_dep = dependency('glib-2.0', version: '>= 2.53.0') - gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') - gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90') -+if enable_goa - goa_dep = dependency('goa-1.0', version: goa_req_version) -+endif - gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') - libxml_dep = dependency('libxml-2.0') - polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103') -@@ -144,6 +153,8 @@ common_deps = [ - dependency('gtk+-3.0', version: '>= 3.22.20') - ] - -+if enable_cups -+ - # Check for CUPS 1.4 or newer - cups_dep = dependency('cups', version : '>= 1.4', required: false) - assert(cups_dep.found(), 'CUPS 1.4 or newer not found') -@@ -164,6 +175,8 @@ foreach header: check_headers - assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1]) - endforeach - -+endif -+ - # Optional dependency for the user accounts panel - enable_cheese = get_option('cheese') - if enable_cheese -diff --git a/meson_options.txt b/meson_options.txt -index a347168..e0c3b23 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,4 +3,9 @@ option('documentation', type: 'boolean', value: false, description: 'build docum - option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') - option('ibus', type: 'boolean', value: true, description: 'build with IBus support') - option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') --option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') -\ No newline at end of file -+option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') -+ -+option('staging_dir', type: 'string', description: 'set staging directory for cross-compile') -+option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts') -+option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') -+option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel') -diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c -index 714c7f7..59723e1 100644 ---- a/panels/background/bg-pictures-source.c -+++ b/panels/background/bg-pictures-source.c -@@ -23,13 +23,17 @@ - - #include "bg-pictures-source.h" - -+#ifdef WITH_GOA - #include "cc-background-grilo-miner.h" -+#endif - #include "cc-background-item.h" - - #include - #include - #include -+#ifdef WITH_GOA - #include -+#endif - #include - #include - -@@ -43,7 +47,9 @@ struct _BgPicturesSource - - GCancellable *cancellable; - -+#ifdef WITH_GOA - CcBackgroundGriloMiner *grl_miner; -+#endif - - GnomeDesktopThumbnailFactory *thumb_factory; - -@@ -85,7 +91,9 @@ bg_pictures_source_dispose (GObject *object) - g_clear_object (&source->cancellable); - } - -+#ifdef WITH_GOA - g_clear_object (&source->grl_miner); -+#endif - g_clear_object (&source->thumb_factory); - - G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); -@@ -461,7 +469,9 @@ add_single_file (BgPicturesSource *bg_source, - const gchar *pictures_path; - g_autoptr(GFile) pictures_dir = NULL; - g_autoptr(GFile) cache_dir = NULL; -+#ifdef WITH_GOA - GrlMedia *media; -+#endif - - /* find png and jpeg files */ - if (!content_type) -@@ -520,13 +530,16 @@ add_single_file (BgPicturesSource *bg_source, - - read_file: - -+#ifdef WITH_GOA - media = g_object_get_data (G_OBJECT (file), "grl-media"); - if (media == NULL) - { -+#endif - g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); - g_file_read_async (file, G_PRIORITY_DEFAULT, - bg_source->cancellable, - picture_opened_for_read, bg_source); -+#ifdef WITH_GOA - } - else - { -@@ -564,6 +577,7 @@ add_single_file (BgPicturesSource *bg_source, - picture_copied_for_read, - bg_source); - } -+#endif - - retval = TRUE; - -@@ -594,6 +608,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, - return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); - } - -+#ifdef WITH_GOA - static gboolean - add_single_file_from_media (BgPicturesSource *bg_source, - GFile *file, -@@ -618,6 +633,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, - - return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); - } -+#endif - - gboolean - bg_pictures_source_add (BgPicturesSource *bg_source, -@@ -934,6 +950,7 @@ monitor_path (BgPicturesSource *self, - return monitor; - } - -+#ifdef WITH_GOA - static void - media_found_cb (BgPicturesSource *self, GrlMedia *media) - { -@@ -945,6 +962,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) - g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); - add_single_file_from_media (self, file, media); - } -+#endif - - static void - bg_pictures_source_init (BgPicturesSource *self) -@@ -968,9 +986,11 @@ bg_pictures_source_init (BgPicturesSource *self) - cache_path = bg_pictures_source_get_cache_path (); - self->cache_dir_monitor = monitor_path (self, cache_path); - -+#ifdef WITH_GOA - self->grl_miner = cc_background_grilo_miner_new (); - g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); - cc_background_grilo_miner_start (self->grl_miner); -+#endif - - self->thumb_factory = - gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); -diff --git a/panels/background/meson.build b/panels/background/meson.build -index bb34b69..0db3dae 100644 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -34,9 +34,11 @@ install_data( - - common_sources = [] - -+staging = get_option('staging_dir') -+ - enums = 'gdesktop-enums-types' - enums_header = files( -- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', -+ staging + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', - 'cc-background-item.h' - ) - -@@ -75,20 +77,25 @@ sources = common_sources + files( - 'bg-source.c', - 'bg-wallpapers-source.c', - 'cc-background-chooser-dialog.c', -- 'cc-background-grilo-miner.c', - 'cc-background-item.c', - 'cc-background-xml.c' - ) - -+if enable_goa -+sources += files('cc-background-grilo-miner.c') -+endif -+ - deps = common_deps + [ - gdk_pixbuf_dep, - gnome_desktop_dep, -- goa_dep, - libxml_dep, - dependency('cairo-gobject'), -- dependency('grilo-0.3', version: '>= 0.3.0') - ] - -+if enable_goa -+deps += [ goa_dep, dependency('grilo-0.3', version: '>= 0.3.0') ] -+endif -+ - cflags += [ - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir), - '-DDATADIR="@0@"'.format(control_center_datadir), -diff --git a/panels/meson.build b/panels/meson.build -index 95a44bb..0f927bd 100644 ---- a/panels/meson.build -+++ b/panels/meson.build -@@ -10,16 +10,13 @@ panels = [ - 'keyboard', - 'mouse', - 'notifications', -- 'online-accounts', - 'power', -- 'printers', - 'privacy', - 'region', - 'search', - 'sharing', - 'sound', - 'universal-access', -- 'user-accounts' - ] - - if host_is_linux -@@ -34,6 +31,18 @@ if host_is_linux_not_s390 - ] - endif - -+if enable_goa -+ panels += ['online-accounts'] -+endif -+ -+if enable_cups -+ panels += ['printers'] -+endif -+ -+if enable_user_accounts -+ panels += ['user-accounts'] -+endif -+ - panels_list = [] - panels_libs = [] - foreach cappletname: panels -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 5eeb44e..93d18f0 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -102,9 +102,13 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL), -+#ifdef WITH_GOA - PANEL_TYPE("online-accounts", cc_goa_panel_get_type, NULL), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type, NULL), -+#ifdef WITH_CUPS - PANEL_TYPE("printers", cc_printers_panel_get_type, NULL), -+#endif - PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL), - PANEL_TYPE("region", cc_region_panel_get_type, NULL), - PANEL_TYPE("search", cc_search_panel_get_type, NULL), -@@ -114,7 +118,9 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL), - #endif - PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL), -+#ifdef WITH_USER_ACCOUNTS - PANEL_TYPE("user-accounts", cc_user_panel_get_type, NULL), -+#endif - #ifdef BUILD_WACOM - PANEL_TYPE("wacom", cc_wacom_panel_get_type, cc_wacom_panel_static_init_func), - #endif -diff --git a/tests/meson.build b/tests/meson.build -index 4594327..cd52250 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -6,5 +6,5 @@ endif - - subdir('interactive-panels') - --subdir('printers') -+#subdir('printers') - subdir('info') diff --git a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb index a75e6d8..f22deaf 100644 --- a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb +++ b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb @@ -15,7 +15,8 @@ PACKAGE_INSTALL = "\ busybox \ kbd \ keymaps \ - systemd-initrd \ + systemd \ + systemd-initramfs \ linux-firmware-i915 \ kernel-module-arc4 \ kernel-module-ansi-cprng \ @@ -119,12 +120,115 @@ require ${THISDIR}/../../recipes-citadel/images/citadel-image.inc IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -ROOTFS_POSTPROCESS_COMMAND += "remove_blk_availability; append_initrd_release; " +ROOTFS_POSTPROCESS_COMMAND += "remove_systemd_units; append_initrd_release; " -remove_blk_availability() { - rm ${IMAGE_ROOTFS}${systemd_system_unitdir}/blk-availability.service +SYSTEMD_UNITS = "\ + basic.target \ + citadel-install-rootfs-mount.service \ + citadel-lvm-activate.service \ + citadel-rootfs-mount.path \ + citadel-rootfs-mount.service \ + citadel-rootfs-setup.service \ + cryptsetup-pre.target \ + cryptsetup.target \ + debug-shell.service \ + default.target \ + emergency.service \ + emergency.target \ + initrd-cleanup.service \ + initrd-fs.target \ + initrd-parse-etc.service \ + initrd-root-fs.target \ + initrd-switch-root.target \ + initrd-switch-root.service \ + initrd-udevadm-cleanup-db.service \ + initrd.target \ + kmod-static-nodes.service \ + local-fs-pre.target \ + local-fs.target \ + paths.target \ + plymouth-halt.service \ + plymouth-kexec.service \ + plymouth-poweroff.service \ + plymouth-quit-wait.service \ + plymouth-quit.service \ + plymouth-read-write.service \ + plymouth-reboot.service \ + plymouth-start.service \ + plymouth-switch-root.service \ + poweroff.target \ + reboot.target \ + rescue.service \ + rescue.target \ + serial-getty@.service \ + shutdown.target \ + sigpwr.target \ + slices.target \ + sockets.target \ + swap.target \ + sysinit.target \ + systemd-ask-password-console.path \ + systemd-ask-password-console.service \ + systemd-ask-password-plymouth.path \ + systemd-ask-password-plymouth.service \ + systemd-fsck-root.service \ + systemd-fsck@.service \ + systemd-journald-audit.socket \ + systemd-journald.service \ + systemd-journald.socket \ + systemd-modules-load.service \ + systemd-sysctl.service \ + systemd-udev-settle.service \ + systemd-udev-trigger.service \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + systemd-udevd.service \ + timers.target \ + umount.target \ +" + + +remove_systemd_wants() { + for path in ${IMAGE_ROOTFS}${systemd_system_unitdir}/*; do + if [ -d ${path} ]; then + [ -h ${path}/${1} ] && rm -v ${path}/${1} + fi + done + + local wants_dir=${IMAGE_ROOTFS}${systemd_system_unitdir}/${1}.wants + [ -d ${wants_dir} ] && rm -rv ${wants_dir} + return 0 } +remove_one_systemd_unit() { + local unit_path=${IMAGE_ROOTFS}${systemd_system_unitdir}/${1} + + remove_systemd_wants ${1} + + if [ -e ${unit_path} ]; then + rm ${unit_path} + else + echo "Cannot remove systemd unit ${1} from initramfs image because it does not exist" + fi +} + +match_unit() { + for unit in ${SYSTEMD_UNITS}; do + [ ${unit} = ${1} ] && return 0 + done + return 1 +} + +remove_systemd_units() { + for path in ${IMAGE_ROOTFS}${systemd_system_unitdir}/*; do + if [ ! -d ${path} ]; then + local unit_name=$(basename ${path}) + match_unit ${unit_name} || remove_one_systemd_unit ${unit_name} + fi + done +} + + generate_kernel_id() { sha256sum ${DEPLOY_DIR_IMAGE}/bzImage-intel-corei7-64.bin | cut -d' ' -f1 } diff --git a/meta-citadel/recipes-initrd/systemd-initrd/systemd-initrd_243.2.bb b/meta-citadel/recipes-initrd/systemd-initrd/systemd-initrd_243.2.bb deleted file mode 100644 index cf49e4a..0000000 --- a/meta-citadel/recipes-initrd/systemd-initrd/systemd-initrd_243.2.bb +++ /dev/null @@ -1,141 +0,0 @@ - - -FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-core/systemd/systemd:" -require ${COREBASE}/meta/recipes-core/systemd/systemd_${PV}.bb - -PROVIDES_remove = "udev" -RDEPENDS_${PN}_remove = "dbus" - -PACKAGECONFIG = "acl cryptsetup usrmerge kmod" - -do_install() { - meson_do_install - - install -d ${D}/sysroot - [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init - - chown root:systemd-journal ${D}/${localstatedir}/log/journal -} - -ALTERNATIVE_${PN}_remove = "resolv-conf" - -sockets_wants = "${systemd_system_unitdir}/sockets.target.wants" -sysinit_wants = "${systemd_system_unitdir}/sysinit.target.wants" -SYSTEMD_WANTS = "\ - ${sockets_wants}/systemd-journald-audit.socket \ - ${sockets_wants}/systemd-journald.socket \ - ${sockets_wants}/systemd-journald-udevd-control.socket \ - ${sockets_wants}/systemd-journald-udevd-kernel.socket \ - \ - ${sysinit_wants}/kmod-static-nodes.service \ - ${sysinit_wants}/systemd-ask-password-console.path \ - ${sysinit_wants}/systemd-journald.service \ - ${sysinit_wants}/systemd-modules-load.service \ - ${sysinit_wants}/systemd-sysctl.service \ - ${sysinit_wants}/systemd-udev-trigger.service \ - ${sysinit_wants}/systemd-udevd.service \ -" -SYSTEMD_TARGETS = "\ - ${systemd_system_unitdir}/sysinit.target \ - ${systemd_system_unitdir}/basic.target \ - ${systemd_system_unitdir}/cryptsetup-pre.target \ - ${systemd_system_unitdir}/cryptsetup.target \ - ${systemd_system_unitdir}/sockets.target \ - ${systemd_system_unitdir}/paths.target \ - ${systemd_system_unitdir}/slices.target \ - ${systemd_system_unitdir}/halt.target \ - ${systemd_system_unitdir}/poweroff.target \ - ${systemd_system_unitdir}/reboot.target \ - ${systemd_system_unitdir}/rescue.target \ - ${systemd_system_unitdir}/shutdown.target \ - ${systemd_system_unitdir}/final.target \ - ${systemd_system_unitdir}/sigpwr.target \ - ${systemd_system_unitdir}/sockets.target \ - ${systemd_system_unitdir}/swap.target \ - ${systemd_system_unitdir}/timers.target \ - ${systemd_system_unitdir}/paths.target \ - ${systemd_system_unitdir}/umount.target \ - ${systemd_system_unitdir}/local-fs.target \ - ${systemd_system_unitdir}/local-fs-pre.target \ -" - -generators = "${systemd_unitdir}/system-generators" -SYSTEMD_GENERATORS = "\ - ${generators}/systemd-debug-generator \ - ${generators}/systemd-cryptsetup-generator \ - ${generators}/systemd-fstab-generator \ -" - -SYSTEMD_BINARIES = "\ - ${bindir}/journalctl \ - ${bindir}/systemctl \ - ${bindir}/systemd-ask-password \ - ${bindir}/systemd-run \ - ${bindir}/systemd-escape \ - ${bindir}/systemd-cgls \ - ${bindir}/systemd-tmpfiles \ - ${bindir}/systemd-tty-ask-password-agent \ -" - -SYSTEMD_UNITS = "\ - ${systemd_system_unitdir}/emergency.target \ - ${systemd_system_unitdir}/emergency.service \ - ${systemd_system_unitdir}/rescue.target \ - ${systemd_system_unitdir}/rescue.service \ - ${systemd_system_unitdir}/debug-shell.service \ - \ - ${systemd_system_unitdir}/initrd.target \ - ${systemd_system_unitdir}/initrd-fs.target \ - ${systemd_system_unitdir}/initrd-root-device.target \ - ${systemd_system_unitdir}/initrd-root-fs.target \ - ${systemd_system_unitdir}/initrd-switch-root.target \ - ${systemd_system_unitdir}/initrd-switch-root.service \ - ${systemd_system_unitdir}/initrd-cleanup.service \ - ${systemd_system_unitdir}/initrd-udevadm-cleanup-db.service \ - ${systemd_system_unitdir}/initrd-parse-etc.service \ - ${systemd_system_unitdir}/kmod-static-nodes.service \ - ${systemd_system_unitdir}/systemd-ask-password-console.path \ - ${systemd_system_unitdir}/systemd-ask-password-console.service \ - ${systemd_system_unitdir}/systemd-journald.service \ - ${systemd_system_unitdir}/systemd-ask-password-plymouth.path \ - ${systemd_system_unitdir}/systemd-ask-password-plymouth.service \ - ${systemd_system_unitdir}/systemd-fsck@.service \ - ${systemd_system_unitdir}/systemd-fsck-root.service \ - ${systemd_system_unitdir}/systemd-journald.socket \ - ${systemd_system_unitdir}/systemd-journald-audit.socket \ - ${systemd_system_unitdir}/systemd-udevd-control.socket \ - ${systemd_system_unitdir}/systemd-udevd-kernel.socket \ - ${systemd_system_unitdir}/systemd-modules-load.service \ - ${systemd_system_unitdir}/systemd-sysctl.service \ - ${systemd_system_unitdir}/systemd-udevd.service \ - ${systemd_system_unitdir}/systemd-udev-trigger.service \ - ${systemd_system_unitdir}/systemd-udev-settle.service \ - ${systemd_system_unitdir}/systemd-volatile-root \ -" - -FILES_${PN} = "\ - /init /sysroot \ - ${libdir}/lib* \ - ${libdir}/sysctl.d/50-default.conf \ - ${libdir}/tmpfiles.d/systemd.conf \ - ${systemd_unitdir}/libsystemd* \ - ${systemd_unitdir}/systemd* \ - ${base_sbindir} \ - ${SYSTEMD_WANTS} \ - ${SYSTEMD_TARGETS} \ - ${SYSTEMD_UNITS} \ - ${SYSTEMD_GENERATORS} \ - ${SYSTEMD_BINARIES} \ -" -python populate_packages_prepend() { - # hack to sabotage do_split_packages - d.setVar("rootlibdir", "/nowhere") -} - -PRIVATE_LIBS = "libsystemd-shared-${PV}.so libsystemd.so.0 libudev.so.1" - -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-unused" -RDEPENDS_${PN}-unused += "bash ${PN}" -FILES_${PN}-unused = "/" - - diff --git a/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb b/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb index 0fbccce..170332f 100644 --- a/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb +++ b/meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb @@ -4,11 +4,10 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" -SRC_URI = "https://github.com/tiwe-de/libpam-pwdfile/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "1546a57bfe50800175f7cbc88ade4a15" -SRC_URI[sha256sum] = "5b8db1397cff9cadfd1bb96f53c134b787ab0e6a0fbedb71040541d340313ba2" +SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https" +SRCREV = "8f0e412b48178c00abd023917dd2c9050ee89c18" -S = "${WORKDIR}/libpam-pwdfile-${PV}" +S = "${WORKDIR}/git" DEPENDS = "libpam libxcrypt" inherit lib_package pkgconfig diff --git a/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.4.2.bb b/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb similarity index 58% rename from meta-citadel/recipes-support/mkpasswd/mkpasswd_5.4.2.bb rename to meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb index 93e060a..42f7631 100644 --- a/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.4.2.bb +++ b/meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb @@ -1,10 +1,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://github.com/rfc1036/whois/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "e7fce43576e9a3a3f20bef04d7941a8a" -SRC_URI[sha256sum] = "d928b981dc949a2ea1d0512d20da74707953369f889a88d8f84f1a4b05b822d2" -S = "${WORKDIR}/whois-${PV}" +SRC_URI = "git://github.com/rfc1036/whois.git;protocol=https" +SRCREV = "7f9fdae2a99c9a56959b37049488f94e8bdfa7c2" + +S = "${WORKDIR}/git" DEPENDS = "libxcrypt libidn2" RDEPENDS_${PN} = "libxcrypt libidn2" diff --git a/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch new file mode 100644 index 0000000..d2b9bf6 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -0,0 +1,35 @@ +From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 18 Sep 2017 17:22:43 -0700 +Subject: [PATCH] md: Fix build with musl + +The MIPS specific header is not provided by musl +linux kernel headers provide which has same definitions + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + pr/include/md/_linux.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -499,7 +499,7 @@ + #elif defined(__mips__) + + /* For _ABI64 */ +-#include ++#include + + #ifdef __MIPSEB__ + #define IS_BIG_ENDIAN 1 +@@ -511,7 +511,7 @@ + #error "Unknown MIPS endianness." + #endif + +-#if _MIPS_SIM == _ABI64 ++#if _MIPS_SIM == _MIPS_SIM_ABI64 + + #define IS_64 + diff --git a/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch new file mode 100644 index 0000000..3a04d42 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -0,0 +1,102 @@ +From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Sat, 30 Jan 2016 07:18:02 +0100 +Subject: [PATCH] Add nios2 support + +Add support for the nios2 CPU. + +Signed-off-by: Marek Vasut +Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] +--- + nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ + nspr/pr/include/md/_linux.h | 14 ++++++++++++++ + 2 files changed, 59 insertions(+) + +Index: nspr/pr/include/md/_linux.cfg +=================================================================== +--- nspr.orig/pr/include/md/_linux.cfg ++++ nspr/pr/include/md/_linux.cfg +@@ -975,6 +975,51 @@ + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__nios2__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #elif defined(__or1k__) + + #undef IS_LITTLE_ENDIAN +Index: nspr/pr/include/md/_linux.h +=================================================================== +--- nspr.orig/pr/include/md/_linux.h ++++ nspr/pr/include/md/_linux.h +@@ -55,6 +55,8 @@ + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" ++#elif defined(__nios2__) ++#define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" + #elif defined(__riscv) && (__riscv_xlen == 32) +@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn + #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet + #endif + ++#if defined(__nios2__) ++#if defined(__GNUC__) ++/* Use GCC built-in functions */ ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) ++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) ++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) ++#endif ++#endif ++ + #if defined(__or1k__) + #if defined(__GNUC__) + /* Use GCC built-in functions */ diff --git a/meta-citadel/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-citadel/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch new file mode 100644 index 0000000..90fe45f --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch @@ -0,0 +1,103 @@ +From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 16 Nov 2018 13:52:49 +0800 +Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME + +Remove _BUILD_STRING and _BUILD_TIME to avoid +adding timestamp to _pl_bld.h which can result +in adding timestamp in library file such as +libnspr4.so. + $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so + [snip] + 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 + [snip] + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + lib/ds/Makefile.in | 8 +------- + lib/libc/src/Makefile.in | 8 +------- + lib/prstreams/Makefile.in | 8 +------- + pr/src/Makefile.in | 8 +------- + 4 files changed, 4 insertions(+), 28 deletions(-) + +diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in +index e737791..b578476 100644 +--- a/lib/ds/Makefile.in ++++ b/lib/ds/Makefile.in +@@ -114,13 +114,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in +index e8a6d9f..978ed28 100644 +--- a/lib/libc/src/Makefile.in ++++ b/lib/libc/src/Makefile.in +@@ -116,13 +116,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in +index aeb2944..f318097 100644 +--- a/lib/prstreams/Makefile.in ++++ b/lib/prstreams/Makefile.in +@@ -116,13 +116,7 @@ endif + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in +index 19c5a69..b4ac31c 100644 +--- a/pr/src/Makefile.in ++++ b/pr/src/Makefile.in +@@ -326,13 +326,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) +-- +2.7.4 + diff --git a/meta-citadel/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-citadel/recipes-support/nspr/nspr/fix-build-on-x86_64.patch new file mode 100644 index 0000000..f12acc8 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -0,0 +1,52 @@ +Fix build failure on x86_64 + +When the target_cpu is x86_64, we should assume that the pkg uses 64bit, +only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a +opposite logic before. + +Signed-off-by: Robert Yang + +Upstream-Status: Pending +--- + configure.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve + PR_MD_ASFILES=os_Linux_ia64.s + ;; + x86_64) +- if test -n "$USE_64"; then +- PR_MD_ASFILES=os_Linux_x86_64.s +- elif test -n "$USE_X32"; then ++ if test -n "$USE_X32"; then ++ AC_DEFINE(i386) + PR_MD_ASFILES=os_Linux_x86_64.s + CC="$CC -mx32" + CXX="$CXX -mx32" + else +- AC_DEFINE(i386) +- PR_MD_ASFILES=os_Linux_x86.s +- CC="$CC -m32" +- CXX="$CXX -m32" ++ PR_MD_ASFILES=os_Linux_x86_64.s + fi + ;; + ppc|powerpc) + PR_MD_ASFILES=os_Linux_ppc.s + ;; + powerpc64) +- if test -n "$USE_64"; then ++ if test -n "$USE_N32"; then ++ PR_MD_ASFILES=os_Linux_ppc.s ++ else + CC="$CC -m64" + CXX="$CXX -m64" +- else +- PR_MD_ASFILES=os_Linux_ppc.s + fi + ;; + esac diff --git a/meta-citadel/recipes-support/nspr/nspr/nspr.pc.in b/meta-citadel/recipes-support/nspr/nspr/nspr.pc.in new file mode 100644 index 0000000..1f15d19 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/nspr.pc.in @@ -0,0 +1,11 @@ +os_libs=-lpthread -ldl +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSPR +Description: The Netscape Portable Runtime +Version: NSPRVERSION +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl +Cflags: -I${includedir}/nspr diff --git a/meta-citadel/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-citadel/recipes-support/nspr/nspr/remove-rpath-from-tests.patch new file mode 100644 index 0000000..7ba59ed --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -0,0 +1,26 @@ +Author: Andrei Gherzan +Date: Thu Feb 9 00:03:38 2012 +0200 + +Avoid QA warnings by removing hardcoded rpath from binaries. + +[...] +WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib +in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait +[...] + +Signed-off-by: Andrei Gherzan +Upstream-Status: Pending + +Index: nspr/pr/tests/Makefile.in +=================================================================== +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS + + ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) +- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) ++ LDOPTS += -Xlinker + ifeq ($(USE_PTHREADS),1) + EXTRA_LIBS = -lpthread + endif diff --git a/meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch new file mode 100644 index 0000000..bde715c --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch @@ -0,0 +1,19 @@ +the $srcdir is not defined at the time of gnu-configurize. + +Upstream-Status: Inappropriate [OE-Core specific] + +Signed-off-by: Saul Wold + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -8,7 +8,7 @@ AC_PREREQ(2.61) + AC_INIT + AC_CONFIG_SRCDIR([pr/include/nspr.h]) + +-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) ++AC_CONFIG_AUX_DIR(build/autoconf) + AC_CANONICAL_TARGET + + dnl ======================================================== diff --git a/meta-citadel/recipes-support/nspr/nspr_4.26.bb b/meta-citadel/recipes-support/nspr/nspr_4.26.bb new file mode 100644 index 0000000..a15afd6 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr_4.26.bb @@ -0,0 +1,197 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://remove-srcdir-from-configure-in.patch \ + file://0002-Add-nios2-support.patch \ + file://0001-md-Fix-build-with-musl.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://nspr.pc.in \ +" + +CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" + +UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" +UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" + +SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68" +SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d" + +CVE_PRODUCT = "netscape_portable_runtime" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS_${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = " \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + +do_compile_prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export +} + +do_compile_append() { + oe_runmake -C pr/tests +} + +do_install_append() { + install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + sed -i \ + -e 's:NSPRVERSION:${PV}:g' \ + -e 's:OEPREFIX:${prefix}:g' \ + -e 's:OELIBDIR:${libdir}:g' \ + -e 's:OEINCDIR:${includedir}:g' \ + -e 's:OEEXECPREFIX:${exec_prefix}:g' \ + ${D}${libdir}/pkgconfig/nspr.pc + + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES_${PN} = "${libdir}/lib*.so" +FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch new file mode 100644 index 0000000..bfc375e --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -0,0 +1,47 @@ +From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 18 Dec 2019 12:29:50 +0100 +Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto + +Not all current hardware supports it, particularly anything +prior to armv8 does not. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin + +--- + nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/gcm.c | 2 ++ + 2 files changed, 6 insertions(+) + +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -126,6 +126,8 @@ else + endif + endif + ifdef NS_USE_GCC ++ifdef NSS_USE_ARM_HW_CRYPTO ++ DEFINES += -DNSS_USE_ARM_HW_CRYPTO + ifeq ($(CPU_ARCH),aarch64) + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c +@@ -150,6 +152,7 @@ endif + endif + endif + endif ++endif + + ifeq ($(OS_TARGET),OSF1) + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +--- a/nss/lib/freebl/gcm.c ++++ b/nss/lib/freebl/gcm.c +@@ -21,7 +21,9 @@ + /* old gcc doesn't support some poly64x2_t intrinsic */ + #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ + (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) ++# ifdef NSS_USE_ARM_HW_CRYPTO + #define USE_ARM_GCM ++# endif + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ + !defined(NSS_DISABLE_ARM32_NEON) + /* We don't test on big endian platform, so disable this on big endian. */ diff --git a/meta-citadel/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-citadel/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch new file mode 100644 index 0000000..3d90e2d --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -0,0 +1,46 @@ +From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 22 Feb 2017 11:36:11 +0200 +Subject: [PATCH] nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Hongxu Jia +Signed-off-by: Alexander Kanavin + +--- + nss/coreconf/arch.mk | 2 +- + nss/lib/freebl/Makefile | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 790372d..2563134 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 52d827c..f99f769 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif diff --git a/meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch b/meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch new file mode 100644 index 0000000..432312d --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch @@ -0,0 +1,46 @@ +From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 26 Aug 2020 17:30:40 -0700 +Subject: [PATCH] pkix: Do not use NULL where 0 is needed + +Clang finds this error + +pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] + logger->logComponent = (PKIX_ERRORCLASS)NULL; + ^~~~~~~~~~~~~~~~~~~~~ +pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] + logger->logComponent = (PKIX_ERRORCLASS)NULL; + ^~~~~~~~~~~~~~~~~~~~~ +2 errors generated. + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378] +Signed-off-by: Khem Raj +--- + nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c +index a916e6e..10f537a 100644 +--- a/nss/lib/libpkix/pkix/util/pkix_logger.c ++++ b/nss/lib/libpkix/pkix/util/pkix_logger.c +@@ -313,7 +313,7 @@ pkix_Logger_Destroy( + + logger->callback = NULL; + PKIX_DECREF(logger->context); +- logger->logComponent = (PKIX_ERRORCLASS)NULL; ++ logger->logComponent = (PKIX_ERRORCLASS)0; + + cleanup: + +@@ -614,7 +614,7 @@ PKIX_Logger_Create( + + logger->callback = callback; + logger->maxLevel = 0; +- logger->logComponent = (PKIX_ERRORCLASS)NULL; ++ logger->logComponent = (PKIX_ERRORCLASS)0; + + PKIX_INCREF(loggerContext); + logger->context = loggerContext; +-- +2.28.0 + diff --git a/meta-citadel/recipes-support/nss/nss/blank-cert9.db b/meta-citadel/recipes-support/nss/nss/blank-cert9.db new file mode 100644 index 0000000..7d4bcf2 Binary files /dev/null and b/meta-citadel/recipes-support/nss/nss/blank-cert9.db differ diff --git a/meta-citadel/recipes-support/nss/nss/blank-key4.db b/meta-citadel/recipes-support/nss/nss/blank-key4.db new file mode 100644 index 0000000..d47f08d Binary files /dev/null and b/meta-citadel/recipes-support/nss/nss/blank-key4.db differ diff --git a/meta-citadel/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-citadel/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch new file mode 100644 index 0000000..e87dc9f --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -0,0 +1,42 @@ +From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss,nspr: Add recipes + +clang 3.9 add this warning to rightly flag undefined +behavior, we relegate this to be just a warning instead +of error and keep the behavior as it was. Right fix would +be to not pass enum to the function with variadic arguments +as last named argument + +Fixes errors like +ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] + va_start(ap, responseType0); + ^ +ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here + SECOidTag responseType0, ...) + +see +https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start +for more details + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +--- + nss/coreconf/Werror.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk +index a569a49..687fe58 100644 +--- a/nss/coreconf/Werror.mk ++++ b/nss/coreconf/Werror.mk +@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS + ifdef CC_IS_CLANG + # -Qunused-arguments : clang objects to arguments that it doesn't understand + # and fixing this would require rearchitecture +- WARNING_CFLAGS += -Qunused-arguments ++ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs + # -Wno-parentheses-equality : because clang warns about macro expansions + WARNING_CFLAGS += $(call disable_warning,parentheses-equality) + ifdef BUILD_OPT diff --git a/meta-citadel/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-citadel/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch new file mode 100644 index 0000000..6f02dbc --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -0,0 +1,91 @@ +From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait +Date: Mon, 13 Jul 2020 12:12:31 +0300 +Subject: [PATCH] nss: fix incorrect shebang of perl + +Replace incorrect shebang of perl with `#!/usr/bin/env perl'. + +Signed-off-by: Hongxu Jia +Upstream-Status: Pending +Signed-off-by: Ovidiu Panait + +--- + nss/cmd/signver/examples/1/form.pl | 2 +- + nss/cmd/signver/examples/1/signedForm.pl | 2 +- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/iopr/server_scr/client.cgi | 2 +- + nss/tests/path_uniq | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl +index f2cfddc..af58d54 100755 +--- a/nss/cmd/signver/examples/1/form.pl ++++ b/nss/cmd/signver/examples/1/form.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/bin/env perl + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl +index 847814c..64a31ff 100755 +--- a/nss/cmd/signver/examples/1/signedForm.pl ++++ b/nss/cmd/signver/examples/1/signedForm.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/bin/env perl + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +index e67f6be..6cd85e6 100755 +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl +index d2a4942..3ba7323 100644 +--- a/nss/coreconf/version.pl ++++ b/nss/coreconf/version.pl +@@ -1,4 +1,4 @@ +-#!/usr/sbin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx +index 4de9555..c15a069 100755 +--- a/nss/tests/clean_tbx ++++ b/nss/tests/clean_tbx +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ####################################################################### + # +diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi +index 581ad06..34ea170 100644 +--- a/nss/tests/iopr/server_scr/client.cgi ++++ b/nss/tests/iopr/server_scr/client.cgi +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq +index f29f60a..850332a 100755 +--- a/nss/tests/path_uniq ++++ b/nss/tests/path_uniq +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ######################################################################## + # diff --git a/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch new file mode 100644 index 0000000..fbfa828 --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -0,0 +1,44 @@ +From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan +=================================================== + +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2..e97fb5f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++# CFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + TARGETS = diff --git a/meta-citadel/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-citadel/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 0000000..7dbc1a3 --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,28 @@ +From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia +Upstream-Status: Inappropriate [configuration] + +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +index 6401778..e5c4e16 100644 +--- a/nss/cmd/platlibs.mk ++++ b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + diff --git a/meta-citadel/recipes-support/nss/nss/nss.pc.in b/meta-citadel/recipes-support/nss/nss/nss.pc.in new file mode 100644 index 0000000..402b4ec --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta-citadel/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-citadel/recipes-support/nss/nss/pqg.c-ULL_addend.patch new file mode 100644 index 0000000..5505ae3 --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -0,0 +1,32 @@ +From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss does not build on mips with clang because wrong types are + used? + +pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] + if (addend < MP_DIGIT_MAX) { + ~~~~~~ ^ ~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +--- + nss/lib/freebl/pqg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c +index 626b2fb..052ad36 100644 +--- a/nss/lib/freebl/pqg.c ++++ b/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) + + static SECStatus + addToSeed(const SECItem *seed, +- unsigned long addend, +- int seedlen, /* g in 186-1 */ ++ unsigned long long addend, ++ int seedlen, /* g in 186-1 */ + SECItem *seedout) + { + mp_int s, sum, modulus, tmp; diff --git a/meta-citadel/recipes-support/nss/nss/system-pkcs11.txt b/meta-citadel/recipes-support/nss/nss/system-pkcs11.txt new file mode 100644 index 0000000..1a264e9 --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss/system-pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/meta-citadel/recipes-support/nss/nss_3.56.bb b/meta-citadel/recipes-support/nss/nss_3.56.bb new file mode 100644 index 0000000..997f895 --- /dev/null +++ b/meta-citadel/recipes-support/nss/nss_3.56.bb @@ -0,0 +1,272 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \ + " +SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_compile_prepend_class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} +} + +do_compile_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + export NSS_ENABLE_WERROR=0 + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" \ + autobuild +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install_append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install_append_class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" + +pkg_postinst_${PN} () { + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + echo "shlibsign -i $FN failed" + fi + done +} + +PACKAGES =+ "${PN}-smime" +FILES_${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES_${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES_${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS_${PN}-smime = "perl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index b5f4598..446325c 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -1,7 +1,7 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -LAYERSERIES_COMPAT_meta-gnome = "thud warrior zeus" +LAYERSERIES_COMPAT_meta-gnome = "dunfell" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ diff --git a/meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb b/meta-gnome/recipes-connectivity/iwd/iwd_1.9.bb similarity index 96% rename from meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb rename to meta-gnome/recipes-connectivity/iwd/iwd_1.9.bb index 06606cd..9760c59 100644 --- a/meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb +++ b/meta-gnome/recipes-connectivity/iwd/iwd_1.9.bb @@ -8,7 +8,8 @@ DEPENDS = "ell" SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ file://0001-Remove-config-dir-from-unit-file.patch \ " -SRCREV = "ef6084dcb4fe2e00327bb9c7b113ece204042c22" +SRCREV = "aa3dc1b95348dea177e9d8c2c3063b29e20fe2e9" + S = "${WORKDIR}/git" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch deleted file mode 100644 index 302c029..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001 -From: Pablo Saavedra -Date: Tue, 13 Mar 2018 17:36:20 +0100 -Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 967eac0..b914219 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then - AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) - - AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) -- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` -+ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` - JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` - - if test "$JANSSON_SONAME" = ""; then diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch new file mode 100644 index 0000000..1bbb0a3 --- /dev/null +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch @@ -0,0 +1,40 @@ +From 0ec98dd65d3133514175968b19c01eed9b1d9b0c Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Tue, 27 Oct 2020 16:14:07 -0400 +Subject: [PATCH] Generator fails to build in cross-compile environment. + +It's not needed because it's for (re-)creating generate-docs-nm-settings-nmcli.xml +which already exists in the source archive. +--- + clients/cli/meson.build | 21 --------------------- + 1 file changed, 21 deletions(-) + +diff --git a/clients/cli/meson.build b/clients/cli/meson.build +index 517deff..d3b249c 100644 +--- a/clients/cli/meson.build ++++ b/clients/cli/meson.build +@@ -35,24 +35,3 @@ executable( + + endif + +-generate_docs_nm_settings_nmcli = executable( +- 'generate-docs-nm-settings-nmcli', +- files( +- 'generate-docs-nm-settings-nmcli.c', +- ), +- dependencies: [ +- libnmc_base_dep, +- libnmc_dep, +- libnm_libnm_aux_dep, +- ], +- c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')], +- link_args: ldflags_linker_script_binary, +- link_depends: linker_script_binary, +-) +- +-generate_docs_nm_settings_nmcli_xml = custom_target( +- 'generate-docs-nm-settings-nmcli.xml', +- output: 'generate-docs-nm-settings-nmcli.xml', +- command: [ generate_docs_nm_settings_nmcli ], +- capture: true, +-) diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch deleted file mode 100644 index 446637b..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 22 Mar 2018 11:08:30 +0100 -Subject: [PATCH] Do not create settings settings/property documentation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It was tried to get this work but gi / GirRepository could not be found by -python. Anyway it is not necessary for us to have the settings/property docs. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller - ---- - Makefile.am | 11 ----------- - configure.ac | 5 ----- - 2 files changed, 16 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d5cbcf5..2a1819a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir - INTROSPECTION_GIRS += libnm/NM-1.0.gir - - libnm_noinst_data = \ -- libnm/nm-property-docs.xml \ - libnm/nm-settings-docs-overrides.xml \ -- libnm/nm-settings-docs.xml \ - libnm/nm-settings-keyfile-docs.xml \ - libnm/nm-settings-ifcfg-rh-docs.xml - -@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) - $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp - - clients_common_settings_doc_h = clients/common/settings-docs.h --if HAVE_INTROSPECTION --$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp -- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) --DISTCLEANFILES += $(clients_common_settings_doc_h) --check-local-settings-docs: $(clients_common_settings_doc_h) -- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)" --check_local += check-local-settings-docs --else - $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp - $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" - check-local-settings-docs: --endif - EXTRA_DIST += \ - $(clients_common_settings_doc_h) \ - $(clients_common_settings_doc_h).in -diff --git a/configure.ac b/configure.ac -index ad4b0fc..0092092 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0) - # check if we can build setting property documentation - build_docs=no - if test -n "$INTROSPECTION_MAKEFILE"; then -- # If g-i is installed we know we have python, but we might not have pygobject -- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then -- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) -- fi -- - AC_PATH_PROG(PERL, perl) - if test -z "$PERL"; then - AC_MSG_ERROR([--enable-introspection requires perl]) diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch deleted file mode 100644 index 555e5ff..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Nov 2018 11:30:44 -0800 -Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h - -They conflict when used together especially with musl -removing them still keeps it working so it seems they are redundant - -Signed-off-by: Khem Raj - ---- - shared/n-acd/src/n-acd.c | 1 - - src/platform/wpan/nm-wpan-utils.h | 2 -- - src/settings/nm-settings-connection.h | 2 -- - 3 files changed, 5 deletions(-) - -diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c -index def56a2..dd4eb78 100644 ---- a/shared/n-acd/src/n-acd.c -+++ b/shared/n-acd/src/n-acd.c -@@ -11,7 +11,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h -index 1b54ec4..ed39938 100644 ---- a/src/platform/wpan/nm-wpan-utils.h -+++ b/src/platform/wpan/nm-wpan-utils.h -@@ -20,8 +20,6 @@ - #ifndef __WPAN_UTILS_H__ - #define __WPAN_UTILS_H__ - --#include -- - #include "nm-dbus-interface.h" - #include "platform/nm-netlink.h" - -diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h -index e796b71..c01fef6 100644 ---- a/src/settings/nm-settings-connection.h -+++ b/src/settings/nm-settings-connection.h -@@ -22,8 +22,6 @@ - #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ - #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ - --#include -- - #include "nm-dbus-object.h" - #include "nm-connection.h" - diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch deleted file mode 100644 index 5c59208..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 32dc6cab58912add5bc6495558538953d9344c36 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 31 Mar 2017 16:48:00 -0700 -Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified - -Signed-off-by: Khem Raj - ---- - src/systemd/src/libsystemd-network/sd-lldp.c | 1 + - src/systemd/src/systemd/sd-lldp.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c -index 741128e..62914ae 100644 ---- a/src/systemd/src/libsystemd-network/sd-lldp.c -+++ b/src/systemd/src/libsystemd-network/sd-lldp.c -@@ -3,6 +3,7 @@ - #include "nm-sd-adapt-core.h" - - #include -+#include - #include - #include - -diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h -index bf3afad..4cace87 100644 ---- a/src/systemd/src/systemd/sd-lldp.h -+++ b/src/systemd/src/systemd/sd-lldp.h -@@ -18,7 +18,7 @@ - ***/ - - #include --#include -+//#include - #include - - #include "sd-event.h" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch deleted file mode 100644 index 8d90548..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ff1a5b849755db67b1778940fff92d6eb8b8b050 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 22 Mar 2018 17:54:10 +0100 -Subject: [PATCH] Usual fix for musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Stolen from [1] and prettyfied slightly - -[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches - -Signed-off-by: Andreas Müller - ---- - shared/systemd/src/basic/stdio-util.h | 2 ++ - shared/systemd/src/basic/util.h | 5 +++++ - 2 files changed, 7 insertions(+) - -diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h -index dc67b6e..6336243 100644 ---- a/shared/systemd/src/basic/stdio-util.h -+++ b/shared/systemd/src/basic/stdio-util.h -@@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - #pragma once - -+#if defined(__GLIBC__) - #include -+#endif - #include - #include - #include -diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h -index dc33d66..8ee2d64 100644 ---- a/shared/systemd/src/basic/util.h -+++ b/shared/systemd/src/basic/util.h -@@ -27,6 +27,11 @@ - #include "macro.h" - #include "time-util.h" - -+#if !defined(__GLIBC__) -+typedef int (*__compar_fn_t) (const void*, const void*); -+typedef __compar_fn_t comparison_fn_t; -+#endif -+ - size_t page_size(void) _pure_; - #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) - diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch deleted file mode 100644 index 419e1be..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7743ea63fbe572b1f82db7d399fe9c5c99521432 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 22 Mar 2018 18:18:06 +0100 -Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of - LD_LIBS="none required" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Stolen from [1] and prettyfied slightly - -[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches - -Signed-off-by: Andreas Müller - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index b914219..1b2b0ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -241,6 +241,7 @@ dnl - dnl Checks for libdl - on certain platforms its part of libc - dnl - AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) -+AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""]) - AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") - - PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch deleted file mode 100644 index 45f607f..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 70ecbc01874bf2f8603ccbdfda634cac0bb83d93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 22 Mar 2018 18:24:07 +0100 -Subject: [PATCH] musl: network support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Stolen from [1] and prettyfied slightly - -[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches - -Signed-off-by: Andreas Müller - ---- - libnm-core/nm-utils.h | 4 ++++ - shared/systemd/src/basic/socket-util.h | 6 ++++++ - src/platform/wifi/nm-wifi-utils.h | 4 ++++ - 3 files changed, 14 insertions(+) - -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 2b5baba..976850c 100644 ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -30,7 +30,11 @@ - #include - - /* For ETH_ALEN and INFINIBAND_ALEN */ -+#if defined(__GLIBC__) - #include -+#else -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - #include - - #include "nm-core-enum-types.h" -diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h -index d2246a8..76f257f 100644 ---- a/shared/systemd/src/basic/socket-util.h -+++ b/shared/systemd/src/basic/socket-util.h -@@ -13,6 +13,12 @@ - #include - #include - -+#if !defined(__GLIBC__) -+/* SIOCGSTAMPNS from linux/asm-generic.h -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ -+#include -+#endif -+ - #include "macro.h" - #include "missing_socket.h" - #include "sparse-endian.h" -diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h -index 36148b5..d282eb2 100644 ---- a/src/platform/wifi/nm-wifi-utils.h -+++ b/src/platform/wifi/nm-wifi-utils.h -@@ -22,7 +22,11 @@ - #ifndef __WIFI_UTILS_H__ - #define __WIFI_UTILS_H__ - -+#if defined(__GLIBC__) - #include -+#else /* musl libc */ -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - - #include "nm-dbus-interface.h" - #include "nm-setting-wireless.h" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch deleted file mode 100644 index 525e359..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4f2fb1e1f785bad22df8f3d96cb4792acf21f315 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 25 Oct 2018 09:57:07 +0200 -Subject: [PATCH] musl: process-util -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Stolen from [1] and prettyfied slightly - -[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches - -Signed-off-by: Andreas Müller - ---- - shared/systemd/src/basic/process-util.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c -index b0afb5c..7adc8bd 100644 ---- a/shared/systemd/src/basic/process-util.c -+++ b/shared/systemd/src/basic/process-util.c -@@ -21,6 +21,9 @@ - #include - #include - #include -+#ifndef __GLIBC__ -+#include -+#endif - #if 0 /* NM_IGNORED */ - #if HAVE_VALGRIND_VALGRIND_H - #include -@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) { - cached_pid = CACHED_PID_UNSET; - } - -+#ifdef __GLIBC__ - /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc - * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against - * libpthread, as it is part of glibc anyway. */ - extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); - extern void* __dso_handle _weak_; -+#endif - - pid_t getpid_cached(void) { - static bool installed = false; -@@ -1201,7 +1206,11 @@ pid_t getpid_cached(void) { - * only half-documented (glibc doesn't document it but LSB does — though only superficially) - * we'll check for errors only in the most generic fashion possible. */ - -+#ifdef __GLIBC__ - if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { -+#else -+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { -+#endif - /* OOM? Let's try again later */ - cached_pid = CACHED_PID_UNSET; - return new_pid; diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch deleted file mode 100644 index 211a2da..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4232a34064e33b52f07cca51b902b93699800f72 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 16 Apr 2018 14:45:44 +0200 -Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller - ---- - src/systemd/src/systemd/sd-dhcp-client.h | 2 ++ - src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++ - src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++ - src/systemd/src/systemd/sd-ipv4ll.h | 2 ++ - 4 files changed, 8 insertions(+) - -diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h -index bd0d429..c935fe1 100644 ---- a/src/systemd/src/systemd/sd-dhcp-client.h -+++ b/src/systemd/src/systemd/sd-dhcp-client.h -@@ -20,7 +20,9 @@ - ***/ - - #include -+#if defined(__GLIBC__) - #include -+#endif - #include - #include - #include -diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h -index d299c79..991e67e 100644 ---- a/src/systemd/src/systemd/sd-dhcp-lease.h -+++ b/src/systemd/src/systemd/sd-dhcp-lease.h -@@ -19,7 +19,9 @@ - ***/ - - #include -+#if defined(__GLIBC__) - #include -+#endif - #include - #include - -diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h -index 43d38f5..57ab487 100644 ---- a/src/systemd/src/systemd/sd-dhcp6-client.h -+++ b/src/systemd/src/systemd/sd-dhcp6-client.h -@@ -20,7 +20,9 @@ - ***/ - - #include -+#if defined(__GLIBC__) - #include -+#endif - #include - - #include "sd-dhcp6-lease.h" -diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h -index 71bd4cf..1c667ba 100644 ---- a/src/systemd/src/systemd/sd-ipv4ll.h -+++ b/src/systemd/src/systemd/sd-ipv4ll.h -@@ -19,7 +19,9 @@ - along with systemd; If not, see . - ***/ - -+#if defined(__GLIBC__) - #include -+#endif - #include - - #include "sd-event.h" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch deleted file mode 100644 index 8858101..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cdd69321ec97ed19e66a747a968a1637a251b9e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 16 Apr 2018 15:07:20 +0200 -Subject: [PATCH] Add a strndupa replacement for musl -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller - ---- - shared/systemd/src/basic/in-addr-util.c | 1 + - shared/systemd/src/basic/string-util.h | 5 +++++ - 2 files changed, 6 insertions(+) - -diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c -index 5ced350..c6b52b8 100644 ---- a/shared/systemd/src/basic/in-addr-util.c -+++ b/shared/systemd/src/basic/in-addr-util.c -@@ -13,6 +13,7 @@ - #include "in-addr-util.h" - #include "macro.h" - #include "parse-util.h" -+#include "string-util.h" - #include "util.h" - - bool in4_addr_is_null(const struct in_addr *a) { -diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h -index 38070ab..6b918e0 100644 ---- a/shared/systemd/src/basic/string-util.h -+++ b/shared/systemd/src/basic/string-util.h -@@ -27,6 +27,11 @@ - #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) - #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) - -+/* musl does not know strndupa */ -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - int strcmp_ptr(const char *a, const char *b) _pure_; - - static inline bool streq_ptr(const char *a, const char *b) { diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb similarity index 52% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb index 53bb870..bde4ba0 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb @@ -15,76 +15,50 @@ DEPENDS = " \ util-linux \ libndp \ libnewt \ - jansson \ curl \ + dbus \ + nss \ + iwd \ + coreutils-native \ + python3-pygobject-native \ " +GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://${BPN}.initd \ - file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ - file://0002-Do-not-create-settings-settings-property-documentati.patch \ - file://NetworkManager.conf \ -" -SRC_URI_append_libc-musl = " \ - file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ - file://musl/0002-Fix-build-with-musl.patch \ - file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \ - file://musl/0004-Fix-build-with-musl-systemd-specific.patch \ -" -SRC_URI[sha256sum] = "2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77" +SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ + file://NetworkManager.conf \ + file://watch-resolvconf.path \ + file://watch-resolvconf.service \ + file://0001-Generator-fails-to-build-in-cross-compile-environmen.patch \ + " + +SRC_URI[sha256sum] = "7995802c67e54fc58be4c0e3d2095d943f53f4300a93bde7ff48822a0b1f62ea" S = "${WORKDIR}/NetworkManager-${PV}" -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=no \ - --with-udev-dir=${nonarch_base_libdir}/udev \ - --with-iwd \ -" - -# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template -# avoids: -# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -CFLAGS_append_libc-musl = " \ - -DRTLD_DEEPBIND=0 \ -" +EXTRA_OEMESON = "\ + -Diwd=true \ + -Dnmtui=false \ + -Djson_validation=false \ + -Dselinux=false \ + -Dlibaudit=no \ + -Dpolkit=false \ + -Dppp=false \ + -Dmodem_manager=false \ + -Dovs=false \ + -Dlibpsl=false \ + -Dqt=false \ + -Dfirewalld_zone=false \ + -Dsession_tracking_consolekit=false \ + -Ddhclient=${base_sbindir}/dhclient \ + " do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" } -PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ - --without-systemdsystemunitdir, \ -" -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,iwd" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" - PACKAGES =+ " \ ${PN}-nmtui ${PN}-nmtui-doc \ ${PN}-adsl ${PN}-cloud-setup \ @@ -102,7 +76,6 @@ FILES_${PN}-cloud-setup = " \ ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ " ALLOW_EMPTY_${PN}-cloud-setup = "1" -SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" FILES_${PN} += " \ ${libexecdir} \ @@ -146,7 +119,7 @@ FILES_${PN}-nmtui-doc = " \ " INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" +SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" diff --git a/meta-gnome/recipes-devtools/meson/meson.inc b/meta-gnome/recipes-devtools/meson/meson.inc new file mode 100644 index 0000000..004189e --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson.inc @@ -0,0 +1,33 @@ +HOMEPAGE = "http://mesonbuild.com" +SUMMARY = "A high performance build system" +DESCRIPTION = "Meson is a build system designed to increase programmer \ +productivity. It does this by providing a fast, simple and easy to use \ +interface for modern software development tools and practices." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ + file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ + file://0003-native_bindir.patch \ + file://0001-python-module-do-not-manipulate-the-environment-when.patch \ + file://disable-rpath-handling.patch \ + file://cross-prop-default.patch \ + file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ + file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ + " +SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080" + +SRC_URI_append_class-native = " \ + file://0001-Make-CPU-family-warnings-fatal.patch \ + file://0002-Support-building-allarch-recipes-again.patch \ +" + +UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" +UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" + +inherit setuptools3 + +RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" + +FILES_${PN} += "${datadir}/polkit-1" diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch new file mode 100644 index 0000000..fbc03b8 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -0,0 +1,41 @@ +From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 3 Jul 2018 13:59:09 +0100 +Subject: [PATCH] Make CPU family warnings fatal + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ross Burton + +--- + mesonbuild/envconfig.py | 2 +- + mesonbuild/environment.py | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index 219b62e..d1be65b 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -199,7 +199,7 @@ class MachineInfo: + + cpu_family = literal['cpu_family'] + if cpu_family not in known_cpu_families: +- mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family)) ++ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) + + endian = literal['endian'] + if endian not in ('little', 'big'): +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index bf09a88..8eabe78 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: + trial = 'parisc' + + if trial not in known_cpu_families: +- mlog.warning('Unknown CPU family {!r}, please report this at ' +- 'https://github.com/mesonbuild/meson/issues/new with the ' +- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) ++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) + + return trial + diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch new file mode 100644 index 0000000..a1f8422 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch @@ -0,0 +1,37 @@ +From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 27 May 2020 16:43:05 +0000 +Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR + +When using sysroots for builds, the standard target paths for the +tools need to be prefixed (pkg-config is not clever enough to +determine when a custom variable is a path) + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin + +--- + mesonbuild/modules/gnome.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 52016f4..2b72ee4 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule): + if giscanner is not None: + self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner) + elif self.gir_dep.type_name == 'pkgconfig': +- self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) ++ self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})) + else: + self.giscanner = self.interpreter.find_program_impl('g-ir-scanner') + gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') + if gicompiler is not None: + self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler) + elif self.gir_dep.type_name == 'pkgconfig': +- self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) ++ self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})) + else: + self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler') + return self.gir_dep, self.giscanner, self.gicompiler diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch new file mode 100644 index 0000000..471f150 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch @@ -0,0 +1,36 @@ +From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 4 Aug 2017 16:16:41 +0300 +Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling + +Specifically: +1) Make it possible to specify a wrapper for executing binaries +(usually, some kind of target hardware emulator, such as qemu) +2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will +try to guess them, incorrectly. +3) If things break down, print the full command with arguments, +not just the binary name. +4) Correctly determine the compiler/linker executables and cross-options when cross-compiling + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin + +--- + mesonbuild/modules/gnome.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index bcf77b9..6a4b472 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -974,6 +974,10 @@ This will become a hard error in the future.''') + args.append('--{}={}'.format(program_name, path)) + if namespace: + args.append('--namespace=' + namespace) ++ gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None) ++ if gtkdoc_exe_wrapper is not None: ++ args.append('--run=' + gtkdoc_exe_wrapper) ++ + args += self._unpack_args('--htmlargs=', 'html_args', kwargs) + args += self._unpack_args('--scanargs=', 'scan_args', kwargs) + args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch new file mode 100644 index 0000000..c0ad01e --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch @@ -0,0 +1,45 @@ +From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 18 Apr 2019 17:36:11 +0200 +Subject: [PATCH] modules/python.py: do not substitute python's install prefix + with meson's + +Not sure why this is being done, but it +a) relies on Python's internal variable substitution which may break in the future +b) shouldn't be necessary as Python's prefix ought to be correct in the first place + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin + +--- + mesonbuild/modules/python.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index 2f0c644..d2aa565 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig + import json + import sys + +-install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', 'platbase': '', 'installed_base': ''}) ++install_paths = sysconfig.get_paths(scheme='posix_prefix') + + def links_against_libpython(): + from distutils.core import Distribution, Extension +@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder): + ExternalProgramHolder.__init__(self, python, interpreter.subproject) + self.interpreter = interpreter + self.subproject = self.interpreter.subproject +- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix') + self.variables = info['variables'] + self.paths = info['paths'] + install_paths = info['install_paths'] +- self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:]) +- self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:]) ++ self.platlib_install_path = install_paths['platlib'] ++ self.purelib_install_path = install_paths['purelib'] + self.version = info['version'] + self.platform = info['platform'] + self.is_pypy = info['is_pypy'] diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch new file mode 100644 index 0000000..eb0e90d --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -0,0 +1,43 @@ +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 19 Nov 2018 14:24:26 +0100 +Subject: [PATCH] python module: do not manipulate the environment when calling + pkg-config + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin + +--- + mesonbuild/modules/python.py | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index 07be318..b770603 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency): + old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') + old_pkg_path = os.environ.get('PKG_CONFIG_PATH') + +- os.environ.pop('PKG_CONFIG_PATH', None) +- +- if pkg_libdir: +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir +- + try: + self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs) + mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir)) +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency): + mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir)) + mlog.debug(e) + +- if old_pkg_path is not None: +- os.environ['PKG_CONFIG_PATH'] = old_pkg_path +- +- if old_pkg_libdir is not None: +- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir +- else: +- os.environ.pop('PKG_CONFIG_LIBDIR', None) + else: + mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir)) + diff --git a/meta-gnome/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch b/meta-gnome/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch deleted file mode 100644 index e5e1702..0000000 --- a/meta-gnome/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3ec508d72b45e65b83610680e4fe31fadb13a8d3 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 12:39:12 -0400 -Subject: [PATCH] Use exe wrapper for custom targets - ---- - mesonbuild/backend/backends.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py -index 4b9bcb5..f8b8168 100644 ---- a/mesonbuild/backend/backends.py -+++ b/mesonbuild/backend/backends.py -@@ -745,6 +745,9 @@ class Backend: - and no exe wrapper is defined or needs_exe_wrapper is true. - You might want to set it to native instead.'''.format(exe.name)) - raise MesonException(s) -+ else: -+ exe_path = os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe)) -+ return [self.environment.exe_wrapper.get_path(), exe_path] - if isinstance(exe, build.BuildTarget): - exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))] - else: diff --git a/meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch new file mode 100644 index 0000000..2d80474 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -0,0 +1,26 @@ +From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Thu, 26 Jul 2018 16:32:49 +0200 +Subject: [PATCH] Support building allarch recipes again + +This registers "allarch" as a known CPU family. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Peter Kjellerstedt + +--- + mesonbuild/envconfig.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index d1be65b..90f3573 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -36,6 +36,7 @@ _T = T.TypeVar('_T') + + + known_cpu_families = ( ++ 'allarch', + 'aarch64', + 'alpha', + 'arc', diff --git a/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch new file mode 100644 index 0000000..5d7bdc2 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -0,0 +1,125 @@ +From f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado +Date: Wed, 15 Nov 2017 15:05:01 +0100 +Subject: [PATCH] native_bindir + +Some libraries, like QT, have pre-processors that convert their input +files into something that the cross-compiler can process. We find the +path of those pre-processors via pkg-config-native instead of +pkg-config. + +This path forces the use of pkg-config-native for host_bins arguments. + +There are some discussions upstream to merge this patch, but I presonaly believe +that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ricardo Ribalda Delgado + +--- + mesonbuild/dependencies/base.py | 19 +++++++++++-------- + mesonbuild/dependencies/ui.py | 6 +++--- + 2 files changed, 14 insertions(+), 11 deletions(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index 368a4bc..9fc398e 100644 +--- a/mesonbuild/dependencies/base.py ++++ b/mesonbuild/dependencies/base.py +@@ -183,7 +183,7 @@ class Dependency: + def get_exe_args(self, compiler): + return [] + +- def get_pkgconfig_variable(self, variable_name, kwargs): ++ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): + raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) + + def get_configtool_variable(self, variable_name): +@@ -261,7 +261,7 @@ class InternalDependency(Dependency): + setattr(result, k, copy.deepcopy(v, memo)) + return result + +- def get_pkgconfig_variable(self, variable_name, kwargs): ++ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): + raise DependencyException('Method "get_pkgconfig_variable()" is ' + 'invalid for an internal dependency') + +@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency): + return s.format(self.__class__.__name__, self.name, self.is_found, + self.version_reqs) + +- def _call_pkgbin_real(self, args, env): +- cmd = self.pkgbin.get_command() + args ++ def _call_pkgbin_real(self, args, env, use_native=False): ++ if use_native: ++ cmd = [self.pkgbin.get_command()[0] + "-native"] + args ++ else: ++ cmd = self.pkgbin.get_command() + args + p, out, err = Popen_safe(cmd, env=env) + rc, out, err = p.returncode, out.strip(), err.strip() + call = ' '.join(cmd) + mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) + return rc, out, err + +- def _call_pkgbin(self, args, env=None): ++ def _call_pkgbin(self, args, env=None, use_native=False): + # Always copy the environment since we're going to modify it + # with pkg-config variables + if env is None: +@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency): + targs = tuple(args) + cache = PkgConfigDependency.pkgbin_cache + if (self.pkgbin, targs, fenv) not in cache: +- cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) ++ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) + return cache[(self.pkgbin, targs, fenv)] + + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: +@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency): + (self.name, out_raw)) + self.link_args, self.raw_link_args = self._search_libs(out, out_raw) + +- def get_pkgconfig_variable(self, variable_name, kwargs): ++ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): + options = ['--variable=' + variable_name, self.name] + + if 'define_variable' in kwargs: +@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency): + + options = ['--define-variable=' + '='.join(definition)] + options + +- ret, out, err = self._call_pkgbin(options) ++ ret, out, err = self._call_pkgbin(options, use_native=use_native) + variable = '' + if ret != 0: + if self.required: +diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +index 95dfe2b..5f82890 100644 +--- a/mesonbuild/dependencies/ui.py ++++ b/mesonbuild/dependencies/ui.py +@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): + self.bindir = self.get_pkgconfig_host_bins(core) + if not self.bindir: + # If exec_prefix is not defined, the pkg-config file is broken +- prefix = core.get_pkgconfig_variable('exec_prefix', {}) ++ prefix = core.get_pkgconfig_variable('exec_prefix', {}, use_native=True) + if prefix: + self.bindir = os.path.join(prefix, 'bin') + +@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency): + applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] + for application in applications: + try: +- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {})) ++ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}, use_native=True)) + except MesonException: + pass + +@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency): + QtBaseDependency.__init__(self, 'qt5', env, kwargs) + + def get_pkgconfig_host_bins(self, core): +- return core.get_pkgconfig_variable('host_bins', {}) ++ return core.get_pkgconfig_variable('host_bins', {}, use_native=True) + + def get_private_includes(self, mod_inc_dir, module): + return _qt_get_private_includes(mod_inc_dir, module, self.version) diff --git a/meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch b/meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch new file mode 100644 index 0000000..772395e --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch @@ -0,0 +1,23 @@ +meson.build files that use cc.run() in native builds can silently fallback to +meson.get_cross_property() in cross builds without an exe-wrapper, but there's +no way to know that this is happening. + +As the defaults may be pessimistic (for example, disabling the support for a +feature that should be enabled) emit a warning when the default is used, so that +the recipe can explicitly set the cross property as relevant. + +Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/5071] +Signed-off-by: Ross Burton + +diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py +index 3c3cfae0..10e741ae 100644 +--- a/mesonbuild/interpreter.py ++++ b/mesonbuild/interpreter.py +@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject): + return props[propname] + except Exception: + if len(args) == 2: ++ mlog.warning('Cross property %s is using default value %s' % (propname, args[1])) + return args[1] + raise InterpreterException('Unknown cross property: %s.' % propname) + diff --git a/meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch new file mode 100644 index 0000000..4653a72 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch @@ -0,0 +1,35 @@ +From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Fri, 23 Nov 2018 15:28:28 +0000 +Subject: [PATCH] meson: Disable rpath stripping at install time + +We need to allow our rpaths generated through the compiler flags to make it into +our binaries. Therefore disable the meson manipulations of these unless there +is a specific directive to do something differently in the project. + +RP 2018/11/23 + +Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567] + +--- + mesonbuild/minstall.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py +index 0be01fe..5406cab 100644 +--- a/mesonbuild/minstall.py ++++ b/mesonbuild/minstall.py +@@ -512,8 +512,11 @@ class Installer: + if file_copied: + self.did_install_something = True + try: +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, +- install_name_mappings, verbose=False) ++ if install_rpath: ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, ++ install_name_mappings, verbose=False) ++ else: ++ print("RPATH changes at install time disabled") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass diff --git a/meta-gnome/recipes-devtools/meson/meson/meson-setup.py b/meta-gnome/recipes-devtools/meson/meson/meson-setup.py new file mode 100755 index 0000000..808e2a0 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/meson-setup.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 + +import os +import string +import sys + +class Template(string.Template): + delimiter = "@" + +class Environ(): + def __getitem__(self, name): + val = os.environ[name] + val = ["'%s'" % x for x in val.split()] + val = ', '.join(val) + val = '[%s]' % val + return val + +try: + sysroot = os.environ['OECORE_NATIVE_SYSROOT'] +except KeyError: + print("Not in environment setup, bailing") + sys.exit(1) + +template_file = os.path.join(sysroot, 'usr/share/meson/meson.cross.template') +cross_file = os.path.join(sysroot, 'usr/share/meson/%smeson.cross' % os.environ["TARGET_PREFIX"]) + +with open(template_file) as in_file: + template = in_file.read() + output = Template(template).substitute(Environ()) + with open(cross_file, "w") as out_file: + out_file.write(output) diff --git a/meta-gnome/recipes-devtools/meson/meson/meson-wrapper b/meta-gnome/recipes-devtools/meson/meson/meson-wrapper new file mode 100755 index 0000000..d4ffe60 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson/meson-wrapper @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ -z "$OECORE_NATIVE_SYSROOT" ]; then + echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 +fi + +# If these are set to a cross-compile path, meson will get confused and try to +# use them as native tools. Unset them to prevent this, as all the cross-compile +# config is already in meson.cross. +unset CC CXX CPP LD AR NM STRIP + +exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ + --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \ + "$@" diff --git a/meta-gnome/recipes-devtools/meson/meson_%.bbappend b/meta-gnome/recipes-devtools/meson/meson_%.bbappend deleted file mode 100644 index 23dbaba..0000000 --- a/meta-gnome/recipes-devtools/meson/meson_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ - -FILESEXTRAPATHS_prepend := "${THISDIR}/meson:" - -#SRC_URI += "\ -# file://0001-use-exe-wrapper-for-custom-targets.patch \ -#" diff --git a/meta-gnome/recipes-devtools/meson/meson_0.55.1.bb b/meta-gnome/recipes-devtools/meson/meson_0.55.1.bb new file mode 100644 index 0000000..de9b905 --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/meson_0.55.1.bb @@ -0,0 +1,4 @@ +include meson.inc + +BBCLASSEXTEND = "native" + diff --git a/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb b/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb new file mode 100644 index 0000000..67add2c --- /dev/null +++ b/meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb @@ -0,0 +1,65 @@ +include meson.inc + +inherit nativesdk +inherit siteinfo + +SRC_URI += "file://meson-setup.py \ + file://meson-wrapper" + +def meson_endian(prefix, d): + arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") + sitedata = siteinfo_data_for_machine(arch, os, d) + if "endian-little" in sitedata: + return "little" + elif "endian-big" in sitedata: + return "big" + else: + bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) + +# The cross file logic is similar but not identical to that in meson.bbclass, +# since it's generating for an SDK rather than a cross-compile. Important +# differences are: +# - We can't set vars like CC, CXX, etc. yet because they will be filled in with +# real paths by meson-setup.sh when the SDK is extracted. +# - Some overrides aren't needed, since the SDK injects paths that take care of +# them. +do_install_append() { + install -d ${D}${datadir}/meson + cat >${D}${datadir}/meson/meson.cross.template < -Date: Thu, 14 Jun 2018 17:21:49 +0000 -Subject: [PATCH] Switch from filename to basename - -When atk-enum-types.h is installed in to a system, the user likely has -no access to the location where the headers were built, especially if -the software was built in a sysroot environment. If the headers were -built for a mulitlib environment, the build pathing may be different. -Subsequently, if two mulitlib variants of atk are installed together the -headers conflict for no other reason then they were built in two -different locations. Switching from filename to basename, still should -provide sufficient information on the providence of the enums, while not -conflicting for really no good reason. - -Signed-off-by: Jeremy Puhlman ---- - atk/atk-enum-types.h.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template -index 7b4cec4..8321c24 100644 ---- a/atk/atk-enum-types.h.template -+++ b/atk/atk-enum-types.h.template -@@ -14,7 +14,7 @@ G_BEGIN_DECLS - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ --- -2.14.1.459.g238e487 - diff --git a/meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index f9b9054..0000000 --- a/meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e112815aabac23d9f9c8fa3ff66965a6a823a143 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Sun, 13 Jan 2019 21:04:00 -0500 -Subject: [PATCH] sup - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/meta-gnome/recipes-gnome/atk/atk_2.32.0.bb b/meta-gnome/recipes-gnome/atk/atk_2.32.0.bb deleted file mode 100644 index ffbda44..0000000 --- a/meta-gnome/recipes-gnome/atk/atk_2.32.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -# Need gettext-native as Meson can't turn off i18n -DEPENDS = "gettext-native glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -GTKDOC_ENABLE_FLAG = "-Denable_docs=true" -GTKDOC_DISABLE_FLAG = "-Denable_docs=false" - -GI_ENABLE_FLAG = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - -SRC_URI_append = " \ - file://0001-meson.build-enable-introspection-for-cross-compile.patch \ - " -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" - -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-gnome/atk/atk_2.36.0.bb b/meta-gnome/recipes-gnome/atk/atk_2.36.0.bb deleted file mode 100644 index 0786eee..0000000 --- a/meta-gnome/recipes-gnome/atk/atk_2.36.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -# Need gettext-native as Meson can't turn off i18n -DEPENDS = "gettext-native glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -SRC_URI[archive.md5sum] = "01aa5ec5138f5f8c9b3a4e3196ed2900" -SRC_URI[archive.sha256sum] = "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb b/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb deleted file mode 100644 index 85747da..0000000 --- a/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Text entry and UI navigation application being developed as an alternative to the GNOME On-Screen Keyboard" -HOMEPAGE = "https://wiki.gnome.org/Projects/Caribou" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=e2aa4f66375a24019b0ff5e99cec40ad" - -SRC_URI = "https://download.gnome.org/sources/caribou/0.4/caribou-${PV}.tar.xz" -SRC_URI[md5sum] = "16b76cd7453b99e2871e8d4da88bf976" -SRC_URI[sha256sum] = "9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55" - -DEPENDS = "gtk+3 python3-pygobject intltool-native glib-2.0 clutter-1.0 libgee libxklavier glib-2.0-native xmlto-native python3-pygobject-native" - -WARN_QA_remove = "unknown-configure-option" - -PYTHON_CARIBOU = "${libdir}/python3.7/site-packages/caribou" -FILES_${PN} += "\ - ${datadir}/dbus-1/services \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/antler \ - ${datadir}/vala/vapi \ - ${libdir}/gtk-3.0/modules/libcaribou-gtk-module.so \ - ${libdir}/gnome-settings-daemon-3.0/gtk-modules \ - ${PYTHON_CARIBOU} \ -" - -FILES_${PN}-staticdev += "${libdir}/gtk-3.0/modules/libcaribou-gtk-module.a" - -inherit gettext python3native pkgconfig autotools gobject-introspection - -export GI_TYPELIB_PATH = "${STAGING_LIBDIR_NATIVE}/girepository-1.0" - -EXTRA_OECONF = "--disable-glibtest --enable-gtk2-module=no" - diff --git a/meta-gnome/recipes-gnome/clutter-gtk/clutter-gtk_1.8.4.bb b/meta-gnome/recipes-gnome/clutter-gtk/clutter-gtk_1.8.4.bb deleted file mode 100644 index 6ddd083..0000000 --- a/meta-gnome/recipes-gnome/clutter-gtk/clutter-gtk_1.8.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Library for embedding a Clutter canvas (stage) in GTK+" -HOMEPAGE = "https://wiki.gnome.org/Projects/Clutter" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI = "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-${PV}.tar.xz" -SRC_URI[md5sum] = "b363ac9878e2337be887b8ee9e1da00e" -SRC_URI[sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" - -DEPENDS = "gtk+3 clutter-1.0" - -inherit gettext pkgconfig autotools gobject-introspection - -EXTRA_OECONF = "" - diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb deleted file mode 100644 index dcd13d6..0000000 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "x11/gnome" - -SRC_URI[archive.md5sum] = "1a50c988d9f0206f74a44f7c6d09cead" -SRC_URI[archive.sha256sum] = "9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d" - -DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase bash-completion vala - -SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ -" - -EXTRA_OEMESON_append_class-native = "-Dbash_completion=false" - -BBCLASSEXTEND= "native" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb similarity index 76% rename from meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb rename to meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb index 84f83b1..3bb9ec4 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" -SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" +SRC_URI[archive.md5sum] = "716cf730995cf133c2c443556a66a50c" +SRC_URI[archive.sha256sum] = "45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58" DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native" diff --git a/meta-gnome/recipes-gnome/gcr/gcr/0001-Use-pkgconfig-to-find-libgcrypt.patch b/meta-gnome/recipes-gnome/gcr/gcr/0001-Use-pkgconfig-to-find-libgcrypt.patch deleted file mode 100644 index 1b2d78f..0000000 --- a/meta-gnome/recipes-gnome/gcr/gcr/0001-Use-pkgconfig-to-find-libgcrypt.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6f22047a0c97c06d8d4069a7dbecaa567065a00b Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Wed, 21 Mar 2018 15:19:09 -0400 -Subject: [PATCH] Use pkgconfig to find libgcrypt - ---- - configure.ac | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 06dfc0c..c11526f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -193,14 +193,7 @@ AC_DEFINE_UNQUOTED([GPG_EXECUTABLE], ["$GNUPG"], [Path to gpg executable.]) - # - - GCRYPT_LIBVER=1 -- --AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,, -- AC_MSG_ERROR([[ --*** --*** libgcrypt was not found. You may want to get it from --*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ --*** --]])) -+PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) - libgcrypt=yes - AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION", [Version of GCRYPT we expect]) - --- -2.16.2 - diff --git a/meta-gnome/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch b/meta-gnome/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch deleted file mode 100644 index b484a1b..0000000 --- a/meta-gnome/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 11 May 2020 22:19:16 +0000 -Subject: [PATCH] meson.build: correctly set internal vapi dependencies - -If they are set as strings, meson will supply the right -arguments to vapigen, but will not set the ninja dependencies -to ensure they get built first, and so races will occur: -https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55] -Signed-off-by: Alexander Kanavin ---- - gcr/meson.build | 2 +- - ui/meson.build | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gcr/meson.build b/gcr/meson.build -index 254a933..199452f 100644 ---- a/gcr/meson.build -+++ b/gcr/meson.build -@@ -203,7 +203,7 @@ if get_option('introspection') - - gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), - sources: gcr_gir[0], -- packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ], -+ packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], - metadata_dirs: meson.current_source_dir(), - vapi_dirs: [ - build_root / 'gck', -diff --git a/ui/meson.build b/ui/meson.build -index 5ca3753..477412d 100644 ---- a/ui/meson.build -+++ b/ui/meson.build -@@ -174,8 +174,8 @@ if get_option('introspection') - packages: [ - 'glib-2.0', - 'gio-2.0', -- 'gck-@0@'.format(gck_major_version), -- 'gcr-@0@'.format(gcr_major_version), -+ gck_vapi, -+ gcr_vapi, - 'gtk+-3.0' - ], - metadata_dirs: meson.current_source_dir(), diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.36.0.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.36.0.bb deleted file mode 100644 index 7e1c213..0000000 --- a/meta-gnome/recipes-gnome/gcr/gcr_3.36.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A library for bits of crypto UI and parsing etc" -DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \ -accessing key stores. It also provides the viewer for crypto files on the \ -GNOME desktop." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt gnupg-native \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" -inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection gettext mime -# depends on gtk+3, but also x11 through gtk+-x11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch" -SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61" -SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gcr-3 \ -" - -# http://errors.yoctoproject.org/Errors/Details/20229/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" diff --git a/meta-gnome/recipes-gnome/gdm/files/0001-Ensure-pam-file-installation.patch b/meta-gnome/recipes-gnome/gdm/files/0001-Ensure-pam-file-installation.patch deleted file mode 100644 index 6362d5e..0000000 --- a/meta-gnome/recipes-gnome/gdm/files/0001-Ensure-pam-file-installation.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f7bba53adf8a26f900442a05bb98326747c392b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 3 Dec 2019 00:24:27 +0100 -Subject: [PATCH] Ensure pam-file installation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -All the detection magic does not work for us - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Andreas Müller ---- - data/Makefile.am | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index bda9160..dbc3ea3 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -296,22 +296,12 @@ endif - chown root:root $(DESTDIR)$(logdir) || : ; \ - fi - -- system=`uname`; \ -- if test -f /usr/include/security/pam_appl.h; then \ -- if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \ - $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \ - chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \ -- fi; \ -- if test $$system = Linux; then \ - for pamfile in $(pam_files); do \ - bn=$$(basename $$pamfile .pam); \ - $(INSTALL_DATA) $(srcdir)/$$pamfile $(DESTDIR)$(PAM_PREFIX)/pam.d/$$bn; \ -- done; \ -- fi; \ -- if test $$system = SunOS; then \ -- echo "Please add PAM authentication for gdm, gdm-autologin and gdm-welcome in $(PAM_PREFIX)/pam.conf!"; \ -- fi; \ -- fi -+ done; - - if test '!' -d $(DESTDIR)$(xauthdir); then \ - $(mkinstalldirs) $(DESTDIR)$(xauthdir); \ --- -2.21.0 - diff --git a/meta-gnome/recipes-gnome/gdm/files/0001-replace-absolute-path-with-staging-path.patch b/meta-gnome/recipes-gnome/gdm/files/0001-replace-absolute-path-with-staging-path.patch deleted file mode 100644 index f789709..0000000 --- a/meta-gnome/recipes-gnome/gdm/files/0001-replace-absolute-path-with-staging-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5a39825877c98495de2d9ae91544b25053fe5687 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Fri, 2 Feb 2018 19:17:41 -0500 -Subject: [PATCH] replace absolute path with staging path - ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index c10c915..3a94592 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -298,7 +298,7 @@ endif - fi - - system=`uname`; \ -- if test -f /usr/include/security/pam_appl.h; then \ -+ if test -f $(STAGING_INCDIR)/security/pam_appl.h; then \ - if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \ - $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \ - chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \ --- -2.15.1 - diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb deleted file mode 100644 index 6289839..0000000 --- a/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY = "GNOME Display Manager" -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - dconf-native \ - gtk+3 \ - glib-2.0 \ - accountsservice \ - libcanberra \ - libxinerama \ - libpam \ - plymouth \ -" - -REQUIRED_DISTRO_FEATURES = "x11 systemd pam" - -inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even distro_features_check - -SRC_URI[archive.md5sum] = "18384eb8345dbee5a8219916debf7e43" -SRC_URI[archive.sha256sum] = "3f561c10ae2e5942b03026f02c0aa7d8712e382708b17a0970874df8175b83a8" - -SRC_URI += "\ - file://gdm.conf \ - file://0001-replace-absolute-path-with-staging-path.patch \ - " - -# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm -# components. To allow gnome-images using different display-manager, split them -# out into a seperate package. -#PACKAGE_BEFORE_PN = "${PN}-base" -#FILES_${PN}-base = " \ -# ${datadir}/glib-2.0 \ -# ${datadir}/gnome-session \ -# ${libdir}/lib*${SOLIBS} \ -# ${libdir}/girepository-1.0 \ -#" - -#CONFFILES_${PN} += "${sysconfdir}/gdm/custom.conf" -FILES_${PN} += " \ - ${libdir}/systemd/system/gdm.service \ - ${base_libdir}/security/pam_gdm.so \ - ${datadir}/gnome-session/sessions \ - ${datadir}/dconf/profile \ - /run/gdm/greeter \ -" - -do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm - rm ${D}${sysconfdir}/gdm/custom.conf - rm -rf ${D}/run/gdm - rm ${D}${libdir}/udev/rules.d/61-gdm.rules - install -m 644 ${WORKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf -} - - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -EXTRA_OECONF = " \ - --with-plymouth \ - --with-default-pam-config=openembedded \ - --with-pam-mod-dir=${base_libdir}/security \ - --enable-introspection \ - --enable-systemd-journal \ - --enable-wayland-support \ - --with-xdmcp=no \ - --disable-static \ - --enable-gdm-xsession \ -" - diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb new file mode 100644 index 0000000..a945985 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb @@ -0,0 +1,61 @@ +SUMMARY = "GNOME Display Manager" +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + dconf-native \ + itstool-native \ + gtk+3 \ + glib-2.0 \ + accountsservice \ + libcanberra \ + libxinerama \ + libpam \ + plymouth \ +" + +REQUIRED_DISTRO_FEATURES = "x11 systemd pam" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check + +SRC_URI[archive.md5sum] = "948dec80099d9d3a2adacc5788964043" +SRC_URI[archive.sha256sum] = "46d4415c39c94ccee81fbac21102e2ebcd284d39858c893e759900b1e88435ba" + +SRC_URI += "file://gdm.conf" + +WARN_QA_remove = "unknown-configure-option" + +FILES_${PN} += " \ + ${libdir}/systemd/system/gdm.service \ + ${libdir}/systemd/user \ + ${base_libdir}/security/pam_gdm.so \ + ${datadir}/gnome-session/sessions \ + ${datadir}/dconf/profile \ + /run/gdm/greeter \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/default/volatiles + echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm + rm ${D}${sysconfdir}/gdm/custom.conf + rm -rf ${D}/run/gdm + rm ${D}${libdir}/udev/rules.d/61-gdm.rules + install -m 644 ${WORKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +EXTRA_OEMESON = "\ + -Dplymouth=enabled \ + -Dxdmcp=disabled \ + -Ddefault-pam-config=openembedded \ + -Dpam-mod-dir=${base_libdir}/security \ + -Dgdm-xsession=true\ +" + +PACKAGES += "${PN}-help" +FILES_${PN}-help = "${datadir}/help" diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Fix-tests-that-cannot-run.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Fix-tests-that-cannot-run.patch index c0d9e92..f418333 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Fix-tests-that-cannot-run.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Fix-tests-that-cannot-run.patch @@ -8,13 +8,16 @@ Subject: [PATCH] Fix tests that cannot run 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build -index 2ffbf28..6679e45 100644 +index 9ab29475..3dbadcf1 100644 --- a/meson.build +++ b/meson.build -@@ -221,23 +221,23 @@ endif - # Check if a minimal SpiderMonkey program compiles, links, and runs. If not, - # it's most likely the case that SpiderMonkey was configured incorrectly, for - # example by building mozglue as a shared library. +@@ -233,27 +233,6 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with + --disable-debug.''') + endif + +-# Check if a minimal SpiderMonkey program compiles, links, and runs. If not, +-# it's most likely the case that SpiderMonkey was configured incorrectly, for +-# example by building mozglue as a shared library. -minimal_program = cxx.run(''' -#include -int main(void) { @@ -30,34 +33,20 @@ index 2ffbf28..6679e45 100644 - error('''A minimal SpiderMonkey program -could not be compiled, linked, or run. Most likely you should build it with a -different configuration. Check the recommended configuration: --https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr60/docs/Building%20SpiderMonkey.md''') +-https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr78/docs/Building%20SpiderMonkey.md''') -endif -+#minimal_program = cxx.run(''' -+##include -+#int main(void) { -+# if (!JS_Init()) return 1; -+# JS_ShutDown(); -+# return 0; -+#} -+#''', -+# args: debug_arg, dependencies: spidermonkey, -+# name: 'SpiderMonkey sanity check') -+ -+#if not minimal_program.compiled() or minimal_program.returncode() != 0 -+# error('''A minimal SpiderMonkey program -+#could not be compiled, linked, or run. Most likely you should build it with a -+#different configuration. Check the recommended configuration: -+#https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr60/docs/Building%20SpiderMonkey.md''') -+#endif - +- have_printf_alternative_int = cc.compiles(''' #include -@@ -610,7 +610,7 @@ if not get_option('skip_gtk_tests') + int main(void) { +@@ -628,8 +607,6 @@ if not get_option('skip_gtk_tests') have_gtk4 = dependency('gtk4', required: false).found() endif -subdir('installed-tests') -+#subdir('installed-tests') - +- valgrind_environment = environment() valgrind_environment.set('G_SLICE', 'always-malloc,debug-blocks') + valgrind_environment.set('G_DEBUG', + + diff --git a/meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch b/meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch deleted file mode 100644 index 0e51bab..0000000 --- a/meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/gi/object.cpp b/gi/object.cpp -index 2b2265da0cc74c2a1b5b027c2566c5f0e334e278..7003273630efcd6a09c302476e95544ad287c853 100644 ---- a/gi/object.cpp -+++ b/gi/object.cpp -@@ -717,7 +717,11 @@ bool ObjectPrototype::lazy_define_gobject_property(JSContext* cx, - JS::RootedValue private_id(cx, JS::StringValue(JSID_TO_STRING(id))); - if (!gjs_define_property_dynamic( - cx, obj, name, "gobject_prop", &ObjectBase::prop_getter, -- &ObjectBase::prop_setter, private_id, GJS_MODULE_PROP_FLAGS)) -+ &ObjectBase::prop_setter, private_id, -+ // Make property configurable so that interface properties can be -+ // overridden by GObject.ParamSpec.override in the class that -+ // implements them -+ GJS_MODULE_PROP_FLAGS & ~JSPROP_PERMANENT)) - return false; - - *resolved = true; -diff --git a/installed-tests/js/testGObjectInterface.js b/installed-tests/js/testGObjectInterface.js -index 9eab97461cca93817ac747060134306ba235a9b1..daefb6831e38725db5c86398569040af942cd714 100644 ---- a/installed-tests/js/testGObjectInterface.js -+++ b/installed-tests/js/testGObjectInterface.js -@@ -84,6 +84,22 @@ const ImplementationOfTwoInterfaces = GObject.registerClass({ - } - }); - -+const ImplementationOfIntrospectedInterface = GObject.registerClass({ -+ Implements: [Gio.Action], -+ Properties: { -+ 'enabled': GObject.ParamSpec.override('enabled', Gio.Action), -+ 'name': GObject.ParamSpec.override('name', Gio.Action), -+ 'state': GObject.ParamSpec.override('state', Gio.Action), -+ 'state-type': GObject.ParamSpec.override('state-type', Gio.Action), -+ 'parameter-type': GObject.ParamSpec.override('parameter-type', -+ Gio.Action) -+ } -+}, class ImplementationOfIntrospectedInterface extends GObject.Object { -+ get name() { -+ return 'inaction'; -+ } -+}); -+ - describe('GObject interface', function () { - it('cannot be instantiated', function () { - expect(() => new AGObjectInterface()).toThrow(); -@@ -247,6 +263,11 @@ describe('GObject interface', function () { - 253, 'testGObjectMustOverrideInterfaceProperties'); - }); - -+ it('can have introspected properties overriden', function() { -+ let obj = new ImplementationOfIntrospectedInterface(); -+ expect(obj.name).toEqual('inaction'); -+ }); -+ - it('can be implemented by a class as well as its parent class', function () { - const SubObject = GObject.registerClass( - class SubObject extends GObjectImplementingGObjectInterface {}); - diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb deleted file mode 100644 index 33c0e18..0000000 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs" - -LICENSE = "MIT & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" - -inherit gnomebase gettext gobject-introspection - -WARN_QA_remove = "unknown-configure-option" - -export GI_DATADIR="${STAGING_DATADIR}/gobject-introspection-1.0" - -DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs glib-2.0-native" -EXTRA_OECONF = "--without-dbus-tests" - -SRC_URI[archive.md5sum] = "aa47ee8bdcb7c36e9eafd4c7796fbb96" -SRC_URI[archive.sha256sum] = "64a7ad5554adb0105fabb432abcfa690033c177d8e650872b469b7cbf475ec1a" - -RDEPENDS_${PN} += "libmozjs" - -FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.64.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb similarity index 72% rename from meta-gnome/recipes-gnome/gjs/gjs_1.64.2.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb index 3a4d159..06cf3bf 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.64.2.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb @@ -11,14 +11,15 @@ WARN_QA_remove = "unknown-configure-option" export GIDATADIR="${STAGING_DATADIR_NATIVE}/gobject-introspection-1.0" -DEPENDS = "glib-2.0 gobject-introspection gobject-introspection-native cairo gtk+3 mozjs68 glib-2.0-native" +DEPENDS = "glib-2.0 gobject-introspection gobject-introspection-native cairo gtk+3 mozjs78 glib-2.0-native" EXTRA_OEMESON = " -Dskip_dbus_tests=true -Dskip_gtk_tests=true -Dinstalled_tests=false -Dpkgconfig-sysroot-path=${GIDATADIR}" +CFLAGS_append = " -include ${STAGING_INCDIR}/mozjs-78/js/RequiredDefines.h" SRC_URI += " file://0001-Fix-tests-that-cannot-run.patch" -SRC_URI[archive.md5sum] = "bd2f7f411b46016e8ee2d2c8d3c140d9" -SRC_URI[archive.sha256sum] = "15ff834d374df19595d955f03e6b60631a3bb14fabda36d00f81ab3eabd3997b" +SRC_URI[archive.md5sum] = "d43a936f5edd8ff36ecc54684b26d82a" +SRC_URI[archive.sha256sum] = "f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8" -RDEPENDS_${PN} += "libmozjs-68" +RDEPENDS_${PN} += "libmozjs-78" FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind" diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch index 0ebf138..f3a0069 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch @@ -1,4 +1,4 @@ -From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001 +From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 16 Apr 2016 13:28:59 -0700 Subject: [PATCH] Do not ignore return value of write() @@ -16,10 +16,10 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glib/tests/unix.c b/glib/tests/unix.c -index 9d55a6c..a07f945 100644 +index 7639d06..f941141 100644 --- a/glib/tests/unix.c +++ b/glib/tests/unix.c -@@ -32,14 +32,15 @@ test_pipe (void) +@@ -33,14 +33,15 @@ test_pipe (void) GError *error = NULL; int pipefd[2]; char buf[1024]; diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index edac4c9..1e9ae6f 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001 +From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files @@ -16,13 +16,13 @@ Signed-off-by: Alexander Kanavin 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 71e88c4..8ce3987 100644 +index 532b086..98468a3 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,14 +831,14 @@ pkg.generate(libgio, +@@ -817,14 +817,14 @@ pkg.generate(libgio, 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), - 'giomoduledir=' + giomodulesdir, + 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), @@ -43,10 +43,10 @@ index 71e88c4..8ce3987 100644 install_dir : glib_pkgconfigreldir, filebase : 'gio-2.0', diff --git a/glib/meson.build b/glib/meson.build -index 91a48f1..978fb73 100644 +index aaf5f00..1e0992b 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -375,9 +375,9 @@ pkg.generate(libglib, +@@ -392,9 +392,9 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch index d8cf269..16f2d31 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch @@ -1,4 +1,4 @@ -From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001 +From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux @@ -9,7 +9,7 @@ based systems therefore lets set DATADIRNAME to "share". Signed-off-by: Khem Raj Upstream-Status: Pending -%% original patch: uclibc_musl_translation.patch + --- m4macros/glib-gettext.m4 | 4 ++++ 1 file changed, 4 insertions(+) @@ -29,6 +29,3 @@ index df6fbf0..47db864 100644 *) CATOBJEXT=.mo DATADIRNAME=lib --- -2.17.1 - diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index a3d71f2..adda29c 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001 +From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+) diff --git a/gio/meson.build b/gio/meson.build -index 4e5e021..90a741a 100644 +index 2ef60ed..532b086 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index 67ca624..6fd9352 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch @@ -1,7 +1,7 @@ -From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001 +From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 12 Jun 2015 17:08:46 +0300 -Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas +Subject: [PATCH] Remove the warning about deprecated paths in schemas Some schemas in gsettings-desktop-schemas (such as proxy and locale) are still using deprecated paths, as of 3.16.1. This causes warning @@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index b8de090..130f89b 100644 +index 7888120..7acbd5b 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c -@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, +@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, return; } @@ -38,6 +38,3 @@ index b8de090..130f89b 100644 state->schema_state = schema_state_new (path, gettext_domain, extends, extends_name, list_of); --- -2.14.1 - diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index b02169e..5d142db 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -1,4 +1,4 @@ -From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001 +From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 95aafc1..9025eb2 100644 +index dab65d2..e8bb2ee 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -13,7 +13,7 @@ test_c_args = [ +@@ -12,7 +12,7 @@ test_c_args = [ '-UG_DISABLE_ASSERT', ] @@ -26,7 +26,7 @@ index 95aafc1..9025eb2 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -120,7 +120,7 @@ if dbus1_dep.found() +@@ -133,7 +133,7 @@ else endif # Test programs buildable on UNIX only @@ -35,7 +35,7 @@ index 95aafc1..9025eb2 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -332,7 +332,7 @@ if host_machine.system() != 'windows' +@@ -385,7 +385,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only @@ -44,7 +44,7 @@ index 95aafc1..9025eb2 100644 gio_tests += {'win32-streams' : {}} endif -@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif @@ -54,10 +54,10 @@ index 95aafc1..9025eb2 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index c47133f..cad975f 100644 +index 3dedafc..94605e6 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif @@ -67,7 +67,7 @@ index c47133f..cad975f 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index 717d1bc..2a3beb8 100644 +index e1b4b79..afb6eaa 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ else @@ -78,13 +78,13 @@ index 717d1bc..2a3beb8 100644 + host_system = 'windows' +endif - glib_version = meson.project_version() - glib_api_version = '2.0' + if host_system == 'darwin' + ios_test_code = '''#include diff --git a/tests/meson.build b/tests/meson.build -index ce30442..5710f2c 100644 +index 6741f8f..12fdc90 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -66,7 +66,7 @@ test_extra_programs = { +@@ -73,7 +73,7 @@ test_extra_programs = { 'unicode-collate' : {}, } diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch index 3dfef17..d33fdd4 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch @@ -1,4 +1,4 @@ -From 730803f2bc3f2f1a74f4db809a224066e7eae114 Mon Sep 17 00:00:00 2001 +From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test @@ -8,6 +8,7 @@ not cross-compatible (hardcodes ld and objcopy). Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- gio/tests/resources.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch index 833ad25..194f3e9 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch @@ -1,4 +1,4 @@ -From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001 +From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well @@ -9,15 +9,16 @@ Fixes Upstream-Status: Pending Signed-off-by: Khem Raj + --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 9731de4..c678931 100644 +index afb6eaa..6aa70f5 100644 --- a/meson.build +++ b/meson.build -@@ -1634,7 +1634,7 @@ atomicdefine = ''' +@@ -1790,7 +1790,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true @@ -26,6 +27,3 @@ index 9731de4..c678931 100644 # Old gcc release may provide # __sync_bool_compare_and_swap but doesn't define # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 --- -2.23.0 - diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch index 872340d..1c645f3 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch @@ -1,10 +1,11 @@ -From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001 +From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 3 Oct 2017 10:45:55 +0300 -Subject: [PATCH 10/10] Do not hardcode python path into various tools +Subject: [PATCH] Do not hardcode python path into various tools Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- gobject/glib-genmarshal.in | 2 +- @@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in -index 8050981..e693ef3 100755 +index 67d3675..4e92a7a 100755 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -1,4 +1,4 @@ @@ -22,7 +23,7 @@ index 8050981..e693ef3 100755 # GDBus - GLib D-Bus Library # diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 09e8408..b2f9d99 100755 +index 7380f24..c8abeaa 100755 --- a/gobject/glib-genmarshal.in +++ b/gobject/glib-genmarshal.in @@ -1,4 +1,4 @@ @@ -32,7 +33,7 @@ index 09e8408..b2f9d99 100755 # pylint: disable=too-many-lines, missing-docstring, invalid-name diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index d4bfd11..051fce4 100755 +index 91ad779..3ebef62 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -1,4 +1,4 @@ @@ -41,6 +42,3 @@ index d4bfd11..051fce4 100755 # If the code below looks horrible and unpythonic, do not panic. # --- -2.14.1 - diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch deleted file mode 100644 index 37b77d5..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ef2be42998e3fc10299055a5a01f7c791538174c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Mon, 3 Feb 2020 15:38:28 +0200 -Subject: [PATCH] GMainContext - Fix GSource iterator if iteration can modify - the list - -We first have to ref the next source and then unref the previous one. -This might be the last reference to the previous source, and freeing the -previous source might unref and free the next one which would then leave -use with a dangling pointer here. - -Fixes https://gitlab.gnome.org/GNOME/glib/issues/2031 - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/b06c48de7554607ff3fb58d6c0510cfa5088e909] - ---- - glib/gmain.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/glib/gmain.c b/glib/gmain.c -index af979c8..a9a287d 100644 ---- a/glib/gmain.c -+++ b/glib/gmain.c -@@ -969,13 +969,17 @@ g_source_iter_next (GSourceIter *iter, GSource **source) - * GSourceList to be removed from source_lists (if iter->source is - * the only source in its list, and it is destroyed), so we have to - * keep it reffed until after we advance iter->current_list, above. -+ * -+ * Also we first have to ref the next source before unreffing the -+ * previous one as unreffing the previous source can potentially -+ * free the next one. - */ -+ if (next_source && iter->may_modify) -+ g_source_ref (next_source); - - if (iter->source && iter->may_modify) - g_source_unref_internal (iter->source, iter->context, TRUE); - iter->source = next_source; -- if (iter->source && iter->may_modify) -- g_source_ref (iter->source); - - *source = iter->source; - return *source != NULL; diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch deleted file mode 100644 index cf97d9d..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 611430a32a46d0dc806a829161e2dccf9c0196a8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Mon, 3 Feb 2020 15:35:51 +0200 -Subject: [PATCH] GMainContext - Fix memory leaks and memory corruption when - freeing sources while freeing a context - -Instead of destroying sources directly while freeing the context, and -potentially freeing them if this was the last reference to them, collect -new references of all sources in a separate list before and at the same -time invalidate their context so that they can't access it anymore. Only -once all sources have their context invalidated, destroy them while -still keeping a reference to them. Once all sources are destroyed we get -rid of the additional references and free them if nothing else keeps a -reference to them anymore. - -This fixes a regression introduced by 26056558be in 2012. - -The previous code that invalidated the context of each source and then -destroyed it before going to the next source without keeping an -additional reference caused memory leaks or memory corruption depending -on the order of the sources in the sources lists. - -If a source was destroyed it might happen that this was the last -reference to this source, and it would then be freed. This would cause -the finalize function to be called, which might destroy and unref -another source and potentially free it. This other source would then -either -- go through the normal free logic and change the intern linked list - between the sources, while other sources that are unreffed as part of - the main context freeing would not. As such the list would be in an - inconsistent state and we might dereference freed memory. -- go through the normal destroy and free logic but because the context - pointer was already invalidated it would simply mark the source as - destroyed without actually removing it from the context. This would - then cause a memory leak because the reference owned by the context is - not freed. - -Fixes https://github.com/gtk-rs/glib/issues/583 while still keeping -https://bugzilla.gnome.org/show_bug.cgi?id=661767 fixes. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/aa20167d419c649f34fed06a9463890b41b1eba0] - ---- - glib/gmain.c | 35 ++++++++++++++++++++++++++++++++++- - 1 file changed, 34 insertions(+), 1 deletion(-) - -diff --git a/glib/gmain.c b/glib/gmain.c -index a9a287d..10ba2f8 100644 ---- a/glib/gmain.c -+++ b/glib/gmain.c -@@ -538,6 +538,7 @@ g_main_context_unref (GMainContext *context) - GSourceIter iter; - GSource *source; - GList *sl_iter; -+ GSList *s_iter, *remaining_sources = NULL; - GSourceList *list; - guint i; - -@@ -557,10 +558,30 @@ g_main_context_unref (GMainContext *context) - - /* g_source_iter_next() assumes the context is locked. */ - LOCK_CONTEXT (context); -- g_source_iter_init (&iter, context, TRUE); -+ -+ /* First collect all remaining sources from the sources lists and store a -+ * new reference in a separate list. Also set the context of the sources -+ * to NULL so that they can't access a partially destroyed context anymore. -+ * -+ * We have to do this first so that we have a strong reference to all -+ * sources and destroying them below does not also free them, and so that -+ * none of the sources can access the context from their finalize/dispose -+ * functions. */ -+ g_source_iter_init (&iter, context, FALSE); - while (g_source_iter_next (&iter, &source)) - { - source->context = NULL; -+ remaining_sources = g_slist_prepend (remaining_sources, g_source_ref (source)); -+ } -+ g_source_iter_clear (&iter); -+ -+ /* Next destroy all sources. As we still hold a reference to all of them, -+ * this won't cause any of them to be freed yet and especially prevents any -+ * source that unrefs another source from its finalize function to be freed. -+ */ -+ for (s_iter = remaining_sources; s_iter; s_iter = s_iter->next) -+ { -+ source = s_iter->data; - g_source_destroy_internal (source, context, TRUE); - } - UNLOCK_CONTEXT (context); -@@ -585,6 +606,18 @@ g_main_context_unref (GMainContext *context) - g_cond_clear (&context->cond); - - g_free (context); -+ -+ /* And now finally get rid of our references to the sources. This will cause -+ * them to be freed unless something else still has a reference to them. Due -+ * to setting the context pointers in the sources to NULL above, this won't -+ * ever access the context or the internal linked list inside the GSource. -+ * We already removed the sources completely from the context above. */ -+ for (s_iter = remaining_sources; s_iter; s_iter = s_iter->next) -+ { -+ source = s_iter->data; -+ g_source_unref_internal (source, NULL, FALSE); -+ } -+ g_slist_free (remaining_sources); - } - - /* Helper function used by mainloop/overflow test. diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch deleted file mode 100644 index 4c9e9f5..0000000 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3e9d85f1b75e2b1096d9643563d7d17380752fc7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Tue, 11 Feb 2020 09:34:38 +0200 -Subject: [PATCH] GMainContext - Move mutex unlocking in destructor right - before freeing the mutex - -This does not have any behaviour changes but is cleaner. The mutex is -only unlocked now after all operations on the context are done and right -before freeing the mutex and the context itself. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/730a75fc8e8271c38fbd5363d1f77a00876b9ddc] - ---- - glib/gmain.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gmain.c b/glib/gmain.c -index 10ba2f8..b1df470 100644 ---- a/glib/gmain.c -+++ b/glib/gmain.c -@@ -584,7 +584,6 @@ g_main_context_unref (GMainContext *context) - source = s_iter->data; - g_source_destroy_internal (source, context, TRUE); - } -- UNLOCK_CONTEXT (context); - - for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next) - { -@@ -595,6 +594,7 @@ g_main_context_unref (GMainContext *context) - - g_hash_table_destroy (context->sources); - -+ UNLOCK_CONTEXT (context); - g_mutex_clear (&context->mutex); - - g_ptr_array_free (context->pending_dispatches, TRUE); diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index 48899ce..f0017c7 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0061d66057dfd7e7267772df60b36474fb180eed Mon Sep 17 00:00:00 2001 +From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 9 Nov 2015 11:07:27 +0200 Subject: [PATCH] Enable more tests while cross-compiling @@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 382dfcc..c171717 100644 +index 788cf97..dab65d2 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -191,7 +191,7 @@ if host_machine.system() != 'windows' +@@ -204,7 +204,7 @@ if host_machine.system() != 'windows' # Test programs that need to bring up a session bus (requires dbus-daemon) have_dbus_daemon = find_program('dbus-daemon', required : false).found() @@ -27,8 +27,8 @@ index 382dfcc..c171717 100644 annotate_args = [ '--annotate', 'org.project.Bar', 'Key1', 'Value1', '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -465,12 +465,12 @@ if installed_tests_enabled - install_data('static-link.py', install_dir : installed_tests_execdir) +@@ -550,12 +550,12 @@ if installed_tests_enabled + endforeach endif -if not meson.is_cross_build() or meson.has_exe_wrapper() @@ -42,7 +42,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate-source', -@@ -494,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -579,7 +579,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_gresource = custom_target('test.gresource', input : 'test.gresource.xml', output : 'test.gresource', @@ -51,7 +51,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -505,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -590,7 +590,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_c = custom_target('test_resources2.c', input : 'test3.gresource.xml', output : 'test_resources2.c', @@ -60,7 +60,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -516,7 +516,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -601,7 +601,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_h = custom_target('test_resources2.h', input : 'test3.gresource.xml', output : 'test_resources2.h', @@ -69,7 +69,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -613,7 +613,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c', @@ -78,7 +78,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -539,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -624,7 +624,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_c = custom_target('digit_test_resources.c', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.c', @@ -87,7 +87,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -550,7 +550,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -635,7 +635,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_h = custom_target('digit_test_resources.h', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.h', @@ -96,11 +96,11 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - # LLVM once that support is in a stable release. - objcopy = find_program('objcopy', required : false) +@@ -670,11 +670,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() -- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() + ld = find_program('ld', required : false) + +- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() + if not meson.is_cross_build() test_gresource_binary = custom_target('test5.gresource', input : 'test5.gresource.xml', @@ -110,7 +110,7 @@ index 382dfcc..c171717 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -595,7 +595,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -686,7 +686,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources_binary_c = custom_target('test_resources_binary.c', input : 'test5.gresource.xml', output : 'test_resources_binary.c', diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux index 83596e0..adad7e6 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/meson.cross.d/common-linux @@ -2,4 +2,4 @@ have_proc_self_cmdline = true [binaries] -env = "/usr/bin/env" +env = '/usr/bin/env' diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch index fc320dc..72bee25 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 8c623acdbea3ecc2812bbaafcfc892758fa978da Mon Sep 17 00:00:00 2001 +From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -19,11 +19,11 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 1007abd..5380982 100644 +index c420260..a023745 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -44,6 +44,8 @@ - #include "gnetworkmonitor.h" +@@ -49,6 +49,8 @@ + #include "gmemorymonitordbus.h" #ifdef G_OS_WIN32 #include "gregistrysettingsbackend.h" +#else @@ -31,8 +31,8 @@ index 1007abd..5380982 100644 #endif #include -@@ -1158,7 +1160,15 @@ get_gio_module_dir (void) - #endif +@@ -1163,7 +1165,15 @@ get_gio_module_dir (void) + NULL); g_free (install_dir); #else - module_dir = g_strdup (GIO_MODULE_DIR); diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.62.4.bb b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.66.1.bb similarity index 83% rename from meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.62.4.bb rename to meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.66.1.bb index d496235..c803dbc 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.62.4.bb +++ b/meta-gnome/recipes-gnome/glib-2.0/glib-2.0_2.66.1.bb @@ -16,15 +16,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch \ - file://0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch \ - file://0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "d52234ecba128932bed90bbc3553bfe5" -SRC_URI[sha256sum] = "4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc" +SRC_URI[sha256sum] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/meta-gnome/recipes-gnome/glib-2.0/glib.inc b/meta-gnome/recipes-gnome/glib-2.0/glib.inc index 61bb319..a0055d8 100644 --- a/meta-gnome/recipes-gnome/glib-2.0/glib.inc +++ b/meta-gnome/recipes-gnome/glib-2.0/glib.inc @@ -28,7 +28,9 @@ PACKAGES += "${PN}-codegen ${PN}-utils" LEAD_SONAME = "libglib-2.0.*" -inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages +inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages + +DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" GTKDOC_MESON_OPTION = "gtk_doc" @@ -42,7 +44,7 @@ PACKAGECONFIG ??= "system-pcre libmount \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" # To use the system pcre it must be configured with --enable-unicode-properties PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre" -PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux" +PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" # libelf is auto-detected without a configuration option PACKAGECONFIG[libelf] = ",,elfutils" @@ -168,6 +170,8 @@ RDEPENDS_${PN}-ptest += "\ ${PN}-locale-th \ python3-core \ python3-modules \ + python3-dbusmock \ + ${PN}-codegen \ " RDEPENDS_${PN}-ptest_append_libc-glibc = "\ diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb similarity index 77% rename from meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb rename to meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb index 7a0137c..5b45c9a 100644 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb @@ -4,8 +4,8 @@ HOMEPAGE = "https://wiki.gnome.org/TingweiLan/GSoC2013Final" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "39b13fb2fc7752fa3b80616244dc4ef8" -SRC_URI[archive.sha256sum] = "5de9db0db028cd6cab7c2fec46ba90965474ecf9cd68cfd681a6488cf1fb240a" +SRC_URI[archive.md5sum] = "36ab263f477eeee3c95c9381766eb3c2" +SRC_URI[archive.sha256sum] = "0a34c377f8841abbf4c29bc848b301fbd8e4e20c03d7318c777c58432033657a" DEPENDS = "glib-2.0 gtk+3 glib-2.0-native gnome-common autoconf-archive libarchive" diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.31.91.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.38.0.bb similarity index 65% rename from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.31.91.bb rename to meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.38.0.bb index ff6a750..80c5f0e 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.31.91.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.38.0.bb @@ -3,8 +3,8 @@ SUMMARY = "Default GNOME desktop background images" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI[archive.md5sum] = "a13411df9de5255a3a702ec2dfaa5ca8" -SRC_URI[archive.sha256sum] = "21fc5879ec1a5f592d383d3f9b407a2d58274c25fc8277a9e1c4a10642118a95" +SRC_URI[archive.md5sum] = "822d5ca042f5143903bee7711ceaaa92" +SRC_URI[archive.sha256sum] = "f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3" FILES_${PN} += "\ ${datadir}/backgrounds/gnome \ diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb similarity index 79% rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb index 5888713..dc2e41d 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.3.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[archive.md5sum] = "e6c0e5fafa6a2673a3f102b1683c61d6" -SRC_URI[archive.sha256sum] = "ab8fa07613aa6b92be6151b1e2063cad5349bc1a8314eb091a0e62be2ea03e52" +SRC_URI[archive.md5sum] = "c82f7df6a411c897d4d59337d5d9a789" +SRC_URI[archive.sha256sum] = "0a068e3bddbbdab46991521e6624098579abe80da242398bdd579c4ca6926422" DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libcanberra libnotify libxml2-native gobject-introspection" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch deleted file mode 100644 index 7f82a15..0000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 21 May 2019 16:07:46 +0200 -Subject: [PATCH] Add meson option to pass sysroot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need to pass this to meson to help it finding gdesktop-enums.h: - -| panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller ---- - meson_options.txt | 1 + - panels/background/meson.build | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index a347168..2cd8121 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ -+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') - option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') - option('documentation', type: 'boolean', value: false, description: 'build documentation') - option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') -diff --git a/panels/background/meson.build b/panels/background/meson.build -index bb34b69..f22722e 100644 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -36,7 +36,7 @@ common_sources = [] - - enums = 'gdesktop-enums-types' - enums_header = files( -- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', -+ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', - 'cc-background-item.h' - ) - --- -2.20.1 - diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch index 202338d..9419f5a 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch @@ -1,6 +1,6 @@ -From 94a5f59e39861ae98e305cca96dc296f6e44e28a Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Mon, 6 Jul 2020 12:30:21 +0000 +From 960f785681afa6c5ca835159172a4d0783ae5707 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Tue, 27 Oct 2020 16:43:34 -0400 Subject: [PATCH] Add options for Citadel and disabling GOA/CUPS --- @@ -15,10 +15,10 @@ Subject: [PATCH] Add options for Citadel and disabling GOA/CUPS 8 files changed, 107 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build -index 79a8053..db2f328 100644 +index 48044cc..8493433 100644 --- a/meson.build +++ b/meson.build -@@ -115,6 +115,15 @@ if not libhandy_dep.found() +@@ -114,6 +114,15 @@ if not libhandy_dep.found() libhandy_dep = libhandy.get_variable('libhandy_dep') endif @@ -34,17 +34,17 @@ index 79a8053..db2f328 100644 goa_req_version = '>= 3.25.3' pulse_req_version = '>= 2.0' -@@ -125,7 +134,9 @@ gio_dep = dependency('gio-2.0') +@@ -124,7 +133,9 @@ gio_dep = dependency('gio-2.0') glib_dep = dependency('glib-2.0', version: '>= 2.56.0') gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90') +if enable_goa goa_dep = dependency('goa-1.0', version: goa_req_version) +endif - gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') + gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.37.1') libxml_dep = dependency('libxml-2.0') polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114') -@@ -150,6 +161,8 @@ common_deps = [ +@@ -149,6 +160,8 @@ common_deps = [ ] # Check for CUPS 1.4 or newer @@ -53,7 +53,7 @@ index 79a8053..db2f328 100644 cups_dep = dependency('cups', version : '>= 1.4', required: false) assert(cups_dep.found(), 'CUPS 1.4 or newer not found') -@@ -172,6 +185,7 @@ endforeach +@@ -171,6 +184,7 @@ endforeach config_h.set10('HAVE_CUPS_HTTPCONNECT2', cc.has_function('httpConnect2', dependencies: cups_dep), description: 'Define if httpConnect2() is available in CUPS') @@ -62,20 +62,20 @@ index 79a8053..db2f328 100644 # Optional dependency for the user accounts panel enable_cheese = get_option('cheese') diff --git a/meson_options.txt b/meson_options.txt -index e76308e..4bb77cd 100644 +index 1b7b548..8dd1b33 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -7,3 +7,8 @@ option('tests', type: 'boolean', value: true, description: 'build tests') - option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') +@@ -8,3 +8,8 @@ option('tracing', type: 'boolean', value: false, description: 'add extra debuggi option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') option('profile', type: 'combo', choices: ['default','development'], value: 'default') + option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support') +option('staging_dir', type: 'string', description: 'set staging directory for cross-compile') +option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts') +option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') +option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel') +option('citadel', type: 'boolean', value: true, description: 'build with Citadel support, which removes unneeded components') diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c -index faafd93..841fa66 100644 +index 3a3027b..a973b78 100644 --- a/panels/background/bg-pictures-source.c +++ b/panels/background/bg-pictures-source.c @@ -29,7 +29,9 @@ @@ -162,7 +162,7 @@ index faafd93..841fa66 100644 gboolean bg_pictures_source_add (BgPicturesSource *bg_source, -@@ -806,6 +817,7 @@ monitor_path (BgPicturesSource *self, +@@ -804,6 +815,7 @@ monitor_path (BgPicturesSource *self, return monitor; } @@ -170,7 +170,7 @@ index faafd93..841fa66 100644 static void media_found_cb (BgPicturesSource *self, GrlMedia *media) { -@@ -817,6 +829,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) +@@ -815,6 +827,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); add_single_file_from_media (self, file, media); } @@ -178,13 +178,13 @@ index faafd93..841fa66 100644 static void bg_pictures_source_init (BgPicturesSource *self) -@@ -839,9 +852,11 @@ bg_pictures_source_init (BgPicturesSource *self) +@@ -837,9 +850,11 @@ bg_pictures_source_init (BgPicturesSource *self) cache_path = bg_pictures_source_get_cache_path (); self->cache_dir_monitor = monitor_path (self, cache_path); +#ifdef WITH_GOA self->grl_miner = cc_background_grilo_miner_new (); - g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); + g_signal_connect_object (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self, G_CONNECT_SWAPPED); cc_background_grilo_miner_start (self->grl_miner); +#endif } @@ -297,7 +297,7 @@ index 2f4fdc5..82f54bd 100644 panels_libs = [] foreach cappletname: panels diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c -index 2578590..28251a9 100644 +index d425067..bb79e38 100644 --- a/shell/cc-panel-list.c +++ b/shell/cc-panel-list.c @@ -392,11 +392,16 @@ static const gchar * const panel_order[] = { diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.old b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.old deleted file mode 100644 index 35ef303..0000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.old +++ /dev/null @@ -1,323 +0,0 @@ -From a4a3e68f2f6412ea74c7607b28b54c17c15073e8 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Fri, 5 Apr 2019 07:36:45 -0400 -Subject: [PATCH] Make GOA, CUPS, and User Accounts optional - ---- - meson.build | 13 +++++++++++++ - meson_options.txt | 7 ++++++- - panels/background/bg-pictures-source.c | 20 ++++++++++++++++++++ - panels/background/meson.build | 15 +++++++++++---- - panels/meson.build | 15 ++++++++++++--- - shell/cc-panel-loader.c | 6 ++++++ - tests/meson.build | 2 +- - 7 files changed, 69 insertions(+), 9 deletions(-) - -diff --git a/meson.build b/meson.build -index e89ea52..d7926c9 100644 ---- a/meson.build -+++ b/meson.build -@@ -112,6 +112,13 @@ if not libhandy_dep.found() - libhandy_dep = libhandy.get_variable('libhandy_dep') - endif - -+enable_goa = get_option('online_accounts') -+enable_cups = get_option('cups') -+enable_user_accounts = get_option('user_accounts') -+config_h.set('WITH_GOA', enable_goa, description: 'Define to enable support for Gnome Online Accounts') -+config_h.set('WITH_CUPS', enable_goa, description: 'Define to enable support for CUPS') -+config_h.set('WITH_USER_ACCOUNTS', enable_user_accounts, description: 'Define to enable user accounts panel') -+ - goa_req_version = '>= 3.25.3' - pulse_req_version = '>= 2.0' - -@@ -122,7 +129,9 @@ gio_dep = dependency('gio-2.0') - glib_dep = dependency('glib-2.0', version: '>= 2.53.0') - gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') - gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90') -+if enable_goa - goa_dep = dependency('goa-1.0', version: goa_req_version) -+endif - gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') - libxml_dep = dependency('libxml-2.0') - polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103') -@@ -144,6 +153,8 @@ common_deps = [ - dependency('gtk+-3.0', version: '>= 3.22.20') - ] - -+if enable_cups -+ - # Check for CUPS 1.4 or newer - cups_dep = dependency('cups', version : '>= 1.4', required: false) - assert(cups_dep.found(), 'CUPS 1.4 or newer not found') -@@ -164,6 +175,8 @@ foreach header: check_headers - assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1]) - endforeach - -+endif -+ - # Optional dependency for the user accounts panel - enable_cheese = get_option('cheese') - if enable_cheese -diff --git a/meson_options.txt b/meson_options.txt -index a347168..e0c3b23 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,4 +3,9 @@ option('documentation', type: 'boolean', value: false, description: 'build docum - option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') - option('ibus', type: 'boolean', value: true, description: 'build with IBus support') - option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') --option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') -\ No newline at end of file -+option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') -+ -+option('staging_dir', type: 'string', description: 'set staging directory for cross-compile') -+option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts') -+option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') -+option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel') -diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c -index 714c7f7..59723e1 100644 ---- a/panels/background/bg-pictures-source.c -+++ b/panels/background/bg-pictures-source.c -@@ -23,13 +23,17 @@ - - #include "bg-pictures-source.h" - -+#ifdef WITH_GOA - #include "cc-background-grilo-miner.h" -+#endif - #include "cc-background-item.h" - - #include - #include - #include -+#ifdef WITH_GOA - #include -+#endif - #include - #include - -@@ -43,7 +47,9 @@ struct _BgPicturesSource - - GCancellable *cancellable; - -+#ifdef WITH_GOA - CcBackgroundGriloMiner *grl_miner; -+#endif - - GnomeDesktopThumbnailFactory *thumb_factory; - -@@ -85,7 +91,9 @@ bg_pictures_source_dispose (GObject *object) - g_clear_object (&source->cancellable); - } - -+#ifdef WITH_GOA - g_clear_object (&source->grl_miner); -+#endif - g_clear_object (&source->thumb_factory); - - G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); -@@ -461,7 +469,9 @@ add_single_file (BgPicturesSource *bg_source, - const gchar *pictures_path; - g_autoptr(GFile) pictures_dir = NULL; - g_autoptr(GFile) cache_dir = NULL; -+#ifdef WITH_GOA - GrlMedia *media; -+#endif - - /* find png and jpeg files */ - if (!content_type) -@@ -520,13 +530,16 @@ add_single_file (BgPicturesSource *bg_source, - - read_file: - -+#ifdef WITH_GOA - media = g_object_get_data (G_OBJECT (file), "grl-media"); - if (media == NULL) - { -+#endif - g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); - g_file_read_async (file, G_PRIORITY_DEFAULT, - bg_source->cancellable, - picture_opened_for_read, bg_source); -+#ifdef WITH_GOA - } - else - { -@@ -564,6 +577,7 @@ add_single_file (BgPicturesSource *bg_source, - picture_copied_for_read, - bg_source); - } -+#endif - - retval = TRUE; - -@@ -594,6 +608,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, - return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); - } - -+#ifdef WITH_GOA - static gboolean - add_single_file_from_media (BgPicturesSource *bg_source, - GFile *file, -@@ -618,6 +633,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, - - return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); - } -+#endif - - gboolean - bg_pictures_source_add (BgPicturesSource *bg_source, -@@ -934,6 +950,7 @@ monitor_path (BgPicturesSource *self, - return monitor; - } - -+#ifdef WITH_GOA - static void - media_found_cb (BgPicturesSource *self, GrlMedia *media) - { -@@ -945,6 +962,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) - g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); - add_single_file_from_media (self, file, media); - } -+#endif - - static void - bg_pictures_source_init (BgPicturesSource *self) -@@ -968,9 +986,11 @@ bg_pictures_source_init (BgPicturesSource *self) - cache_path = bg_pictures_source_get_cache_path (); - self->cache_dir_monitor = monitor_path (self, cache_path); - -+#ifdef WITH_GOA - self->grl_miner = cc_background_grilo_miner_new (); - g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); - cc_background_grilo_miner_start (self->grl_miner); -+#endif - - self->thumb_factory = - gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); -diff --git a/panels/background/meson.build b/panels/background/meson.build -index bb34b69..0db3dae 100644 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -34,9 +34,11 @@ install_data( - - common_sources = [] - -+staging = get_option('staging_dir') -+ - enums = 'gdesktop-enums-types' - enums_header = files( -- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', -+ staging + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', - 'cc-background-item.h' - ) - -@@ -75,20 +77,25 @@ sources = common_sources + files( - 'bg-source.c', - 'bg-wallpapers-source.c', - 'cc-background-chooser-dialog.c', -- 'cc-background-grilo-miner.c', - 'cc-background-item.c', - 'cc-background-xml.c' - ) - -+if enable_goa -+sources += files('cc-background-grilo-miner.c') -+endif -+ - deps = common_deps + [ - gdk_pixbuf_dep, - gnome_desktop_dep, -- goa_dep, - libxml_dep, - dependency('cairo-gobject'), -- dependency('grilo-0.3', version: '>= 0.3.0') - ] - -+if enable_goa -+deps += [ goa_dep, dependency('grilo-0.3', version: '>= 0.3.0') ] -+endif -+ - cflags += [ - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir), - '-DDATADIR="@0@"'.format(control_center_datadir), -diff --git a/panels/meson.build b/panels/meson.build -index 95a44bb..0f927bd 100644 ---- a/panels/meson.build -+++ b/panels/meson.build -@@ -10,16 +10,13 @@ panels = [ - 'keyboard', - 'mouse', - 'notifications', -- 'online-accounts', - 'power', -- 'printers', - 'privacy', - 'region', - 'search', - 'sharing', - 'sound', - 'universal-access', -- 'user-accounts' - ] - - if host_is_linux -@@ -34,6 +31,18 @@ if host_is_linux_not_s390 - ] - endif - -+if enable_goa -+ panels += ['online-accounts'] -+endif -+ -+if enable_cups -+ panels += ['printers'] -+endif -+ -+if enable_user_accounts -+ panels += ['user-accounts'] -+endif -+ - panels_list = [] - panels_libs = [] - foreach cappletname: panels -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 5eeb44e..93d18f0 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -102,9 +102,13 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL), -+#ifdef WITH_GOA - PANEL_TYPE("online-accounts", cc_goa_panel_get_type, NULL), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type, NULL), -+#ifdef WITH_CUPS - PANEL_TYPE("printers", cc_printers_panel_get_type, NULL), -+#endif - PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL), - PANEL_TYPE("region", cc_region_panel_get_type, NULL), - PANEL_TYPE("search", cc_search_panel_get_type, NULL), -@@ -114,7 +118,9 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL), - #endif - PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL), -+#ifdef WITH_USER_ACCOUNTS - PANEL_TYPE("user-accounts", cc_user_panel_get_type, NULL), -+#endif - #ifdef BUILD_WACOM - PANEL_TYPE("wacom", cc_wacom_panel_get_type, cc_wacom_panel_static_init_func), - #endif -diff --git a/tests/meson.build b/tests/meson.build -index 4594327..cd52250 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -6,5 +6,5 @@ endif - - subdir('interactive-panels') - --subdir('printers') -+#subdir('printers') - subdir('info') diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-unneeded-panels-make-GOA-CUPS-optional.orig b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-unneeded-panels-make-GOA-CUPS-optional.orig deleted file mode 100644 index c3f9ffc..0000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-unneeded-panels-make-GOA-CUPS-optional.orig +++ /dev/null @@ -1,502 +0,0 @@ -From a5c21a082006e940cf8802123439292beb967f83 Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Thu, 2 Jul 2020 15:18:05 +0000 -Subject: [PATCH] Remove unneeded panels, make GOA/CUPS optional - ---- - meson.build | 52 +++++++++++++++----------- - meson_options.txt | 5 +++ - panels/background/bg-pictures-source.c | 30 ++++++++++----- - panels/background/meson.build | 14 +++++-- - panels/meson.build | 23 ++++++++---- - shell/cc-panel-list.c | 15 +++++++- - shell/cc-panel-loader.c | 28 ++++++++++++++ - tests/meson.build | 1 - - 8 files changed, 124 insertions(+), 44 deletions(-) - -diff --git a/meson.build b/meson.build -index 6534dba..2db99bb 100644 ---- a/meson.build -+++ b/meson.build -@@ -115,6 +115,15 @@ if not libhandy_dep.found() - libhandy_dep = libhandy.get_variable('libhandy_dep') - endif - -+enable_goa = get_option('online_accounts') -+enable_cups = get_option('cups') -+enable_user_accounts = get_option('user_accounts') -+enable_citadel = get_option('citadel') -+config_h.set('WITH_GOA', enable_goa, description: 'Define to enable support for Gnome Online Accounts') -+config_h.set('WITH_CUPS', enable_goa, description: 'Define to enable support for CUPS') -+config_h.set('WITH_USER_ACCOUNTS', enable_user_accounts, description: 'Define to enable user accounts panel') -+config_h.set('CITADEL', enable_citadel, description: 'Define to enable the removal of components unneeded in Citadel') -+ - goa_req_version = '>= 3.25.3' - pulse_req_version = '>= 2.0' - -@@ -125,7 +134,9 @@ gio_dep = dependency('gio-2.0') - glib_dep = dependency('glib-2.0', version: '>= 2.56.0') - gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90') - gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90') --goa_dep = dependency('goa-1.0', version: goa_req_version) -+if enable_goa -+ goa_dep = dependency('goa-1.0', version: goa_req_version) -+endif - gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0') - libxml_dep = dependency('libxml-2.0') - polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114') -@@ -149,29 +160,28 @@ common_deps = [ - dependency('gtk+-3.0', version: '>= 3.22.20') - ] - --# Check for CUPS 1.4 or newer --cups_dep = dependency('cups', version : '>= 1.4', required: false) --assert(cups_dep.found(), 'CUPS 1.4 or newer not found') -- -+if enable_cups -+ # Check for CUPS 1.4 or newer -+ cups_dep = dependency('cups', version : '>= 1.4', required: false) -+ assert(cups_dep.found(), 'CUPS 1.4 or newer not found') - # https://bugzilla.gnome.org/show_bug.cgi?id=696766 --cups_cflags = [] --if cups_dep.version().version_compare('>= 1.6') -- cups_cflags += '-D_PPD_DEPRECATED=' --endif -- --# cups headers --check_headers = [ -- ['HAVE_CUPS_CUPS_H', 'cups/cups.h'], -- ['HAVE_CUPS_PPD_H', 'cups/ppd.h'] --] -- --foreach header: check_headers -- assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1]) --endforeach -- --config_h.set10('HAVE_CUPS_HTTPCONNECT2', -+ cups_cflags = [] -+ if cups_dep.version().version_compare('>= 1.6') -+ cups_cflags += '-D_PPD_DEPRECATED=' -+ endif -+ -+ # cups headers -+ check_headers = [ -+ ['HAVE_CUPS_CUPS_H', 'cups/cups.h'], -+ ['HAVE_CUPS_PPD_H', 'cups/ppd.h'] -+ ] -+ foreach header: check_headers -+ assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1]) -+ endforeach -+ config_h.set10('HAVE_CUPS_HTTPCONNECT2', - cc.has_function('httpConnect2', dependencies: cups_dep), - description: 'Define if httpConnect2() is available in CUPS') -+endif - - # Optional dependency for the user accounts panel - enable_cheese = get_option('cheese') -diff --git a/meson_options.txt b/meson_options.txt -index 0df930c..ccb45c5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -8,3 +8,8 @@ option('tests', type: 'boolean', value: true, description: 'build tests') - option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') - option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') - option('profile', type: 'combo', choices: ['default','development'], value: 'default') -+option('staging_dir', type: 'string', description: 'set staging directory for cross-compile') -+option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts') -+option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') -+option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel') -+option('citadel', type: 'boolean', value: true, description: 'build with Citadel support, which removes unneeded components') -diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c -index faafd93..3df8277 100644 ---- a/panels/background/bg-pictures-source.c -+++ b/panels/background/bg-pictures-source.c -@@ -23,13 +23,17 @@ - - #include "bg-pictures-source.h" - -+#ifdef WITH_GOA - #include "cc-background-grilo-miner.h" -+#endif - #include "cc-background-item.h" - - #include - #include - #include -+#ifdef WITH_GOA - #include -+#endif - #include - #include - -@@ -43,8 +47,9 @@ struct _BgPicturesSource - - GCancellable *cancellable; - -+#ifdef WITH_GOA - CcBackgroundGriloMiner *grl_miner; -- -+#endif - GFileMonitor *picture_dir_monitor; - GFileMonitor *cache_dir_monitor; - -@@ -82,9 +87,9 @@ bg_pictures_source_dispose (GObject *object) - g_cancellable_cancel (source->cancellable); - g_clear_object (&source->cancellable); - } -- -+#ifdef WITH_GOA - g_clear_object (&source->grl_miner); -- -+#endif - G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); - } - -@@ -392,7 +397,9 @@ add_single_file (BgPicturesSource *bg_source, - const gchar *pictures_path; - g_autoptr(GFile) pictures_dir = NULL; - g_autoptr(GFile) cache_dir = NULL; -+#ifdef WITH_GOA - GrlMedia *media; -+#endif - - /* find png and jpeg files */ - if (!content_type) -@@ -431,14 +438,16 @@ add_single_file (BgPicturesSource *bg_source, - "needs-download", needs_download, - "source-url", source_uri, - NULL); -- -+#ifdef WITH_GOA - media = g_object_get_data (G_OBJECT (file), "grl-media"); - if (media == NULL) - { -+#endif - g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); - g_file_read_async (file, G_PRIORITY_DEFAULT, - bg_source->cancellable, - picture_opened_for_read, bg_source); -+#ifdef WITH_GOA - } - else - { -@@ -477,8 +486,8 @@ add_single_file (BgPicturesSource *bg_source, - bg_source); - } - -+#endif - retval = TRUE; -- - out: - return retval; - } -@@ -495,7 +504,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, - mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED); - return add_single_file (bg_source, file, content_type, mtime); - } -- -+#ifdef WITH_GOA - static gboolean - add_single_file_from_media (BgPicturesSource *bg_source, - GFile *file, -@@ -520,7 +529,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, - - return add_single_file (bg_source, file, content_type, (guint64) mtime_unix); - } -- -+#endif - gboolean - bg_pictures_source_add (BgPicturesSource *bg_source, - const char *uri, -@@ -805,7 +814,7 @@ monitor_path (BgPicturesSource *self, - - return monitor; - } -- -+#ifdef WITH_GOA - static void - media_found_cb (BgPicturesSource *self, GrlMedia *media) - { -@@ -817,7 +826,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) - g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); - add_single_file_from_media (self, file, media); - } -- -+#endif - static void - bg_pictures_source_init (BgPicturesSource *self) - { -@@ -838,10 +847,11 @@ bg_pictures_source_init (BgPicturesSource *self) - - cache_path = bg_pictures_source_get_cache_path (); - self->cache_dir_monitor = monitor_path (self, cache_path); -- -+#ifdef WITH_GOA - self->grl_miner = cc_background_grilo_miner_new (); - g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); - cc_background_grilo_miner_start (self->grl_miner); -+#endif - } - - BgPicturesSource * -diff --git a/panels/background/meson.build b/panels/background/meson.build -index 5a2efc0..6d4a394 100644 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -34,9 +34,11 @@ install_data( - - common_sources = [] - -+staging = get_option('staging_dir') -+ - enums = 'gdesktop-enums-types' - enums_header = files( -- get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', -+ staging + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', - 'cc-background-item.h' - ) - -@@ -81,22 +83,26 @@ sources = common_sources + files( - 'bg-source.c', - 'bg-wallpapers-source.c', - 'cc-background-chooser.c', -- 'cc-background-grilo-miner.c', - 'cc-background-item.c', - 'cc-background-panel.c', - 'cc-background-preview.c', - 'cc-background-xml.c', - ) - -+if enable_goa -+ sources += files('cc-background-grilo-miner.c') -+endif -+ - deps = common_deps + [ - gdk_pixbuf_dep, - gnome_desktop_dep, -- goa_dep, - libxml_dep, - dependency('cairo-gobject'), -- dependency('grilo-0.3', version: '>= 0.3.0') - ] - -+if enable_goa -+ sources += files('cc-background-grilo-miner.c') -+endif - cflags += [ - '-DDATADIR="@0@"'.format(control_center_datadir), - '-DGNOME_DESKTOP_USE_UNSTABLE_API' -diff --git a/panels/meson.build b/panels/meson.build -index 2f4fdc5..48bffdf 100644 ---- a/panels/meson.build -+++ b/panels/meson.build -@@ -1,12 +1,10 @@ - subdir('common') - - panels = [ -- 'applications', - 'background', - 'camera', - 'color', - 'datetime', -- 'default-apps', - 'diagnostics', - 'display', - 'info-overview', -@@ -16,19 +14,30 @@ panels = [ - 'microphone', - 'mouse', - 'notifications', -- 'online-accounts', - 'power', -- 'printers', - 'region', -- 'removable-media', - 'search', -- 'sharing', - 'sound', - 'universal-access', - 'usage', -- 'user-accounts' - ] - -+if enable_goa -+ panels += ['online-accounts'] -+endif -+ -+if enable_cups -+ panels += ['printers'] -+endif -+ -+if enable_user_accounts -+ panels += ['user-accounts'] -+endif -+ -+if not enable_citadel -+ panel_names += ['applications', 'default-apps', 'removable-media', 'sharing'] -+endif -+ - if host_is_linux - panels += ['network'] - endif -diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c -index 2578590..28251a9 100644 ---- a/shell/cc-panel-list.c -+++ b/shell/cc-panel-list.c -@@ -392,11 +392,16 @@ static const gchar * const panel_order[] = { - "background", - "notifications", - "search", -+#ifndef CITADEL - "applications", -+#endif - "privacy", -+#ifndef WITH_GOA - "online-accounts", -+#endif -+#ifndef CITADEL - "sharing", -- -+#endif - /* Privacy page */ - "location", - "camera", -@@ -412,16 +417,24 @@ static const gchar * const panel_order[] = { - "display", - "mouse", - "keyboard", -+#ifndef WITH_CUPS - "printers", -+#endif -+#ifndef CITADEL - "removable-media", -+#endif - "wacom", - "color", - - /* Details page */ - "region", - "universal-access", -+#ifndef WITH_USER_ACCOUNTS - "user-accounts", -+#endif -+#ifndef CITADEL - "default-apps", -+#endif - "reset-settings", - "datetime", - "info-overview", -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index f203843..652afe3 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -31,14 +31,18 @@ - #ifndef CC_PANEL_LOADER_NO_GTYPES - - /* Extension points */ -+#ifndef CITADEL - extern GType cc_applications_panel_get_type (void); -+#endif - extern GType cc_background_panel_get_type (void); - #ifdef BUILD_BLUETOOTH - extern GType cc_bluetooth_panel_get_type (void); - #endif /* BUILD_BLUETOOTH */ - extern GType cc_color_panel_get_type (void); - extern GType cc_date_time_panel_get_type (void); -+#ifndef CITADEL - extern GType cc_default_apps_panel_get_type (void); -+#endif - extern GType cc_display_panel_get_type (void); - extern GType cc_info_overview_panel_get_type (void); - extern GType cc_keyboard_panel_get_type (void); -@@ -48,19 +52,29 @@ extern GType cc_network_panel_get_type (void); - extern GType cc_wifi_panel_get_type (void); - #endif /* BUILD_NETWORK */ - extern GType cc_notifications_panel_get_type (void); -+#ifdef WITH_GOA - extern GType cc_goa_panel_get_type (void); -+#endif - extern GType cc_power_panel_get_type (void); -+#ifdef WITH_CUPS - extern GType cc_printers_panel_get_type (void); -+#endif - extern GType cc_region_panel_get_type (void); -+#ifndef CITADEL - extern GType cc_removable_media_panel_get_type (void); -+#endif - extern GType cc_search_panel_get_type (void); -+#ifndef CITADEL - extern GType cc_sharing_panel_get_type (void); -+#endif - extern GType cc_sound_panel_get_type (void); - #ifdef BUILD_THUNDERBOLT - extern GType cc_bolt_panel_get_type (void); - #endif /* BUILD_THUNDERBOLT */ - extern GType cc_ua_panel_get_type (void); -+#ifdef WITH_USER_ACCOUNTS - extern GType cc_user_panel_get_type (void); -+#endif - #ifdef BUILD_WACOM - extern GType cc_wacom_panel_get_type (void); - #endif /* BUILD_WACOM */ -@@ -90,7 +104,9 @@ extern void cc_wacom_panel_static_init_func (void); - - static CcPanelLoaderVtable default_panels[] = - { -+#ifndef CITADEL - PANEL_TYPE("applications", cc_applications_panel_get_type, NULL), -+#endif - PANEL_TYPE("background", cc_background_panel_get_type, NULL), - #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL), -@@ -98,7 +114,9 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), - PANEL_TYPE("color", cc_color_panel_get_type, NULL), - PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), -+#ifndef CITADEL - PANEL_TYPE("default-apps", cc_default_apps_panel_get_type, NULL), -+#endif - PANEL_TYPE("diagnostics", cc_diagnostics_panel_get_type, cc_diagnostics_panel_static_init_func), - PANEL_TYPE("display", cc_display_panel_get_type, NULL), - PANEL_TYPE("info-overview", cc_info_overview_panel_get_type, NULL), -@@ -112,20 +130,30 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL), -+#ifdef WITH_GOA - PANEL_TYPE("online-accounts", cc_goa_panel_get_type, NULL), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type, NULL), -+#ifdef WITH_CUPS - PANEL_TYPE("printers", cc_printers_panel_get_type, NULL), -+#endif - PANEL_TYPE("region", cc_region_panel_get_type, NULL), -+#ifndef CITADEL - PANEL_TYPE("removable-media", cc_removable_media_panel_get_type, NULL), -+#endif - PANEL_TYPE("search", cc_search_panel_get_type, NULL), -+#ifndef CITADEL - PANEL_TYPE("sharing", cc_sharing_panel_get_type, NULL), -+#endif - PANEL_TYPE("sound", cc_sound_panel_get_type, NULL), - #ifdef BUILD_THUNDERBOLT - PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL), - #endif - PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL), - PANEL_TYPE("usage", cc_usage_panel_get_type, NULL), -+#ifdef WITH_USER_ACCOUNTS - PANEL_TYPE("user-accounts", cc_user_panel_get_type, NULL), -+#endif - #ifdef BUILD_WACOM - PANEL_TYPE("wacom", cc_wacom_panel_get_type, cc_wacom_panel_static_init_func), - #endif -diff --git a/tests/meson.build b/tests/meson.build -index d4fe361..01f7c92 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -6,5 +6,4 @@ endif - - subdir('interactive-panels') - --subdir('printers') - subdir('info') diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-unneeded-panels.old b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-unneeded-panels.old deleted file mode 100644 index 251c1dc..0000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-unneeded-panels.old +++ /dev/null @@ -1,242 +0,0 @@ -From 6e45a21ff2f60e81b5e69e70fed9a29fb0fdaa06 Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Mon, 6 May 2019 17:44:59 +0000 -Subject: [PATCH] Remove unneeded panels - ---- - meson.build | 2 ++ - meson_options.txt | 1 + - panels/info/meson.build | 26 +++++++++++++++++++------- - panels/meson.build | 6 ++++-- - shell/cc-panel-list.c | 6 ++++++ - shell/cc-panel-loader.c | 12 ++++++++++++ - tests/meson.build | 8 ++++---- - 7 files changed, 48 insertions(+), 13 deletions(-) - -diff --git a/meson.build b/meson.build -index d7926c9..63cf927 100644 ---- a/meson.build -+++ b/meson.build -@@ -115,9 +115,11 @@ endif - enable_goa = get_option('online_accounts') - enable_cups = get_option('cups') - enable_user_accounts = get_option('user_accounts') -+enable_citadel = get_option('citadel') - config_h.set('WITH_GOA', enable_goa, description: 'Define to enable support for Gnome Online Accounts') - config_h.set('WITH_CUPS', enable_goa, description: 'Define to enable support for CUPS') - config_h.set('WITH_USER_ACCOUNTS', enable_user_accounts, description: 'Define to enable user accounts panel') -+config_h.set('CITADEL', enable_citadel, description: 'Define to enable the removal of components unneeded in Citadel') - - goa_req_version = '>= 3.25.3' - pulse_req_version = '>= 2.0' -diff --git a/meson_options.txt b/meson_options.txt -index e0c3b23..0b969a1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -9,3 +9,4 @@ option('staging_dir', type: 'string', description: 'set staging directory for cr - option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts') - option('cups', type: 'boolean', value: false, description: 'build with support for CUPS') - option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel') -+option('citadel', type: 'boolean', value: true, description: 'build with Citadel support, which removes unneeded components') -diff --git a/panels/info/meson.build b/panels/info/meson.build -index c54e5fd..a3f3aa9 100644 ---- a/panels/info/meson.build -+++ b/panels/info/meson.build -@@ -1,9 +1,11 @@ - panel_names = [ -- 'default-apps', - 'info-overview', -- 'removable-media' - ] - -+if not enable_citadel -+ panel_names += ['default-apps', 'removable-media'] -+endif -+ - panels_list += panel_names - - foreach name: panel_names -@@ -38,19 +40,29 @@ gsd_headers = ['gsd-disk-space-helper.h'] - gsd_sources = ['gsd-disk-space-helper.c'] - - sources = files(gsd_sources) + files( -- 'cc-info-default-apps-panel.c', - 'cc-info-overview-panel.c', -- 'cc-info-removable-media-panel.c', - 'info-cleanup.c' - ) - -+if not enable_citadel -+ sources += files( -+ 'cc-info-default-apps-panel.c', -+ 'cc-info-removable-media-panel.c' -+ ) -+endif -+ - resource_data = files( - 'GnomeLogoVerticalMedium.svg', -- 'cc-info-default-apps-panel.ui', -- 'cc-info-overview-panel.ui', -- 'cc-info-removable-media-panel.ui' -+ 'cc-info-overview-panel.ui' - ) - -+if not enable_citadel -+ resource_data += files( -+ 'cc-info-default-apps-panel.ui', -+ 'cc-info-removable-media-panel.ui' -+ ) -+endif -+ - sources += gnome.compile_resources( - 'cc-' + cappletname + '-resources', - cappletname + '.gresource.xml', -diff --git a/panels/meson.build b/panels/meson.build -index 0f927bd..8d2ef07 100644 ---- a/panels/meson.build -+++ b/panels/meson.build -@@ -1,7 +1,6 @@ - subdir('common') - - panels = [ -- 'applications', - 'background', - 'color', - 'datetime', -@@ -14,7 +13,6 @@ panels = [ - 'privacy', - 'region', - 'search', -- 'sharing', - 'sound', - 'universal-access', - ] -@@ -43,6 +41,10 @@ if enable_user_accounts - panels += ['user-accounts'] - endif - -+if not enable_citadel -+ panels += ['applications', 'sharing'] -+endif -+ - panels_list = [] - panels_libs = [] - foreach cappletname: panels -diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c -index 5bdc4c8..6ca22b8 100644 ---- a/shell/cc-panel-list.c -+++ b/shell/cc-panel-list.c -@@ -386,8 +386,10 @@ static const gchar * const panel_order[] = { - "universal-access", - "online-accounts", - "privacy", -+#ifndef CITADEL - "applications", - "sharing", -+#endif - "sound", - "power", - "network", -@@ -397,7 +399,9 @@ static const gchar * const panel_order[] = { - "keyboard", - "mouse", - "printers", -+#ifndef CITADEL - "removable-media", -+#endif - "thunderbolt", - "wacom", - "color", -@@ -406,7 +410,9 @@ static const gchar * const panel_order[] = { - "info-overview", - "datetime", - "user-accounts", -+#ifndef CITADEL - "default-apps", -+#endif - "reset-settings" - }; - -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 93d18f0..c992e40 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -31,7 +31,9 @@ - #ifndef CC_PANEL_LOADER_NO_GTYPES - - /* Extension points */ -+#ifndef CITADEL - extern GType cc_applications_panel_get_type (void); -+#endif - extern GType cc_background_panel_get_type (void); - #ifdef BUILD_BLUETOOTH - extern GType cc_bluetooth_panel_get_type (void); -@@ -40,8 +42,10 @@ extern GType cc_color_panel_get_type (void); - extern GType cc_date_time_panel_get_type (void); - extern GType cc_display_panel_get_type (void); - extern GType cc_info_overview_panel_get_type (void); -+#ifndef CITADEL - extern GType cc_info_default_apps_panel_get_type (void); - extern GType cc_info_removable_media_panel_get_type (void); -+#endif - extern GType cc_keyboard_panel_get_type (void); - extern GType cc_mouse_panel_get_type (void); - #ifdef BUILD_NETWORK -@@ -55,7 +59,9 @@ extern GType cc_printers_panel_get_type (void); - extern GType cc_privacy_panel_get_type (void); - extern GType cc_region_panel_get_type (void); - extern GType cc_search_panel_get_type (void); -+#ifndef CITADEL - extern GType cc_sharing_panel_get_type (void); -+#endif - extern GType cc_sound_panel_get_type (void); - #ifdef BUILD_THUNDERBOLT - extern GType cc_bolt_panel_get_type (void); -@@ -84,7 +90,9 @@ extern void cc_wacom_panel_static_init_func (void); - - static CcPanelLoaderVtable default_panels[] = - { -+#ifndef CITADEL - PANEL_TYPE("applications", cc_applications_panel_get_type, NULL), -+#endif - PANEL_TYPE("background", cc_background_panel_get_type, NULL), - #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL), -@@ -93,8 +101,10 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), - PANEL_TYPE("display", cc_display_panel_get_type, NULL), - PANEL_TYPE("info-overview", cc_info_overview_panel_get_type, NULL), -+#ifndef CITADEL - PANEL_TYPE("default-apps", cc_info_default_apps_panel_get_type, NULL), - PANEL_TYPE("removable-media", cc_info_removable_media_panel_get_type, NULL), -+#endif - PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL), - PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL), - #ifdef BUILD_NETWORK -@@ -112,7 +122,9 @@ static CcPanelLoaderVtable default_panels[] = - PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL), - PANEL_TYPE("region", cc_region_panel_get_type, NULL), - PANEL_TYPE("search", cc_search_panel_get_type, NULL), -+#ifndef CITADEL - PANEL_TYPE("sharing", cc_sharing_panel_get_type, NULL), -+#endif - PANEL_TYPE("sound", cc_sound_panel_get_type, NULL), - #ifdef BUILD_THUNDERBOLT - PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL), -diff --git a/tests/meson.build b/tests/meson.build -index cd52250..d0335b1 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,8 +1,8 @@ - subdir('common') --subdir('datetime') --if host_is_linux -- subdir('network') --endif -+#subdir('datetime') -+#if host_is_linux -+# subdir('network') -+#endif - - subdir('interactive-panels') - diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb deleted file mode 100644 index a30afbe..0000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "GNOME Settings" -DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion distro_features_check - -DEPENDS = " \ - gdk-pixbuf-native \ - colord-gtk \ - udisks2 \ - upower \ - polkit \ - pulseaudio \ - accountsservice \ - gsettings-desktop-schemas \ - gnome-settings-daemon \ - gnome-desktop \ - networkmanager \ - network-manager-applet \ - gnome-bluetooth \ - libgtop \ - libgudev \ - gsound \ - libpwquality \ - ibus \ -" - -REQUIRED_DISTRO_FEATURES += " pulseaudio systemd x11" -SRC_URI += " file://0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch" - -SRC_URI[archive.md5sum] = "16c228d7de4e9d2d57550791fbca3390" -SRC_URI[archive.sha256sum] = "ac02346bcf3391aa5c86ed857d76689fdb6e43c2b4b20d3ec6eab0ea9fecf754" - -#SRC_URI += " file://0001-Remove-unneeded-panels-make-GOA-CUPS-optional.patch" - -# -# Extra options have been added to meson_options.txt to make some components of the control -# center optional. One reason is that these components drag in heavy dependencies, and some -# of these dependencies have not been packaged and tested yet. -# -# Gnome Online Accounts support -# -# EXTRA_OEMESON += "-Donline_accounts=true" -# DEPENDS += "grilo gnome-online-accounts webkitgtk rest" -# -# Printer Panel -# -# EXTRA_OEMESON += "-Dcups=true" -# DEPENDS += "cups samba" (only smbclient needed from samba) -# -# User Accounts Panel -# -# EXTRA_OEMESON += "-Duser_accounts=true" -# DEPENDS += "accountsservice krb5" -# Citadel -# -# This option disables some things in gnome-control-center such as certain -# panels that are not used in Citadel, defaults to true in meson_options. -# To re-enable these things, set the option to false: -# -# EXTRA_OEMESON += "-Dcitadel=false" -#SRC_URI += " file://0001-Make-GOA-CUPS-and-User-Accounts-optional.patch \ -# file://0001-Remove-unneeded-panels.patch" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-shell \ - ${datadir}/metainfo \ -" - -FILES_${PN}-dev += "${datadir}/gettext" - -RDEPENDS_${PN} += "gsettings-desktop-schemas" -EXTRA_OEMESON = "--buildtype=release -Dcheese=false -Ddocumentation=false -Dstaging_dir=${STAGING_DIR_TARGET}" - diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.38.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.38.1.bb new file mode 100644 index 0000000..98aa249 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.38.1.bb @@ -0,0 +1,80 @@ +SUMMARY = "GNOME Settings" +DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check + +DEPENDS = " \ + gdk-pixbuf-native \ + colord-gtk \ + udisks2 \ + upower \ + polkit \ + pulseaudio \ + accountsservice \ + gsettings-desktop-schemas \ + gnome-settings-daemon \ + gnome-desktop \ + modemmanager \ + networkmanager \ + network-manager-applet \ + gnome-bluetooth \ + libgtop \ + libgudev \ + gsound \ + libpwquality \ + ibus \ + libhandy \ +" + +REQUIRED_DISTRO_FEATURES += " pulseaudio systemd x11" + +SRC_URI[archive.md5sum] = "19ab78acfb6142974921bd8b5bf66937" +SRC_URI[archive.sha256sum] = "8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026" + + +# +# Extra options have been added to meson_options.txt to make some components of the control +# center optional. One reason is that these components drag in heavy dependencies, and some +# of these dependencies have not been packaged and tested yet. +# +# Gnome Online Accounts support +# +# EXTRA_OEMESON += "-Donline_accounts=true" +# DEPENDS += "grilo gnome-online-accounts webkitgtk rest" +# +# Printer Panel +# +# EXTRA_OEMESON += "-Dcups=true" +# DEPENDS += "cups samba" (only smbclient needed from samba) +# +# User Accounts Panel +# +# EXTRA_OEMESON += "-Duser_accounts=true" +# DEPENDS += "accountsservice krb5" +# +# Citadel +# +# This option disables some things in gnome-control-center such as certain +# panels that are not used in Citadel, defaults to true in meson_options. +# To re-enable these things, set the option to false: +# +# EXTRA_OEMESON += "-Dcitadel=false" +# + +SRC_URI += " file://0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ +" + +FILES_${PN}-dev += "${datadir}/gettext" + +RDEPENDS_${PN} += "gsettings-desktop-schemas" +EXTRA_OEMESON = "--buildtype=release -Dcheese=false -Ddocumentation=false -Dstaging_dir=${STAGING_DIR_TARGET}" + diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-needs-stdint-include.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-needs-stdint-include.patch new file mode 100644 index 0000000..5c423a5 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-needs-stdint-include.patch @@ -0,0 +1,12 @@ +diff --git a/libgnome-desktop/gnome-rr.h b/libgnome-desktop/gnome-rr.h +index 111bab3f..f633a2d9 100644 +--- a/libgnome-desktop/gnome-rr.h ++++ b/libgnome-desktop/gnome-rr.h +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + typedef struct GnomeRRScreenPrivate GnomeRRScreenPrivate; + typedef struct GnomeRROutput GnomeRROutput; diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.36.4.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.38.1.bb similarity index 81% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.36.4.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.38.1.bb index b60c510..34e4a09 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.36.4.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.38.1.bb @@ -9,8 +9,9 @@ inherit gnomebase gtk-icon-cache gconf mime pkgconfig upstream-version-is-even g WARN_QA_remove = "unknown-configure-option" -SRC_URI[archive.md5sum] = "285d5d8a97b7564809151d401199c239" -SRC_URI[archive.sha256sum] = "007bbd48c1ca2fcb184713c923174c1d4328c3e33a2271ca536bdd3b71229bc6" +SRC_URI += "file://0001-needs-stdint-include.patch" +SRC_URI[archive.md5sum] = "483a25ef26195127c92106df2b5d8416" +SRC_URI[archive.sha256sum] = "17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0" DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb index 908add7..f26e7be 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb @@ -16,7 +16,7 @@ DEPENDS = " \ libgcrypt \ " -inherit gnomebase gsettings distro_features_check remove-libtool gettext upstream-version-is-even +inherit gnomebase gsettings features_check remove-libtool gettext upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11" @@ -33,6 +33,7 @@ EXTRA_OECONF = " \ FILES_${PN} += " \ ${datadir}/dbus-1/services \ ${datadir}/p11-kit \ + ${datadir}/xdg-desktop-portal \ ${base_libdir}/security/*${SOLIBSDEV} \ ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ " diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-Don-t-process-or-install-appstream-file.patch b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-Don-t-process-or-install-appstream-file.patch deleted file mode 100644 index 8b6abdd..0000000 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-Don-t-process-or-install-appstream-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e221a3df1cc2ad20f90dfb0b959e88ef1d371afa Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Sat, 19 Jan 2019 17:25:08 -0500 -Subject: [PATCH] Don't process or install appstream file - ---- - src/meson.build | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 1fc6b1b..7812f5c 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -38,13 +38,6 @@ i18n.merge_file('desktop', - install: true, - install_dir: gnome_screenshot_appsdir) - --i18n.merge_file('desktop', -- input: 'org.gnome.Screenshot.metainfo.xml.in', -- output: 'org.gnome.Screenshot.metainfo.xml', -- po_dir: join_paths(meson.current_source_dir(), '../po'), -- install: true, -- install_dir: gnome_screenshot_appdatadir) -- - service_conf = configuration_data () - service_conf.set('bindir', gnome_screenshot_bindir) - configure_file(input: 'org.gnome.Screenshot.service.in', diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.38.0.bb similarity index 58% rename from meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb rename to meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.38.0.bb index 99eb20e..ba225a3 100644 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.30.0.bb +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_3.38.0.bb @@ -7,12 +7,11 @@ inherit gnomebase gettext gobject-introspection WARN_QA_remove = "unknown-configure-option" -DEPENDS += "libx11 libxext glib-2.0 gtk+3 libcanberra glib-2.0-native libxml2-native" +DEPENDS += "libx11 libxext glib-2.0 gtk+3 libcanberra glib-2.0-native libxml2-native libhandy" -SRC_URI += "file://0001-Don-t-process-or-install-appstream-file.patch" - -SRC_URI[archive.md5sum] = "39a4ba8ef7b6c657a951f0822d218a34" -SRC_URI[archive.sha256sum] = "88031ec38ea823d97ddd6884c9b831acc2b33e2d3fd71112c94a1bdcb71ebd19" +SRC_URI[archive.md5sum] = "6550491108355c9d991e90b735ef3908" +SRC_URI[archive.sha256sum] = "e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0" FILES_${PN} += "${datadir}/dbus-1/services" +FILES_${PN}-dev += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-USB-protection-add-systemd-to-.deskt.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-USB-protection-add-systemd-to-.deskt.patch deleted file mode 100644 index cf222d8..0000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-USB-protection-add-systemd-to-.deskt.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d85a2f316b8bba505d24173484e43bd5abededa0 Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Fri, 3 Jul 2020 12:09:35 +0000 -Subject: [PATCH] Disable sharing/USB protection, add --systemd to .desktops - ---- - data/gnome-wayland.desktop.in.in | 4 +++- - data/gnome-xorg.desktop.in.in | 2 +- - data/gnome.desktop.in.in | 2 +- - data/gnome.session.desktop.in.in | 2 +- - 4 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/data/gnome-wayland.desktop.in.in b/data/gnome-wayland.desktop.in.in -index 516c211..14b5f5a 100644 ---- a/data/gnome-wayland.desktop.in.in -+++ b/data/gnome-wayland.desktop.in.in -@@ -1,7 +1,9 @@ - [Desktop Entry] - Name=GNOME - Comment=This session logs you into GNOME --Exec=@bindir@/gnome-session -+Exec=@bindir@/gnome-session --systemd --session=gnome - TryExec=@bindir@/gnome-session - Type=Application - DesktopNames=GNOME -+X-GDM-SessionRegisters=true -+ -diff --git a/data/gnome-xorg.desktop.in.in b/data/gnome-xorg.desktop.in.in -index 9a76fac..40ec660 100644 ---- a/data/gnome-xorg.desktop.in.in -+++ b/data/gnome-xorg.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=GNOME on Xorg - Comment=This session logs you into GNOME --Exec=@bindir@/gnome-session -+Exec=@bindir@/gnome-session --systemd --session=gnome - TryExec=@bindir@/gnome-session - Type=Application - DesktopNames=GNOME -diff --git a/data/gnome.desktop.in.in b/data/gnome.desktop.in.in -index 7eec1de..d83655e 100644 ---- a/data/gnome.desktop.in.in -+++ b/data/gnome.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=GNOME - Comment=This session logs you into GNOME --Exec=@bindir@/gnome-session -+Exec=@bindir@/gnome-session --systemd --session=gnome - TryExec=@bindir@/gnome-session - Type=Application - DesktopNames=GNOME -diff --git a/data/gnome.session.desktop.in.in b/data/gnome.session.desktop.in.in -index 6c70f54..5841b97 100644 ---- a/data/gnome.session.desktop.in.in -+++ b/data/gnome.session.desktop.in.in -@@ -1,3 +1,3 @@ - [GNOME Session] - Name=GNOME --RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.UsbProtection;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; -+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch new file mode 100644 index 0000000..3854313 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch @@ -0,0 +1,68 @@ +From a85ae8e4c464f0d4067ec86b4eba406917b4fd2e Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Wed, 28 Oct 2020 08:18:59 -0400 +Subject: [PATCH] Disable sharing and usb protection, add --systemd to desktops + +--- + data/gnome-wayland.desktop.in.in | 4 +++- + data/gnome-xorg.desktop.in.in | 2 +- + data/gnome.desktop.in.in | 2 +- + data/meson.build | 2 -- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/gnome-wayland.desktop.in.in b/data/gnome-wayland.desktop.in.in +index 516c211..14b5f5a 100644 +--- a/data/gnome-wayland.desktop.in.in ++++ b/data/gnome-wayland.desktop.in.in +@@ -1,7 +1,9 @@ + [Desktop Entry] + Name=GNOME + Comment=This session logs you into GNOME +-Exec=@bindir@/gnome-session ++Exec=@bindir@/gnome-session --systemd --session=gnome + TryExec=@bindir@/gnome-session + Type=Application + DesktopNames=GNOME ++X-GDM-SessionRegisters=true ++ +diff --git a/data/gnome-xorg.desktop.in.in b/data/gnome-xorg.desktop.in.in +index 9a76fac..40ec660 100644 +--- a/data/gnome-xorg.desktop.in.in ++++ b/data/gnome-xorg.desktop.in.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Name=GNOME on Xorg + Comment=This session logs you into GNOME +-Exec=@bindir@/gnome-session ++Exec=@bindir@/gnome-session --systemd --session=gnome + TryExec=@bindir@/gnome-session + Type=Application + DesktopNames=GNOME +diff --git a/data/gnome.desktop.in.in b/data/gnome.desktop.in.in +index 7eec1de..d83655e 100644 +--- a/data/gnome.desktop.in.in ++++ b/data/gnome.desktop.in.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + Name=GNOME + Comment=This session logs you into GNOME +-Exec=@bindir@/gnome-session ++Exec=@bindir@/gnome-session --systemd --session=gnome + TryExec=@bindir@/gnome-session + Type=Application + DesktopNames=GNOME +diff --git a/data/meson.build b/data/meson.build +index e02b80d..08afab6 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -21,10 +21,8 @@ required_components = { + 'org.gnome.SettingsDaemon.PrintNotifications', + 'org.gnome.SettingsDaemon.Rfkill', + 'org.gnome.SettingsDaemon.ScreensaverProxy', +- 'org.gnome.SettingsDaemon.Sharing', + 'org.gnome.SettingsDaemon.Smartcard', + 'org.gnome.SettingsDaemon.Sound', +- 'org.gnome.SettingsDaemon.UsbProtection', + 'org.gnome.SettingsDaemon.Wacom', + 'org.gnome.SettingsDaemon.XSettings', + ], diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch deleted file mode 100644 index c1b92eb..0000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/0001-Remove-org.gnome.SettingsDaemon.Sharing-from-require.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 09fda1a494cb77820269a7419d0185af16612579 Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Wed, 24 Apr 2019 18:50:35 +0000 -Subject: [PATCH] Remove org.gnome.SettingsDaemon.Sharing from required session - components - ---- - data/gnome.session.desktop.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/gnome.session.desktop.in.in b/data/gnome.session.desktop.in.in -index 86570c4..62b0615 100644 ---- a/data/gnome.session.desktop.in.in -+++ b/data/gnome.session.desktop.in.in -@@ -1,3 +1,3 @@ - [GNOME Session] - Name=GNOME --RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; -+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.38.0.bb similarity index 70% rename from meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_3.38.0.bb index 6fee1d8..98070aa 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.38.0.bb @@ -18,13 +18,13 @@ DEPENDS = " \ GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext gsettings upstream-version-is-even distro_features_check +inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 systemd pam gobject-introspection-data" -SRC_URI += " file://0001-Disable-sharing-USB-protection-add-systemd-to-.deskt.patch" -SRC_URI[archive.md5sum] = "cd23e30c4991ca1f477020c67ea3a540" -SRC_URI[archive.sha256sum] = "d54b38b818c812f64b82cc6a1279e3ca5a6e391ee662793322a38cab5670bb7a" +SRC_URI[archive.md5sum] = "736024b46e2542b9b68adaa43f754f49" +SRC_URI[archive.sha256sum] = "7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67" +SRC_URI += " file://0001-Disable-sharing-and-usb-protection-add-systemd-to-de.patch" EXTRA_OEMESON += "-Dsystemd=true -Dsystemd_journal=true -Ddocbook=false -Dman=false" FILES_${PN} += " \ diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch index 0111797..7585f54 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-gsd-sharing-plugin.patch @@ -8,14 +8,14 @@ Subject: [PATCH] Disable gsd-sharing plugin 1 file changed, 1 deletion(-) diff --git a/plugins/meson.build b/plugins/meson.build -index ce7d86f..3246456 100644 +index c8c10db4..b75a4681 100644 --- a/plugins/meson.build +++ b/plugins/meson.build -@@ -8,7 +8,6 @@ enabled_plugins = [ - ['keyboard', 'Keyboard'], - ['media-keys', 'MediaKeys'], - ['screensaver-proxy', 'ScreensaverProxy'], -- ['sharing', 'Sharing'], - ['sound', 'Sound'], - ['usb-protection', 'UsbProtection'], - ['xsettings', 'XSettings'] +@@ -7,7 +7,6 @@ all_plugins = [ + ['keyboard', 'Keyboard', 'GNOME keyboard configuration'], + ['media-keys', 'MediaKeys', 'GNOME keyboard shortcuts'], + ['screensaver-proxy', 'ScreensaverProxy', 'GNOME FreeDesktop screensaver'], +- ['sharing', 'Sharing', 'GNOME file sharing'], + ['sound', 'Sound', 'GNOME sound sample caching'], + ['usb-protection', 'UsbProtection', 'GNOME USB protection'], + ['xsettings', 'XSettings', 'GNOME XSettings'], diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch index b448a15..bc99797 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-Disable-power-tests-and-USB-protection.patch @@ -1,31 +1,29 @@ -From a86f5783018fb551701ff0f46dc67adec493a68b Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Thu, 2 Jul 2020 15:38:19 +0000 -Subject: [PATCH] Disable power tests and USB protection - ---- - plugins/meson.build | 2 +- - plugins/power/meson.build | 46 --------------------------------------- - 2 files changed, 1 insertion(+), 47 deletions(-) - diff --git a/plugins/meson.build b/plugins/meson.build -index 3246456..d38fc18 100644 +index c8c10db4..4d7d6ebe 100644 --- a/plugins/meson.build +++ b/plugins/meson.build -@@ -9,7 +9,7 @@ enabled_plugins = [ - ['media-keys', 'MediaKeys'], - ['screensaver-proxy', 'ScreensaverProxy'], - ['sound', 'Sound'], -- ['usb-protection', 'UsbProtection'], -+# ['usb-protection', 'UsbProtection'], - ['xsettings', 'XSettings'] - ] +@@ -8,7 +8,6 @@ all_plugins = [ + ['media-keys', 'MediaKeys', 'GNOME keyboard shortcuts'], + ['screensaver-proxy', 'ScreensaverProxy', 'GNOME FreeDesktop screensaver'], + ['sound', 'Sound', 'GNOME sound sample caching'], +- ['usb-protection', 'UsbProtection', 'GNOME USB protection'], + ['xsettings', 'XSettings', 'GNOME XSettings'], + ['smartcard', 'Smartcard', 'GNOME smartcard'], + ['wacom', 'Wacom', 'GNOME Wacom tablet support'], +@@ -32,7 +31,7 @@ if not enable_wacom + endif + if not enable_cups +- disabled_plugins += ['cups'] ++ disabled_plugins += ['print-notifications'] + endif + + if not enable_rfkill diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f..801c011 100644 +index 69e619f2..cd1c88b6 100644 --- a/plugins/power/meson.build +++ b/plugins/power/meson.build -@@ -102,49 +102,3 @@ if host_is_linux +@@ -102,49 +102,4 @@ if host_is_linux ) endif @@ -74,4 +72,4 @@ index 69e619f..801c011 100644 - timeout: i == 1 ? 180 : 120 - ) -endforeach -- + diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch deleted file mode 100644 index 970ca4e..0000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-don-t-run-power-module-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 11f025c3fdf32b33ad5ac263b1e638a33f01149b Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Sat, 6 Apr 2019 19:55:22 -0400 -Subject: [PATCH] don't run power module tests - ---- - plugins/power/meson.build | 43 --------------------------------------- - 1 file changed, 43 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 8babf97..0e0d506 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -102,48 +102,5 @@ if host_is_linux - ) - endif - --output = 'gsdpowerconstants.py' -- --gsdpowerconstants_py = custom_target( -- output, -- input: 'gsd-power-constants.h', -- output: output, -- build_by_default: true, -- command: [join_paths(meson.current_source_dir(), 'gsd-power-constants-update.pl'), '@INPUT@', '@OUTPUT@'] --) -- --output = 'gsdpowerenums.py' -- --gsdpowerenums_py = custom_target( -- output, -- output: output, -- capture: true, -- build_by_default: true, -- command: [gsd_power_enums_update] --) -- --test_py = find_program('test.py') - --envs = environment() --#envs.prepend('G_DEBUG', 'fatal-warnings') --envs.set('BUILDDIR', meson.current_build_dir()) --envs.set('TOP_BUILDDIR', meson.build_root()) --envs.set('LD_PRELOAD', 'libumockdev-preload.so.0') --envs.set('NO_AT_BRIDGE', '1') --envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0') -- --if get_option('b_sanitize').split(',').contains('address') -- # libasan needs to be loaded first; so we need to explicitly preload it -- envs.set('POWER_LD_PRELOAD', 'libasan.so.5') --endif -- --foreach i : [ 1, 2, 3, 4, 5, 6, 7, 8 ] -- test( -- 'test-power @0@/8'.format(i), -- test_py, -- args: [ 'PowerPluginTest@0@'.format(i) ], -- env: envs, -- timeout: 100 -- ) --endforeach - diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb similarity index 88% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.0.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb index 5918701..4d6aac2 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.38.0.bb @@ -14,8 +14,8 @@ FILES_${PN} += "\ FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" -SRC_URI[archive.md5sum] = "e28f11174ca0bafc56fb7a766591d786" -SRC_URI[archive.sha256sum] = "fa2ff032ec6c59e4c4ca66c61a29f4ba4b9820496625fc343bfa12291cfaad49" +SRC_URI[archive.md5sum] = "69988449f4e1be6b26a0109cc6019d47" +SRC_URI[archive.sha256sum] = "b7ed5b5fab9aad192ceed6a95be2805124e3c63c46891bbae076f7ec3fd6792e" GNOMEBASEBUILDCLASS = "meson" @@ -34,5 +34,5 @@ pkgconfig = 'pkg-config-native' EOF } -EXTRA_OEMESON += "--buildtype=release --native-file ${WORKDIR}/meson.native -Dcups=false -Dsmartcard=false -Dwwan=false -Dsystemd=true" +EXTRA_OEMESON += "--buildtype=release --native-file ${WORKDIR}/meson.native -Dcups=false -Dsmartcard=false -Dwwan=false -Dsystemd=true -Ddebug_tools=false" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Disabled-calendar-events-from-user-session.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Disabled-calendar-events-from-user-session.patch index fae42d4..0e0b87d 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Disabled-calendar-events-from-user-session.patch +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Disabled-calendar-events-from-user-session.patch @@ -1,4 +1,4 @@ -From 0300490d0d2f425d87a311b76d0b51b0e085f27a Mon Sep 17 00:00:00 2001 +From a2ea7fac46ea2b6599df0095223627b17181f390 Mon Sep 17 00:00:00 2001 From: xSmurf Date: Wed, 14 Nov 2018 01:47:43 -0500 Subject: [PATCH] Disabled calendar events from user session... @@ -8,10 +8,10 @@ Subject: [PATCH] Disabled calendar events from user session... 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js -index aac29ae..4214372 100644 +index 2136e94..3f35ab2 100644 --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js -@@ -81,7 +81,7 @@ const _modes = { +@@ -69,7 +69,7 @@ const _modes = { 'user': { hasOverview: true, diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Remove-calendar-server-fix-build.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Remove-calendar-server-fix-build.patch index 784a715..f18553d 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Remove-calendar-server-fix-build.patch +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Remove-calendar-server-fix-build.patch @@ -1,4 +1,4 @@ -From 5b7a690c82fd650c0fb4c31b51b52dec49abfb32 Mon Sep 17 00:00:00 2001 +From 12fd2083761c1d432a2b505a210d1289b2b1624f Mon Sep 17 00:00:00 2001 From: David McKinney Date: Wed, 8 Jul 2020 14:07:06 +0000 Subject: [PATCH] Remove calendar server, fix build @@ -12,10 +12,10 @@ Subject: [PATCH] Remove calendar server, fix build 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build -index c749f45..8669b0b 100644 +index 2f047bb..6484cdc 100644 --- a/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build -@@ -20,7 +20,7 @@ foreach service, dir : dbus_services +@@ -26,7 +26,7 @@ foreach service, dir : dbus_services serviceconf = configuration_data() serviceconf.set('service', service) @@ -25,7 +25,7 @@ index c749f45..8669b0b 100644 configure_file( diff --git a/meson.build b/meson.build -index 6868d8e..caebf94 100644 +index d86879a..c23ab0b 100644 --- a/meson.build +++ b/meson.build @@ -18,8 +18,8 @@ cogl_pc = 'mutter-cogl-' + mutter_api_version @@ -39,7 +39,7 @@ index 6868d8e..caebf94 100644 gcr_req = '>= 3.7.5' gio_req = '>= 2.56.0' gi_req = '>= 1.49.1' -@@ -78,8 +78,8 @@ else +@@ -71,8 +71,8 @@ else endif atk_bridge_dep = dependency('atk-bridge-2.0') @@ -50,7 +50,7 @@ index 6868d8e..caebf94 100644 gcr_dep = dependency('gcr-base-3', version: gcr_req) gdk_x11_dep = dependency('gdk-x11-3.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') -@@ -139,7 +139,7 @@ endif +@@ -134,7 +134,7 @@ endif mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir') python = find_program('python3') sassc = find_program('sassc') @@ -60,7 +60,7 @@ index 6868d8e..caebf94 100644 cc = meson.get_compiler('c') diff --git a/src/meson.build b/src/meson.build -index 46680d5..6769de7 100644 +index a7c56bb..3118e67 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,7 +1,7 @@ @@ -86,7 +86,7 @@ index a378a7e..f2a37ba 100644 configure_file( input: prgname + '.in', diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build -index 20f938f..a13ff5e 100644 +index 4acd94c..c6bdd5f 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build @@ -35,7 +35,7 @@ localedir = join_paths(datadir, 'locale') @@ -96,5 +96,5 @@ index 20f938f..a13ff5e 100644 -gjs = find_program('gjs') +gjs = '/usr/bin/gjs' appstream_util = find_program('appstream-util', required: false) + desktop_file_validate = find_program('desktop-file-validate', required: false) - subdir('data') diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-build-calendar-server.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-build-calendar-server.patch deleted file mode 100644 index a14d1f6..0000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-build-calendar-server.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7c4660a3c74ccd1e4dbb784dea7b6fef2bed76ab Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 14:40:42 -0400 -Subject: [PATCH] do not build calendar server - ---- - meson.build | 4 ++-- - src/meson.build | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index e42611e..dae2510 100644 ---- a/meson.build -+++ b/meson.build -@@ -73,8 +73,8 @@ else - endif - - atk_bridge_dep = dependency('atk-bridge-2.0') --ecal_dep = dependency('libecal-1.2', version: ecal_req) --eds_dep = dependency('libedataserver-1.2', version: eds_req) -+#ecal_dep = dependency('libecal-1.2', version: ecal_req) -+#eds_dep = dependency('libedataserver-1.2', version: eds_req) - gcr_dep = dependency('gcr-base-3', version: gcr_req) - gdk_x11_dep = dependency('gdk-x11-3.0') - gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') -diff --git a/src/meson.build b/src/meson.build -index 97a5a79..98371a1 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,7 +1,7 @@ - service_data = configuration_data() - service_data.set('libexecdir', libexecdir) - --subdir('calendar-server') -+#subdir('calendar-server') - subdir('hotplug-sniffer') - subdir('st') - subdir('tray') diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch index 1151d7d..35fa8cd 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch @@ -1,4 +1,4 @@ -From f7582d395c8d4fcd4232df0cae524eb8e5d4cf61 Mon Sep 17 00:00:00 2001 +From 66351cb08cf4e71d5b30dfcd4a47fd69eb49c116 Mon Sep 17 00:00:00 2001 From: brl Date: Sun, 24 Dec 2017 17:44:02 -0500 Subject: [PATCH] do not use python path from build environment @@ -9,7 +9,7 @@ Subject: [PATCH] do not use python path from build environment 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnome-shell-extension-tool.in b/src/gnome-shell-extension-tool.in -index f6c3762..07ac37d 100755 +index fb3d0d8..8da34ff 100755 --- a/src/gnome-shell-extension-tool.in +++ b/src/gnome-shell-extension-tool.in @@ -1,4 +1,4 @@ @@ -17,9 +17,9 @@ index f6c3762..07ac37d 100755 +#!/usr/bin/env python3 # -*- mode: Python; indent-tabs-mode: nil; -*- - import os + import subprocess diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in -index b2a4521..88a10f6 100755 +index a1b5d59..163a5b9 100755 --- a/src/gnome-shell-perf-tool.in +++ b/src/gnome-shell-perf-tool.in @@ -1,4 +1,4 @@ @@ -28,6 +28,3 @@ index b2a4521..88a10f6 100755 # -*- mode: Python; indent-tabs-mode: nil; -*- import datetime --- -2.14.3 - diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.36.4.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.38.1.bb similarity index 83% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.36.4.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.38.1.bb index 734eadb..2892b5d 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.36.4.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.38.1.bb @@ -3,14 +3,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gettext gobject-introspection gobject-introspection-data distro_features_check bash-completion +inherit gnomebase gsettings gettext gobject-introspection gobject-introspection-data features_check bash-completion REQUIRED_DISTRO_FEATURES = "x11 systemd pam" WARN_QA_remove = "unknown-configure-option" -SRC_URI[archive.md5sum] = "6227e7986a8eb6fdf48ed8f06d55a99f" -SRC_URI[archive.sha256sum] = "2d94932d9ceb522501055f6b2c85e79132ce7e3f13c4997e31564694725ed1db" +SRC_URI[archive.md5sum] = "a12f98e36f4cfc4b4f968c35edc6f778" +SRC_URI[archive.sha256sum] = "b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0001-Disabled-calendar-events-from-user-session.patch \ @@ -25,7 +25,7 @@ DEPENDS = " \ mutter \ gcr \ gjs \ - mozjs68 \ + mozjs78 \ network-manager-applet \ gnome-autoar \ polkit \ @@ -56,8 +56,4 @@ do_configure_append () { sed --in-place=.old1 "s;=${MUTTER_DIR};=${PKG_CONFIG_SYSROOT_DIR}${MUTTER_DIR};" ${B}/build.ninja } -#do_install_append() { -# paxctl -cm ${D}${bindir}/gnome-shell -#} - EXTRA_OEMESON += "-Dman=false -Dsystemd=true -Dnetworkmanager=true -Dextensions_app=false" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.38.0.bb similarity index 81% rename from meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.38.0.bb index 779b259..25d7138 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.38.0.bb @@ -17,8 +17,8 @@ DEPENDS = " \ inherit gnomebase gsettings gettext upstream-version-is-even -SRC_URI[archive.md5sum] = "08150cbf2e23dd4f60f959a6eca8ef0c" -SRC_URI[archive.sha256sum] = "41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46" +SRC_URI[archive.md5sum] = "947facc65c12735ac586e9dbf6228502" +SRC_URI[archive.sha256sum] = "0a0fc7a8b383c6ffd61469be1dea5ba63cffad812921780e7fad40c2e2ae54f5" EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension" diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.30.2.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.30.2.bb deleted file mode 100644 index 159cd06..0000000 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.30.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Customize advanced GNOME desktop configuration options" -HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Tweaks" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext - -SRC_URI[archive.md5sum] = "5c4f9181cf18ce229f63d84723943721" -SRC_URI[archive.sha256sum] = "3f78551515eadf848c9140482e08842a5552acdc2987d8cc13f496187cd4c348" - -DEPENDS = "glib-2.0 glib-2.0-native" - -RDEPENDS_${PN} = "python3 python3-pygobject" - -FILES_${PN} += "\ - ${libdir}/python3.5/site-packages/gtweak \ - ${datadir}/icons/hicolor \ - ${datadir}/metainfo \ -" - diff --git a/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb b/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.38.0.bb similarity index 63% rename from meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb rename to meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.38.0.bb index 9c3dd1e..0f68f53 100644 --- a/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.30.0.bb +++ b/meta-gnome/recipes-gnome/gnome-usage/gnome-usage_3.38.0.bb @@ -7,11 +7,11 @@ inherit gnomebase gobject-introspection gettext vala WARN_QA_remove = "unknown-configure-option" -SRC_URI += "file://0001-Added-machine-tags.patch" +#SRC_URI += "file://0001-Added-machine-tags.patch" -DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gobject-introspection libgtop" -SRC_URI[archive.md5sum] = "7641fecd816f76d31415f4e2e2b301b6" -SRC_URI[archive.sha256sum] = "50577b76d05310cb6f26138fb6f4d0c8d02d4f71a657ac3f445f999038633b38" +DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gobject-introspection libgtop libdazzle libhandy tracker" +SRC_URI[archive.md5sum] = "a331e1b6d8f588c02440be1972097c62" +SRC_URI[archive.sha256sum] = "94d58202fd92094ee2a2647ea3f96d0b16b5f5d7f9bf5ae99f1c33117d1a1a57" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch deleted file mode 100644 index 9e1f79e..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 59d2cbb54c012b25adeb965a94b6585d911a4539 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Wed, 20 Nov 2019 09:03:47 -0600 -Subject: [PATCH] Fix build reproducibility - -ba744068 ("Make meson.override_find_program working on more complex use -cases") made the build no longer reproducible by encoding a build system -path into the output. This shouldn't be necessary anyway, since it -should be possible to add new paths to search for gir files by setting -the XDG_DATA_DIR environment variable. - -Closes #318 - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/192] -Signed-off-by: Joshua Watt ---- - girepository/girparser.c | 4 ---- - meson.build | 1 - - 2 files changed, 5 deletions(-) - -diff --git a/girepository/girparser.c b/girepository/girparser.c -index fb47e75c..53450baf 100644 ---- a/girepository/girparser.c -+++ b/girepository/girparser.c -@@ -309,10 +309,6 @@ locate_gir (GIrParser *parser, - if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) - return path; - g_free (path); -- path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL); -- if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) -- return path; -- g_free (path); - return NULL; - } - -diff --git a/meson.build b/meson.build -index d6231c5f..2f248579 100644 ---- a/meson.build -+++ b/meson.build -@@ -90,7 +90,6 @@ endif - girdir = join_paths(gir_dir_prefix, 'gir-1.0') - config.set_quoted('GIR_DIR', girdir) - config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) --config.set_quoted('UNINSTALLED_GIR_DIR', join_paths(meson.current_build_dir(), 'gir')) - - foreach type : ['char', 'short', 'int', 'long'] - size = cc.sizeof(type) --- -2.23.0 - diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch deleted file mode 100644 index 639f9c8..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 0417a1bb08745f2bf5310d20b342c2b3b9b212d3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 15 Nov 2018 15:10:05 +0100 -Subject: [PATCH] Port cross-compilation support to meson - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - gir/meson.build | 62 ++++++++++++++++++++++++++++++++++------------- - meson.build | 4 ++- - meson_options.txt | 20 +++++++++++++++ - 3 files changed, 68 insertions(+), 18 deletions(-) - -diff --git a/gir/meson.build b/gir/meson.build -index c312100..a028033 100644 ---- a/gir/meson.build -+++ b/gir/meson.build -@@ -41,16 +41,29 @@ gir_files = [ - typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') - install_data(gir_files, install_dir: girdir) - --scanner_command = [ -- python, -- girscanner, -- '--output=@OUTPUT@', -- '--no-libtool', -- '--quiet', -- '--reparse-validate', -- '--add-include-path', join_paths(meson.current_build_dir()), -- '--add-include-path', join_paths(meson.current_source_dir()), --] -+if get_option('enable-host-gi') -+ scanner_command = [ -+ 'g-ir-scanner', -+ '--output=@OUTPUT@', -+ '--no-libtool', -+ '--quiet', -+ '--reparse-validate', -+ '--add-include-path', join_paths(meson.current_build_dir()), -+ '--add-include-path', join_paths(meson.current_source_dir()), -+ ] -+else -+ scanner_command = [ -+ python, -+ girscanner, -+ '--output=@OUTPUT@', -+ '--no-libtool', -+ '--quiet', -+ '--reparse-validate', -+ '--add-include-path', join_paths(meson.current_build_dir()), -+ '--add-include-path', join_paths(meson.current_source_dir()), -+ ] -+endif -+ - - dep_type = glib_dep.type_name() - if dep_type == 'internal' -@@ -63,6 +76,12 @@ if dep_type == 'internal' - '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] - endif - -+if get_option('enable-gi-cross-wrapper') != '' -+ scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')] -+endif -+if get_option('enable-gi-ldd-wrapper') != '' -+ scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')] -+endif - # Take a glob and print to newlines - globber = ''' - from glob import glob -@@ -89,8 +108,8 @@ glib_command = scanner_command + [ - - if dep_type == 'pkgconfig' - glib_command += ['--external-library', '--pkg=glib-2.0'] -- glib_libdir = glib_dep.get_pkgconfig_variable('libdir') -- glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') -+ glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir') -+ glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') - glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') - glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') - glib_files += join_paths(glib_libincdir, 'glibconfig.h') -@@ -345,7 +364,7 @@ if giounix_dep.found() - dep_type = giounix_dep.type_name() - if dep_type == 'pkgconfig' - gio_command += ['--pkg=gio-unix-2.0'] -- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') -+ giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') - # Get the installed gio-unix header list - ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) - if ret.returncode() != 0 -@@ -428,15 +447,24 @@ gir_files += custom_target('gir-girepository', - ) - - typelibs = [] -+if get_option('enable-gi-cross-wrapper') != '' -+ gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', -+ '--includedir', meson.current_build_dir(), -+ '--includedir', meson.current_source_dir(), -+ ] -+else -+ gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -+ '--includedir', meson.current_build_dir(), -+ '--includedir', meson.current_source_dir(), -+ ] -+endif -+ - foreach gir : gir_files - typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), - input: gir, - output: '@BASENAME@.typelib', - depends: [gobject_gir, ], -- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@', -- '--includedir', meson.current_build_dir(), -- '--includedir', meson.current_source_dir(), -- ], -+ command: gircompiler_command, - install: true, - install_dir: typelibdir, - ) -diff --git a/meson.build b/meson.build -index a5e825f..a28490a 100644 ---- a/meson.build -+++ b/meson.build -@@ -168,7 +168,9 @@ endif - subdir('girepository') - subdir('tools') - subdir('giscanner') --subdir('gir') -+if get_option('enable-introspection-data') == true -+ subdir('gir') -+endif - subdir('examples') - subdir('docs') - subdir('tests') -diff --git a/meson_options.txt b/meson_options.txt -index 445a68a..a325511 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', - option('gir_dir_prefix', type: 'string', - description: 'Intermediate prefix for gir installation under ${prefix}' - ) -+ -+option('enable-host-gi', type: 'boolean', value : false, -+ description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)' -+) -+ -+option('enable-gi-cross-wrapper', type: 'string', -+ description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)' -+) -+ -+option('enable-gi-ldd-wrapper', type: 'string', -+ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)' -+) -+ -+option('enable-introspection-data', type: 'boolean', value : true, -+ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools' -+) -+ -+option('pkgconfig-sysroot-path', type: 'string', -+ description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)' -+) diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch deleted file mode 100644 index a15401a..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001 -From: Sascha Silbe -Date: Fri, 8 Jun 2018 13:55:10 +0200 -Subject: [PATCH] Relocate the repository directory for native builds - -Instead of hard-coding GOBJECT_INTROSPECTION_LIBDIR when -gobject-introspection is built, use dladdr() to determine where -GOBJECT_INTROSPECTION_LIBDIR is and use that path to calculate the -repository directory. - -This fixes gobject-introspection-native accessing paths across build -directories (e.g. if the build directories use the same shared state -cache or sstate mirror). - -Upstream-Status: Inappropriate -Signed-off-by: Sascha Silbe - ---- - girepository/girepository.c | 15 +++++++++++++-- - girepository/meson.build | 2 +- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/girepository/girepository.c b/girepository/girepository.c -index ca5dc2b..7a4d17f 100644 ---- a/girepository/girepository.c -+++ b/girepository/girepository.c -@@ -21,6 +21,8 @@ - * Boston, MA 02111-1307, USA. - */ - -+#define _GNU_SOURCE -+ - #include "config.h" - - #include -@@ -34,6 +36,8 @@ - #include "gitypelib-internal.h" - #include "girepository-private.h" - -+#include -+ - /** - * SECTION:girepository - * @short_description: GObject Introspection repository manager -@@ -212,9 +216,16 @@ init_globals (void) - g_free (custom_dirs); - } - -- libdir = GOBJECT_INTROSPECTION_LIBDIR; -+ Dl_info gi_lib_info; - -- typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); -+ if (dladdr (g_irepository_get_default, &gi_lib_info)) { -+ char *libdir = g_path_get_dirname (gi_lib_info.dli_fname); -+ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); -+ g_free (libdir); -+ } else { -+ libdir = GOBJECT_INTROSPECTION_LIBDIR; -+ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); -+ } - - typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); - -diff --git a/girepository/meson.build b/girepository/meson.build -index 1d7aed6..5637fb5 100644 ---- a/girepository/meson.build -+++ b/girepository/meson.build -@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals', - ], - c_args: gi_hidden_visibility_cflags + custom_c_args, - include_directories : configinc, -- dependencies: [girepo_gthash_dep, libffi_dep], -+ dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')], - ) - - girepo_internals_dep = declare_dependency( diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch deleted file mode 100644 index ddd9553..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6653c28f0b76aad86e26c512b03efcec6d9d9e95 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 3 Jan 2018 17:02:01 +0200 -Subject: [PATCH] giscanner: add a --lib-dirs-envvar option - -By default LD_LIBRARY_PATH is set to the list of target library paths; -this breaks down in cross-compilation environment, as we need to run a -native emulation wrapper rather than the target binary itself. This patch -allows exporting those paths to a different environment variable -which can be picked up and used by the wrapper. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin - ---- - giscanner/ccompiler.py | 4 ++-- - giscanner/dumper.py | 3 ++- - giscanner/scannermain.py | 3 +++ - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index 32c9296..3fb262b 100644 ---- a/giscanner/ccompiler.py -+++ b/giscanner/ccompiler.py -@@ -174,7 +174,7 @@ class CCompiler(object): - - self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations" - -- def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths): -+ def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths, lib_dirs_envvar): - # An "internal" link is where the library to be introspected - # is being built in the current directory. - -@@ -184,7 +184,7 @@ class CCompiler(object): - if os.name == 'nt': - runtime_path_envvar = ['LIB', 'PATH'] - else: -- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] -+ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] - # Search the current directory first - # (This flag is not supported nor needed for Visual C++) - args.append('-L.') -diff --git a/giscanner/dumper.py b/giscanner/dumper.py -index 2b851a5..10a7c39 100644 ---- a/giscanner/dumper.py -+++ b/giscanner/dumper.py -@@ -244,7 +244,8 @@ class DumpCompiler(object): - libtool, - self._options.libraries, - self._options.extra_libraries, -- self._options.library_paths) -+ self._options.library_paths, -+ self._options.lib_dirs_envvar) - args.extend(pkg_config_libs) - - else: -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 9013562..9c9fe12 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -126,6 +126,9 @@ def _get_option_parser(): - parser.add_option("", "--use-ldd-wrapper", - action="store", dest="ldd_wrapper", default=None, - help="wrapper to use instead of ldd (useful when cross-compiling)") -+ parser.add_option("", "--lib-dirs-envvar", -+ action="store", dest="lib_dirs_envvar", default=None, -+ help="environment variable to write a list of library directories to (for running the transient binary), instead of standard LD_LIBRARY_PATH") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch deleted file mode 100644 index b484b5e..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 5 Sep 2018 16:46:52 +0200 -Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper - -prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. -It is not an error per se, but it breaks subprocess.check_output(). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - giscanner/shlibs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries): - args.extend(['otool', '-L', binary.args[0]]) - else: - args.extend(['ldd', binary.args[0]]) -- output = subprocess.check_output(args) -+ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout - if isinstance(output, bytes): - output = output.decode("utf-8", "replace") - diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch deleted file mode 100644 index c4951b2..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-disable-tests-when-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2c384187cc22113c0c9b1cd233948118f7c085ef Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 25 Mar 2019 13:28:48 +0100 -Subject: [PATCH] meson.build: disable tests when cross-compiling - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64] -Signed-off-by: Alexander Kanavin ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 2544ff3..4c16fe5 100644 ---- a/meson.build -+++ b/meson.build -@@ -168,7 +168,9 @@ if get_option('enable-introspection-data') == true - endif - subdir('examples') - subdir('docs') --subdir('tests') -+if not meson.is_cross_build() -+ subdir('tests') -+endif - - install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) - install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch deleted file mode 100644 index b954dce..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5f985fd8a24764ccb38af6335d4584d7e33fc3a1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 19 Oct 2015 18:26:40 +0300 -Subject: [PATCH] giscanner: add --use-binary-wrapper option - -With this option, giscanner will use a wrapper executable to run -binaries it's producing, instead of running them directly. This -is useful when binaries are cross-compiled and cannot be run directly, -but they can be run using for example QEMU emulation. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin - ---- - giscanner/scannermain.py | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index c004fb1..0b6a2d2 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -120,6 +120,9 @@ def _get_option_parser(): - parser.add_option("", "--program", - action="store", dest="program", default=None, - help="program to execute") -+ parser.add_option("", "--use-binary-wrapper", -+ action="store", dest="wrapper", default=None, -+ help="wrapper to use for running programs (useful when cross-compiling)") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") -@@ -417,6 +420,17 @@ def create_binary(transformer, options, args): - gdump_parser.get_error_quark_functions()) - - shlibs = resolve_shlibs(options, binary, options.libraries) -+ if options.wrapper: -+ # The wrapper needs the binary itself, not the libtool wrapper script, -+ # so we check if libtool has sneaked the binary into .libs subdirectory -+ # and adjust the path accordingly -+ import os.path -+ dir_name, binary_name = os.path.split(binary.args[0]) -+ libtool_binary = os.path.join(dir_name, '.libs', binary_name) -+ if os.path.exists(libtool_binary): -+ binary.args[0] = libtool_binary -+ # Then prepend the wrapper to the command line to execute -+ binary.args = [options.wrapper] + binary.args - gdump_parser.set_introspection_binary(binary) - gdump_parser.parse() - return shlibs diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch deleted file mode 100644 index 79264ed..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cba7807888a4a1f1d630d16c51c89859209334b3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 30 Oct 2015 16:28:46 +0200 -Subject: [PATCH] giscanner: add a --use-ldd-wrapper option - -This is useful in cross-compile environments where system's ldd -command does not work on binaries built for a different architecture - -Upstream-Status: Pending [review in oe-core] -Signed-off-by: Alexander Kanavin - ---- - giscanner/scannermain.py | 3 +++ - giscanner/shlibs.py | 4 +++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 0b6a2d2..9013562 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -123,6 +123,9 @@ def _get_option_parser(): - parser.add_option("", "--use-binary-wrapper", - action="store", dest="wrapper", default=None, - help="wrapper to use for running programs (useful when cross-compiling)") -+ parser.add_option("", "--use-ldd-wrapper", -+ action="store", dest="ldd_wrapper", default=None, -+ help="wrapper to use instead of ldd (useful when cross-compiling)") - parser.add_option("", "--program-arg", - action="append", dest="program_args", default=[], - help="extra arguments to program") -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 2c61f2f..d67df95 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -96,7 +96,9 @@ def _resolve_non_libtool(options, binary, libraries): - args.extend(libtool) - args.append('--mode=execute') - platform_system = platform.system() -- if platform_system == 'Darwin': -+ if options.ldd_wrapper: -+ args.extend([options.ldd_wrapper, binary.args[0]]) -+ elif platform_system == 'Darwin': - args.extend(['otool', '-L', binary.args[0]]) - else: - args.extend(['ldd', binary.args[0]]) diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch deleted file mode 100644 index 26f8da6..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 8 Oct 2015 18:30:35 +0300 -Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR - environment variable - -This environment variable sets the location of sysroot directory in cross-compilation -environments; if the variable is not set, the prefix will be empty. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin - ---- - m4/introspection.m4 | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -index d89c3d9..b562266 100644 ---- a/m4/introspection.m4 -+++ b/m4/introspection.m4 -@@ -56,14 +56,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb deleted file mode 100644 index b137177..0000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb +++ /dev/null @@ -1,209 +0,0 @@ -SUMMARY = "Middleware layer between GObject-using C libraries and language bindings" -DESCRIPTION = "GObject Introspection is a project for providing machine \ -readable introspection data of the API of C libraries. This introspection \ -data can be used in several different use cases, for example automatic code \ -generation for bindings, API verification and documentation generation." -HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/gobject-introspection/issues" -SECTION = "libs" -LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ - file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ - file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ - file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27 \ - " - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ - file://0003-giscanner-add-use-binary-wrapper-option.patch \ - file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ - file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ - file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ - file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ - file://0001-Port-cross-compilation-support-to-meson.patch \ - file://0001-meson.build-disable-tests-when-cross-compiling.patch \ - file://0001-Fix-build-reproducibility.patch \ - " - -SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1" -SRC_URI[sha256sum] = "b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2" - -SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" - -inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script - -GTKDOC_MESON_OPTION = "gtk_doc" - -MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" - -DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" - -# target build needs qemu to run temporary introspection binaries created -# on the fly by g-ir-scanner and a native version of itself to run -# native versions of its own tools during build. -# Also prelink-rtld is used to find out library dependencies of introspection binaries -# (standard ldd doesn't work when cross-compiling). -DEPENDS_class-target_append = " gobject-introspection-native qemu-native prelink-native" - -# needed for writing out the qemu wrapper script -export STAGING_DIR_HOST -export B - -PACKAGECONFIG ?= "" -PACKAGECONFIG[doctool] = "-Ddoctool=true,-Ddoctool=false,python3-mako," - -# Configure target build to use native tools of itself and to use a qemu wrapper -# and optionally to generate introspection data -EXTRA_OEMESON_class-target = " \ - -Denable-host-gi=true \ - -Denable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ - -Denable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ - -Dpkgconfig-sysroot-path=${PKG_CONFIG_SYSROOT_DIR} \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-introspection-data=true', '-Denable-introspection-data=false', d)} \ - ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ -" - -# Need to ensure ld.so.conf exists so prelink-native works -# both before we build and if we install from sstate -do_configure[prefuncs] += "gobject_introspection_preconfigure" -python gobject_introspection_preconfigure () { - oe.utils.write_ld_so_conf(d) -} - -do_configure_prepend_class-native() { - # Tweak the native python scripts so that they don't refer to the - # full path of native python binary (the solution is taken from glib-2.0 recipe) - # This removes the risk of exceeding Linux kernel's shebang line limit (128 bytes) - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in -} - -do_configure_prepend_class-target() { - # Write out a qemu wrapper that will be given to gi-scanner so that it - # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" - cat > ${B}/g-ir-scanner-qemuwrapper << EOF -#!/bin/sh -# Use a modules directory which doesn't exist so we don't load random things -# which may then get deleted (or their dependencies) and potentially segfault -export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy - -$qemu_binary "\$@" -if [ \$? -ne 0 ]; then - echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the recipe should help." - echo "(typically like this: GIR_EXTRA_LIBS_PATH=\"$""{B}/something/.libs\" )" - exit 1 -fi -EOF - chmod +x ${B}/g-ir-scanner-qemuwrapper - - # Write out a wrapper for g-ir-scanner itself, which will be used when building introspection files - # for glib-based packages. This wrapper calls the native version of the scanner, and tells it to use - # a qemu wrapper for running transient target binaries produced by the scanner, and an include directory - # from the target sysroot. - cat > ${B}/g-ir-scanner-wrapper << EOF -#!/bin/sh -# This prevents g-ir-scanner from writing cache data to $HOME -export GI_SCANNER_DISABLE_CACHE=1 - -g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 --add-include-path=${STAGING_LIBDIR}/gir-1.0 "\$@" -EOF - chmod +x ${B}/g-ir-scanner-wrapper - - # Write out a wrapper for g-ir-compiler, which runs the target version of it through qemu. - # g-ir-compiler writes out the raw content of a C struct to disk, and therefore is architecture dependent. - cat > ${B}/g-ir-compiler-wrapper << EOF -#!/bin/sh -${STAGING_BINDIR}/g-ir-scanner-qemuwrapper ${STAGING_BINDIR}/g-ir-compiler "\$@" -EOF - chmod +x ${B}/g-ir-compiler-wrapper - - # Write out a wrapper to use instead of ldd, which does not work when a binary is built - # for a different architecture - cat > ${B}/g-ir-scanner-lddwrapper << EOF -#!/bin/sh -prelink-rtld --root=$STAGING_DIR_HOST "\$@" -EOF - chmod +x ${B}/g-ir-scanner-lddwrapper - - # Also tweak the target python scripts so that they don't refer to the - # native version of python binary (the solution is taken from glib-2.0 recipe) - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in -} - -do_compile_prepend() { - # This prevents g-ir-scanner from writing cache data to $HOME - export GI_SCANNER_DISABLE_CACHE=1 - - # Needed to run g-ir unit tests, which won't be able to find the built libraries otherwise - export GIR_EXTRA_LIBS_PATH=$B/.libs -} - -# Our wrappers need to be available system-wide, because they will be used -# to build introspection files for all other gobject-based packages -do_install_append_class-target() { - install -d ${D}${bindir}/ - install ${B}/g-ir-scanner-qemuwrapper ${D}${bindir}/ - install ${B}/g-ir-scanner-wrapper ${D}${bindir}/ - install ${B}/g-ir-compiler-wrapper ${D}${bindir}/ - install ${B}/g-ir-scanner-lddwrapper ${D}${bindir}/ -} - -# we need target versions of introspection tools in sysroot so that they can be run via qemu -# when building introspection files in other packages -SYSROOT_DIRS_append_class-target = " ${bindir}" - -SYSROOT_PREPROCESS_FUNCS_append_class-target = " gi_binaries_sysroot_preprocess" -gi_binaries_sysroot_preprocess() { - # Tweak the binary names in the introspection pkgconfig file, so that it - # picks up our wrappers which do the cross-compile and qemu magic. - sed -i \ - -e "s|g_ir_scanner=.*|g_ir_scanner=${bindir}/g-ir-scanner-wrapper|" \ - -e "s|g_ir_compiler=.*|g_ir_compiler=${bindir}/g-ir-compiler-wrapper|" \ - ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc -} - -SYSROOT_PREPROCESS_FUNCS_append = " gi_ldsoconf_sysroot_preprocess" -gi_ldsoconf_sysroot_preprocess () { - mkdir -p ${SYSROOT_DESTDIR}${bindir} - dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} - echo "#!/bin/sh" > $dest - echo "mkdir -p ${STAGING_DIR_TARGET}${sysconfdir}" >> $dest - echo "echo ${base_libdir} >> ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest - echo "echo ${libdir} >> ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest - chmod 755 $dest -} - -# Remove wrapper files from the package, only used for cross-compiling -PACKAGE_PREPROCESS_FUNCS += "gi_package_preprocess" -gi_package_preprocess() { - rm -f ${PKGD}${bindir}/g-ir-scanner-qemuwrapper - rm -f ${PKGD}${bindir}/g-ir-scanner-wrapper - rm -f ${PKGD}${bindir}/g-ir-compiler-wrapper - rm -f ${PKGD}${bindir}/g-ir-scanner-lddwrapper -} - -SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir postinst-ldsoconf-${PN}" - -# .typelib files are needed at runtime and so they go to the main package -FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" - -# .gir files go to dev package, as they're needed for developing (but not for running) -# things that depends on introspection. -FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" -FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" - -# These are used by gobject-based packages -# to generate transient introspection binaries -FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/gdump.c \ - ${datadir}/gobject-introspection-1.0/Makefile.introspection" - -# These are used by dependent packages (e.g. pygobject) to build their -# testsuites. -FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ - ${datadir}/gobject-introspection-1.0/tests/*.h" - -FILES_${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" -FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" - -RDEPENDS_${PN} = "python3-pickle python3-xml" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch deleted file mode 100644 index fc747fb..0000000 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas/0001-remove-cross-compile-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4de526e6188af4a4b2f4765d1989c4a6fd66a4e5 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Wed, 3 Apr 2019 20:40:05 -0400 -Subject: [PATCH] remove cross compile check - ---- - headers/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/headers/meson.build b/headers/meson.build -index 3ce8b61..1132695 100644 ---- a/headers/meson.build -+++ b/headers/meson.build -@@ -19,7 +19,7 @@ enums_xml = custom_target( - install: true, - install_dir: schemasdir) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - noinst_lib = shared_library('noinst', - headers, - install: false) diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb deleted file mode 100644 index 6a19a12..0000000 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.32.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "GNOME desktop-wide GSettings schemas" -HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "glib-2.0 intltool-native" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even - -EXTRA_OEMESON = "-Dintrospection=true" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-remove-cross-compile-check.patch \ - " -SRC_URI[archive.md5sum] = "0c2d468a482c12594757442c983aa8ea" -SRC_URI[archive.sha256sum] = "2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35" diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.36.1.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.38.0.bb similarity index 63% rename from meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.36.1.bb rename to meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.38.0.bb index 168f920..eca0cda 100644 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.36.1.bb +++ b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.38.0.bb @@ -12,9 +12,7 @@ inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-ev EXTRA_OEMESON = "-Dintrospection=true" -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-remove-cross-compile-check.patch \ - " -SRC_URI[archive.md5sum] = "708ddd8dec388ebda5539667604197c3" -SRC_URI[archive.sha256sum] = "004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" +SRC_URI[archive.md5sum] = "465a98f5ab8a5ca896009228257fc40d" +SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67" diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3.inc b/meta-gnome/recipes-gnome/gtk+/gtk+3.inc index f0b38a1..e0690fa 100644 --- a/meta-gnome/recipes-gnome/gtk+/gtk+3.inc +++ b/meta-gnome/recipes-gnome/gtk+/gtk+3.inc @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection +inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection BBCLASSEXTEND = "native nativesdk" @@ -102,6 +102,7 @@ FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ ${libdir}/gtk-3.0/modules/*.so" FILES_${PN}-dev += " \ + ${datadir}/gtk-3.0/valgrind \ ${datadir}/gtk-3.0/gtkbuilder.rng \ ${datadir}/gtk-3.0/include \ ${datadir}/gettext/its \ diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.14.bad b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.14.bad deleted file mode 100644 index ab1f87c..0000000 --- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.24.14.bad +++ /dev/null @@ -1,20 +0,0 @@ -require gtk+3.inc - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://0001-Hardcoded-libtool.patch \ - file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ - file://0003-Add-disable-opengl-configure-option.patch \ - file://link_fribidi.patch \ - file://sort-resources.patch \ - " -SRC_URI[md5sum] = "62e39212fa0a84016a3392a9d291faf8" -SRC_URI[sha256sum] = "1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.46.1.bb similarity index 93% rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.46.1.bb index e3c39bd..a8533de 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.46.1.bb @@ -9,8 +9,8 @@ DEPENDS += "libsecret glib-2.0 gconf libgudev udisks2 polkit shadow-native libus SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974" -SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46" +SRC_URI[archive.md5sum] = "3013dca31a373202779d0f9652118fe2" +SRC_URI[archive.sha256sum] = "621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503" EXTRA_OEMESON = " \ -Dadmin=false \ diff --git a/meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb similarity index 69% rename from meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb rename to meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb index 8b846b1..eebb26b 100644 --- a/meta-gnome/recipes-gnome/libgee/libgee_0.20.1.bb +++ b/meta-gnome/recipes-gnome/libgee/libgee_0.20.3.bb @@ -2,8 +2,8 @@ SUMMARY = "A collection library providing GObject based interfaces and classes f LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[archive.md5sum] = "d224dca55bb909f6730f40cc267337be" -SRC_URI[archive.sha256sum] = "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630" +SRC_URI[archive.md5sum] = "e574b3952b93d219b5ec7c74c5892c33" +SRC_URI[archive.sha256sum] = "d0b5edefc88cbca5f1709d19fa62aef490922c6577a14ac4e7b085507911a5de" DEPENDS = "glib-2.0" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Fix-hostleak-in-link-path.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Fix-hostleak-in-link-path.patch new file mode 100644 index 0000000..39b139b --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Fix-hostleak-in-link-path.patch @@ -0,0 +1,22 @@ +From fd7b272714b62e5193faef8be56d0722361fd282 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Sun, 1 Nov 2020 08:54:33 -0500 +Subject: [PATCH] Fix hostleak in link path + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 472f44b..aa7c729 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -270,7 +270,7 @@ AC_ARG_ENABLE(fatal-warnings, + [Define to enable fatal warnings])) + + dnl These definitions are expanded in make. +-LIBGTOP_LIBS='-L$(libdir)' ++LIBGTOP_LIBS='-L=$(libdir)' + LIBGTOP_INCS='-I$(includedir)/libgtop-2.0' + + if test x$libgtop_have_sysinfo = xyes ; then diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb similarity index 62% rename from meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb rename to meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index ed7d964..c971d16 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -3,12 +3,13 @@ HOMEPAGE = "https://developer.gnome.org/libgtop/stable/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_URI[archive.md5sum] = "bb0ce7de6b28694b40405eedac8a31b5" -SRC_URI[archive.sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612" - DEPENDS = "libx11 glib-2.0 libxau" inherit gnomebase perlnative gettext pkgconfig autotools +SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947" +SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" +SRC_URI += " file://0001-Fix-hostleak-in-link-path.patch" + EXTRA_OECONF = "--with-examples=no" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb similarity index 78% rename from meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb rename to meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb index c5dab7e..5b4628c 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.0.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://wiki.gnome.org/Projects/LibGWeather" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI[archive.md5sum] = "68f28c2abb89ed2182aea6752d685cc6" -SRC_URI[archive.sha256sum] = "de9a2b392a8b27e012ed80bb9c950085692cd8e898c367c092df15f964a91d13" +SRC_URI[archive.md5sum] = "d6081108f9c224c5cb594f8ccb025db9" +SRC_URI[archive.sha256sum] = "de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450" DEPENDS = "gtk+3 libxml2 libsoup-2.4 glib-2.0 itstool-native geocode-glib glib-2.0-native" diff --git a/meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb b/meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb new file mode 100644 index 0000000..ed65fee --- /dev/null +++ b/meta-gnome/recipes-gnome/libhandy/libhandy_1.0.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "A library full of GTK widgets for mobile phones" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/libhandy" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0 glib-2.0-native libxml2-native gtk+3" +GIR_MESON_ENABLE_FLAG = "enabled" +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase vala gobject-introspection + +SRC_URI[archive.md5sum] = "3cdc0b2274b41770ad4758e612f4c16d" +SRC_URI[archive.sha256sum] = "a9398582f47b7d729205d6eac0c068fef35aaf249fdd57eea3724f8518d26699" + diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch deleted file mode 100644 index 7b0576a..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0001-dont-generate-default-modes-header.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2565becb5e6b0ea2b11f79256a83ec7626c10b97 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Sat, 6 Apr 2019 20:06:32 -0400 -Subject: [PATCH] dont generate default modes header - ---- - src/backends/native/meta-default-modes.h | 57 ++++++++++++++++++++++++ - src/meson.build | 8 ---- - 2 files changed, 57 insertions(+), 8 deletions(-) - create mode 100644 src/backends/native/meta-default-modes.h - -diff --git a/src/backends/native/meta-default-modes.h b/src/backends/native/meta-default-modes.h -new file mode 100644 -index 0000000..8b45f9f ---- /dev/null -+++ b/src/backends/native/meta-default-modes.h -@@ -0,0 +1,57 @@ -+/* Generated by gen-default-modes.py */ -+ -+static const drmModeModeInfo meta_default_landscape_drm_mode_infos[] = { -+{ 38250, 800, 832, 912, 1024, 0, 600, 603, 607, 624, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "800x600_60.00" }, -+{ 63500, 1024, 1072, 1176, 1328, 0, 768, 771, 775, 798, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1024x768_60.00" }, -+{ 81750, 1152, 1216, 1336, 1520, 0, 864, 867, 871, 897, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1152x864_60.00" }, -+{ 101250, 1280, 1360, 1488, 1696, 0, 960, 963, 967, 996, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x960_60.00" }, -+{ 121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1400x1050_60.00" }, -+{ 129000, 1440, 1528, 1680, 1920, 0, 1080, 1083, 1087, 1120, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x1080_60.00" }, -+{ 161000, 1600, 1712, 1880, 2160, 0, 1200, 1203, 1207, 1245, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x1200_60.00" }, -+{ 233500, 1920, 2064, 2264, 2608, 0, 1440, 1443, 1447, 1493, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1440_60.00" }, -+{ 267250, 2048, 2208, 2424, 2800, 0, 1536, 1539, 1543, 1592, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2048x1536_60.00" }, -+{ 83500, 1280, 1352, 1480, 1680, 0, 800, 803, 809, 831, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x800_60.00" }, -+{ 106500, 1440, 1528, 1672, 1904, 0, 900, 903, 909, 934, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x900_60.00" }, -+{ 146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1680x1050_60.00" }, -+{ 193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1200_60.00" }, -+{ 348500, 2560, 2760, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2560x1600_60.00" }, -+{ 74500, 1280, 1344, 1472, 1664, 0, 720, 723, 728, 748, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x720_60.00" }, -+{ 85250, 1368, 1440, 1576, 1784, 0, 768, 771, 781, 798, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1368x768_60.00" }, -+{ 118250, 1600, 1696, 1856, 2112, 0, 900, 903, 908, 934, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x900_60.00" }, -+{ 173000, 1920, 2048, 2248, 2576, 0, 1080, 1083, 1088, 1120, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1080_60.00" }, -+{ 197000, 2048, 2184, 2400, 2752, 0, 1152, 1155, 1160, 1195, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2048x1152_60.00" }, -+{ 312250, 2560, 2752, 3024, 3488, 0, 1440, 1443, 1448, 1493, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2560x1440_60.00" }, -+{ 396250, 2880, 3096, 3408, 3936, 0, 1620, 1623, 1628, 1679, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x1620_60.00" }, -+{ 492000, 3200, 3456, 3800, 4400, 0, 1800, 1803, 1808, 1865, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "3200x1800_60.00" }, -+{ 712750, 3840, 4160, 4576, 5312, 0, 2160, 2163, 2168, 2237, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "3840x2160_60.00" }, -+{ 813000, 4096, 4440, 4888, 5680, 0, 2304, 2307, 2312, 2386, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "4096x2304_60.00" }, -+{ 1276500, 5120, 5560, 6128, 7136, 0, 2880, 2883, 2888, 2982, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "5120x2880_60.00" }, -+}; -+ -+static const drmModeModeInfo meta_default_portrait_drm_mode_infos[] = { -+{ 38250, 600, 603, 607, 624, 0, 800, 832, 912, 1024, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "600x800_60.00" }, -+{ 63500, 768, 771, 775, 798, 0, 1024, 1072, 1176, 1328, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "768x1024_60.00" }, -+{ 81750, 864, 867, 871, 897, 0, 1152, 1216, 1336, 1520, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "864x1152_60.00" }, -+{ 101250, 960, 963, 967, 996, 0, 1280, 1360, 1488, 1696, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "960x1280_60.00" }, -+{ 121750, 1050, 1053, 1057, 1089, 0, 1400, 1488, 1632, 1864, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1050x1400_60.00" }, -+{ 129000, 1080, 1083, 1087, 1120, 0, 1440, 1528, 1680, 1920, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1080x1440_60.00" }, -+{ 161000, 1200, 1203, 1207, 1245, 0, 1600, 1712, 1880, 2160, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1200x1600_60.00" }, -+{ 233500, 1440, 1443, 1447, 1493, 0, 1920, 2064, 2264, 2608, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x1920_60.00" }, -+{ 267250, 1536, 1539, 1543, 1592, 0, 2048, 2208, 2424, 2800, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1536x2048_60.00" }, -+{ 83500, 800, 803, 809, 831, 0, 1280, 1352, 1480, 1680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "800x1280_60.00" }, -+{ 106500, 900, 903, 909, 934, 0, 1440, 1528, 1672, 1904, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "900x1440_60.00" }, -+{ 146250, 1050, 1053, 1059, 1089, 0, 1680, 1784, 1960, 2240, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1050x1680_60.00" }, -+{ 193250, 1200, 1203, 1209, 1245, 0, 1920, 2056, 2256, 2592, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1200x1920_60.00" }, -+{ 348500, 1600, 1603, 1609, 1658, 0, 2560, 2760, 3032, 3504, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x2560_60.00" }, -+{ 74500, 720, 723, 728, 748, 0, 1280, 1344, 1472, 1664, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "720x1280_60.00" }, -+{ 85250, 768, 771, 781, 798, 0, 1368, 1440, 1576, 1784, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "768x1368_60.00" }, -+{ 118250, 900, 903, 908, 934, 0, 1600, 1696, 1856, 2112, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "900x1600_60.00" }, -+{ 173000, 1080, 1083, 1088, 1120, 0, 1920, 2048, 2248, 2576, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1080x1920_60.00" }, -+{ 197000, 1152, 1155, 1160, 1195, 0, 2048, 2184, 2400, 2752, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1152x2048_60.00" }, -+{ 312250, 1440, 1443, 1448, 1493, 0, 2560, 2752, 3024, 3488, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x2560_60.00" }, -+{ 396250, 1620, 1623, 1628, 1679, 0, 2880, 3096, 3408, 3936, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1620x2880_60.00" }, -+{ 492000, 1800, 1803, 1808, 1865, 0, 3200, 3456, 3800, 4400, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1800x3200_60.00" }, -+{ 712750, 2160, 2163, 2168, 2237, 0, 3840, 4160, 4576, 5312, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2160x3840_60.00" }, -+{ 813000, 2304, 2307, 2312, 2386, 0, 4096, 4440, 4888, 5680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2304x4096_60.00" }, -+{ 1276500, 2880, 2883, 2888, 2982, 0, 5120, 5560, 6128, 7136, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x5120_60.00" }, -+}; -diff --git a/src/meson.build b/src/meson.build -index 8779c95..12229a9 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -604,14 +604,6 @@ dbus_idle_monitor_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor', - mutter_built_sources += dbus_idle_monitor_built_sources - - if have_native_backend -- cvt = find_program('cvt') -- -- gen_default_modes = find_program('backends/native/gen-default-modes.py') -- default_modes_h = custom_target('meta-default-modes', -- output: 'meta-default-modes.h', -- command: [gen_default_modes, '@OUTPUT@'] -- ) -- mutter_built_sources += default_modes_h - - gdbus_codegen = find_program('gdbus-codegen') - dbus_login1_built_sources = custom_target('meta-dbus-login1', diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch deleted file mode 100644 index 7d1b8a8..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-private-get_client_pid.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e03f5efe9ac52ec06257ec8cf9ef45eb109d0f43 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Sat, 6 Apr 2019 20:23:15 -0400 -Subject: [PATCH] remove private get_client_pid - ---- - src/core/window-private.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/core/window-private.h b/src/core/window-private.h -index 9fe5bc5..c1a0e9e 100644 ---- a/src/core/window-private.h -+++ b/src/core/window-private.h -@@ -771,8 +771,6 @@ void meta_window_handle_leave (MetaWindow *window); - void meta_window_handle_ungrabbed_event (MetaWindow *window, - const ClutterEvent *event); - --uint32_t meta_window_get_client_pid (MetaWindow *window); -- - void meta_window_get_client_area_rect (const MetaWindow *window, - cairo_rectangle_int_t *rect); - void meta_window_get_titlebar_rect (MetaWindow *window, diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch b/meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch deleted file mode 100644 index 4246884..0000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0002-export-get_client_pid.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4cf17283901981e0528ef889fa610bef79382dc1 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Sat, 6 Apr 2019 20:10:23 -0400 -Subject: [PATCH] export get_client_pid - ---- - src/meta/window.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/meta/window.h b/src/meta/window.h -index 6261fff..2b5f711 100644 ---- a/src/meta/window.h -+++ b/src/meta/window.h -@@ -334,6 +334,9 @@ guint32 meta_window_get_user_time (MetaWindow *window); - META_EXPORT - int meta_window_get_pid (MetaWindow *window); - -+META_EXPORT -+guint32 meta_window_get_client_pid (MetaWindow *window); -+ - META_EXPORT - const char *meta_window_get_client_machine (MetaWindow *window); - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.36.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.38.1.bb similarity index 85% rename from meta-gnome/recipes-gnome/mutter/mutter_3.36.4.bb rename to meta-gnome/recipes-gnome/mutter/mutter_3.38.1.bb index bf6c027..3641a34 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.36.4.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.38.1.bb @@ -35,14 +35,14 @@ DEPENDS = " \ gobject-introspection-native \ " -RDEPENDS_${PN} += " xserver-xorg-xwayland zenity" +RDEPENDS_${PN} += " xserver-xorg-xwayland zenity" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even distro_features_check +inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "b8efc78dd728792679b1bbe14d0f7f60" -SRC_URI[archive.sha256sum] = "5a81911479790b077517b78a8a6ea445f8217e0e1f2734f93c060a67387d725c" +SRC_URI[archive.md5sum] = "df053c03ed2264e7b6dfd453ed5103ea" +SRC_URI[archive.sha256sum] = "e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33" # x11 is still mandatory - see meson.build REQUIRED_DISTRO_FEATURES = "x11 systemd" @@ -62,9 +62,9 @@ EXTRA_OEMESON += " \ -Dgles2_libname=libGLESv2.so.2 \ " -MUTTER_API_NAME = "mutter-6" +MUTTER_API_NAME = "mutter-7" -#do_compile_prepend() { +#do_compile_prepend() { # export GIR_EXTRA_LIBS_PATH="${B}/cogl/cogl/.libs:${B}/cogl/cogl-pango/.libs:${B}/cogl/cogl-path/.libs:${B}/clutter/clutter/.libs" #} diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb deleted file mode 100644 index b1f1fcb..0000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.30.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GNOME file manager" -HOMEPAGE = "https://wiki.gnome.org/action/show/Apps/Files" - -LICENSE = "GPLv3 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ - file://libnautilus-extension/LICENSE;md5=321bf41f280cf805086dd5a720b37785" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext - -SRC_URI[archive.md5sum] = "1149a9aa289ddc0db2157c77e0399e1d" -SRC_URI[archive.sha256sum] = "78269bbb0ce538cb9f40dd2feae4fc56dbb7c06651a6b5c9258f6b9631cb4084" - - -FILES_${PN} += "\ - ${datadir}/glib-2.0/schemas \ - ${datadir}/gnome-shell/search-providers \ - ${datadir}/metainfo/org.gnome.Nautilus.appdata.xml \ - ${datadir}/icons/hicolor/ \ - ${datadir}/dbus-1/services \ -" - -DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker gexiv2" - -EXTRA_OEMESON = "-Dselinux=false -Dpackagekit=false -Dextensions=false -Dintrospection=true" - -do_install_append () { - rm ${D}${datadir}/applications/nautilus-autorun-software.desktop -} diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.38.1.bb similarity index 73% rename from meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb rename to meta-gnome/recipes-gnome/nautilus/nautilus_3.38.1.bb index dbb4729..88257d2 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.38.1.bb @@ -6,22 +6,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ file://libnautilus-extension/LICENSE;md5=321bf41f280cf805086dd5a720b37785" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gettext +inherit gnomebase gobject-introspection gettext mime-xdg -SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" -SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" +SRC_URI[archive.md5sum] = "d635012bc7d2b699e2bda950d0ea705a" +SRC_URI[archive.sha256sum] = "0a3e812b13b774b7fd6f222f55acd1f87fb2973d9af60c04b7d25cb52222d0fd" FILES_${PN} += "\ ${datadir}/glib-2.0/schemas \ ${datadir}/gnome-shell/search-providers \ ${datadir}/metainfo/org.gnome.Nautilus.appdata.xml \ + ${datadir}/tracker3 \ ${datadir}/icons/hicolor/ \ ${datadir}/dbus-1/services \ " DEPENDS += "gtk+3 glib-2.0 pango gnome-autoar libxml2 gnome-desktop tracker gexiv2" -EXTRA_OEMESON = "-Dselinux=false -Dpackagekit=false -Dextensions=false -Dintrospection=true" +EXTRA_OEMESON = "-Dselinux=false -Dpackagekit=false -Dextensions=false -Dintrospection=true -Dtests=none" do_install_append () { rm ${D}${datadir}/applications/nautilus-autorun-software.desktop diff --git a/meta-gnome/recipes-gnome/pango/pango_1.42.4.bb b/meta-gnome/recipes-gnome/pango/pango_1.42.4.bb deleted file mode 100644 index d4c5b7b..0000000 --- a/meta-gnome/recipes-gnome/pango/pango_1.42.4.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Framework for layout and rendering of internationalized text" -DESCRIPTION = "Pango is a library for laying out and rendering of text, \ -with an emphasis on internationalization. Pango can be used anywhere \ -that text layout is needed, though most of the work on Pango so far has \ -been done in the context of the GTK+ widget toolkit. Pango forms the \ -core of text and font handling for GTK+-2.x." -HOMEPAGE = "http://www.pango.org/" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" -LICENSE = "LGPLv2.0+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection - -SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" -SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" - -DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" - -EXTRA_AUTORECONF = "" - -EXTRA_OECONF = " \ - --disable-debug \ - " - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" - -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend_class-target () { - if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="${BUILD_LDFLAGS}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode - fi -} - -FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" - -RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ - pango-module-basic-fc pango-module-arabic-lang" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch b/meta-gnome/recipes-gnome/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch deleted file mode 100644 index c3f1d04..0000000 --- a/meta-gnome/recipes-gnome/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9b3fd8d4c683a8a1c57e6c758916d1e1392ec4cf Mon Sep 17 00:00:00 2001 -From: brl -Date: Sun, 7 Jan 2018 21:01:49 -0500 -Subject: [PATCH] assume sqlite built threadsafe and with fts5 - ---- - m4/sqlite-builtin-fts5.m4 | 2 +- - m4/sqlite-threadsafe.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/sqlite-builtin-fts5.m4 b/m4/sqlite-builtin-fts5.m4 -index 635f15d..39b17d8 100644 ---- a/m4/sqlite-builtin-fts5.m4 -+++ b/m4/sqlite-builtin-fts5.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([AX_SQLITE_BUILTIN_FTS5], - if (rc!=SQLITE_OK) return -1;]])], - [ax_cv_sqlite_builtin_fts5=yes], - [ax_cv_sqlite_builtin_fts5=no], -- [ax_cv_sqlite_builtin_fts5=no])]) -+ [ax_cv_sqlite_builtin_fts5=yes])]) - - CFLAGS="$OLD_CFLAGS" - LDFLAGS="$OLD_LDFLAGS" -diff --git a/m4/sqlite-threadsafe.m4 b/m4/sqlite-threadsafe.m4 -index 75bdfbf..68d3ec9 100644 ---- a/m4/sqlite-threadsafe.m4 -+++ b/m4/sqlite-threadsafe.m4 -@@ -45,7 +45,7 @@ int main () - ]])], - [ax_cv_sqlite_threadsafe=yes], - [ax_cv_sqlite_threadsafe=no], -- [ax_cv_sqlite_threadsafe=no])]) -+ [ax_cv_sqlite_threadsafe=yes])]) - - LIBS="$save_LIBS" - ]) --- -2.14.3 - diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.1.5.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.0.1.bb similarity index 52% rename from meta-gnome/recipes-gnome/tracker/tracker_2.1.5.bb rename to meta-gnome/recipes-gnome/tracker/tracker_3.0.1.bb index 310f5c8..841e5d7 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker_2.1.5.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker_3.0.1.bb @@ -4,43 +4,55 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=506ab4920510c723c01689e212f41404 \ file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/libtracker-miner/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/libtracker-common/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/libtracker-data/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" -inherit gettext pkgconfig pythonnative gnomebase vala -SRC_URI += "file://0001-assume-sqlite-built-threadsafe-and-with-fts5.patch " -SRC_URI[archive.md5sum] = "8c4b86386b9b7d2c1a75218af582458e" -SRC_URI[archive.sha256sum] = "b234b7573773b904dc3e885ff5ec44e86b035767cde783bc50d65d12cd72861e" +GNOMEBASEBUILDCLASS = "meson" +inherit gettext pkgconfig python3native gnomebase vala gobject-introspection +SRC_URI[archive.md5sum] = "173668f5d1a890a494d681457ac7029b" +SRC_URI[archive.sha256sum] = "39a3a326f4708a65f3f48771465b93097d25d697069e41e1b947bdaecad10ce6" + +WARN_QA_remove = "unknown-configure-option" DEPENDS = "intltool-native libunistring sqlite3 dbus upower networkmanager bash-completion glib-2.0-native libsoup-2.4 libxml2 json-glib" +# Insert a line into meson.cross under [properties] header: +# +# [properties] +# sqlite3_has_fts5 = 'true' +# +# Fixes this: +# +# ../tracker-3.0.1/meson.build:99:2: ERROR: Unknown cross property: sqlite3_has_fts5. +# + +do_write_config_append() { + sed -i -e "/^\[properties\]/a sqlite3_has_fts5 = 'true'" ${WORKDIR}/meson.cross +} FILES_${PN} += "\ ${libdir}/systemd/user/tracker-store.service \ - ${libdir}/tracker-2.0 \ + ${libdir}/systemd/user \ ${datadir}/glib-2.0/schemas \ ${datadir}/bash-completion/completions \ ${datadir}/dbus-1/services \ + ${datadir}/tracker3 \ " FILES_${PN}-dev += "\ ${datadir}/vala/vapi \ " -FILES_${PN}-staticdev += "\ - ${libdir}/tracker-2.0/libtracker-data.a \ - ${libdir}/tracker-2.0/libtracker-common.a \ -" +#FILES_${PN}-staticdev += "\ +# ${libdir}/tracker-2.0/libtracker-data.a \ +# ${libdir}/tracker-2.0/libtracker-common.a \ +#" INSANE_SKIP_${PN} += "dev-so" -EXTRA_OECONF = "\ - --with-unicode-support=libunistring \ - --enable-minimal \ - --disable-introspection \ - --disable-libstemmer \ - --disable-journal \ - --disable-network-manager \ +EXTRA_OEMESON = "\ + -Ddocs=false \ + -Dman=false \ + -Dnetwork_manager=disabled \ + -Dbash_completion=false \ + -Dtest_utils=false \ " - - diff --git a/meta-gnome/recipes-gnome/vte/vte_0.60.3.bb b/meta-gnome/recipes-gnome/vte/vte_0.62.0.bb similarity index 86% rename from meta-gnome/recipes-gnome/vte/vte_0.60.3.bb rename to meta-gnome/recipes-gnome/vte/vte_0.62.0.bb index 3783973..97c97c0 100644 --- a/meta-gnome/recipes-gnome/vte/vte_0.60.3.bb +++ b/meta-gnome/recipes-gnome/vte/vte_0.62.0.bb @@ -14,10 +14,10 @@ DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = 'gir' -inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection +inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "4214712ecab2d50e2a3a07897c3ada49" -SRC_URI[archive.sha256sum] = "feb76e1181a357d86112d447a08d127e2081438df76ece83243b18609dd9822a" +SRC_URI[archive.md5sum] = "7562e1dbe1992a48cbcfd10b7acc3ff6" +SRC_URI[archive.sha256sum] = "4d2d246ed47f08cc73f6471aa8e9f378998b7d0f7dcb0c433f29da5839dbb016" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-gnome/wayland/libinput/determinism.patch b/meta-gnome/recipes-gnome/wayland/libinput/determinism.patch deleted file mode 100644 index cb55403..0000000 --- a/meta-gnome/recipes-gnome/wayland/libinput/determinism.patch +++ /dev/null @@ -1,21 +0,0 @@ -This finds our outer git tree and that version information breaks -determinism of this recipe. Disable it. - -RP 2020/2/6 - -Upstream-Status: Pending -Signed-off-by: Richard Purdie - -Index: libinput-1.14.3/meson.build -=================================================================== ---- libinput-1.14.3.orig/meson.build -+++ libinput-1.14.3/meson.build -@@ -387,7 +387,7 @@ pkgconfig.generate( - libraries : lib_libinput - ) - --git_version_h = vcs_tag(command : ['git', 'describe'], -+git_version_h = vcs_tag(command : ['false'], - fallback : 'unknown', - input : 'src/libinput-git-version.h.in', - output :'libinput-git-version.h') diff --git a/meta-gnome/recipes-gnome/wayland/libinput_1.15.2.bb b/meta-gnome/recipes-gnome/wayland/libinput_1.15.2.bb deleted file mode 100644 index 8105327..0000000 --- a/meta-gnome/recipes-gnome/wayland/libinput_1.15.2.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -DESCRIPTION = "libinput is a library to handle input devices in Wayland \ -compositors and to provide a generic X.Org input driver. It provides \ -device detection, device handling, input device event processing and \ -abstraction so minimize the amount of custom input code compositors need to \ -provide the common set of functionality that users expect." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" - -DEPENDS = "libevdev udev mtdev" - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://determinism.patch \ - " -SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" -SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" - -UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig lib_package - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" - -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ - -Ddocumentation=false \ - -Dtests=false \ - -Dzshcompletiondir=no" - -# package name changed in 1.8.1 upgrade: make sure package upgrades work -RPROVIDES_${PN} = "libinput" -RREPLACES_${PN} = "libinput" -RCONFLICTS_${PN} = "libinput" - diff --git a/meta-gnome/recipes-gnome/wayland/mtdev_1.1.6.bb b/meta-gnome/recipes-gnome/wayland/mtdev_1.1.6.bb deleted file mode 100644 index 7c1cb5e..0000000 --- a/meta-gnome/recipes-gnome/wayland/mtdev_1.1.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Multitouch Protocol Translation Library" - -DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ -multitouch events to the slotted type B protocol. The events put into mtdev may \ -be from any MT device, specifically type A without contact tracking, type A with \ -contact tracking, or type B with contact tracking" - -HOMEPAGE = "http://bitmath.org/code/mtdev/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" - -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" -SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" -SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" - -inherit autotools pkgconfig diff --git a/meta-gnome/recipes-gnome/wayland/wayland-protocols_1.20.bb b/meta-gnome/recipes-gnome/wayland/wayland-protocols_1.20.bb deleted file mode 100644 index 3fb78f6..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland-protocols_1.20.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - " -SRC_URI[md5sum] = "b0836533a3f2dc6585b1dae00341157f" -SRC_URI[sha256sum] = "9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit allarch autotools pkgconfig - -PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/meta-gnome/recipes-gnome/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta-gnome/recipes-gnome/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch deleted file mode 100644 index e445838..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Thu, 20 Feb 2020 15:20:45 -0600 -Subject: [PATCH] build: Fix strndup detection on MinGW - -GCC and meson conspire together to incorrectly detect that strndup() -exists on MinGW as __builtin_strndup, when no such function exists. As a -work around, meson will skip looking for __builtin functions if an -'#include' is in the prefix, so add '#include ' when looking -for strndup(). - -See: https://github.com/mesonbuild/meson/issues/3672 - -Signed-off-by: Joshua Watt -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 26b084f..c05d019 100644 ---- a/meson.build -+++ b/meson.build -@@ -36,11 +36,11 @@ have_funcs = [ - 'posix_fallocate', - 'prctl', - 'memfd_create', -- 'strndup', - ] - foreach f: have_funcs - config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) - endforeach -+config_h.set('HAVE_STRNDUP', cc.has_function('strndup', prefix:'#include ')) - - if get_option('libraries') - ffi_dep = dependency('libffi') --- -2.17.1 - diff --git a/meta-gnome/recipes-gnome/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/meta-gnome/recipes-gnome/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch deleted file mode 100644 index 61de0e0..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch +++ /dev/null @@ -1,115 +0,0 @@ -From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sat, 15 Feb 2020 02:03:45 +0000 -Subject: [PATCH] meson/tests: add missing dependencies on protocol headers - -In file included from ../tests/connection-test.c:43: -In file included from ../tests/test-compositor.h:30: -../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found - #include "wayland-client-protocol.h" - ^~~~~~~~~~~~~~~~~~~~~~~~~~~ -In file included from ../tests/display-test.c:45: -In file included from ../src/wayland-server.h:104: -src/wayland-server-protocol.h:4454:2: error: unterminated /* comment - /** - ^ -In file included from ../tests/cpp-compile-test.cpp:2: -In file included from src/wayland-server-protocol.h:8: -In file included from ../src/wayland-server.h:104: -src/wayland-server-protocol.h:3:2: error: unterminated conditional directive - #ifndef WAYLAND_SERVER_PROTOCOL_H - ^ -../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h! - #error including wayland-server-protocol.h did not include wayland-server.h! - ^ -In file included from ../tests/headers-protocol-test.c:26: -In file included from src/wayland-client-protocol.h:8: -In file included from ../src/wayland-client.h:40: -src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive - #ifndef WL_SHM_FORMAT_ENUM - ^ -In file included from ../tests/protocol-logger-test.c:34: -In file included from ../src/wayland-client.h:40: -src/wayland-client-protocol.h:2613:1: error: unterminated /* comment -/** -^ -../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface' - res = wl_resource_create(client, &wl_seat_interface, 4, 0); - ^ -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - tests/meson.build | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index c28a2a3..f1af7b4 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -69,7 +69,7 @@ test( - executable( - 'cpp-compile-test', - 'cpp-compile-test.cpp', -- wayland_server_protocol_core_h, -+ wayland_server_protocol_h, - include_directories: src_inc - ) - ) -@@ -91,17 +91,25 @@ tests = { - 'array-test': [], - 'client-test': [ wayland_server_protocol_h ], - 'display-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - tests_server_protocol_h, - tests_client_protocol_c, - tests_protocol_c, - ], -- 'connection-test': [ wayland_server_protocol_h ], -+ 'connection-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, -+ ], - 'event-loop-test': [ wayland_server_protocol_h ], - 'fixed-test': [], - 'interface-test': [ wayland_client_protocol_h ], - 'list-test': [], - 'map-test': [], -- 'sanity-test' : [ wayland_server_protocol_h ], -+ 'sanity-test' : [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, -+ ], - 'socket-test': [ - wayland_client_protocol_h, - wayland_server_protocol_h, -@@ -116,7 +124,7 @@ tests = { - files('../src/wayland-server.c'), - wayland_server_protocol_h, - ], -- 'resources-test': [ wayland_server_protocol_core_h ], -+ 'resources-test': [ wayland_server_protocol_h ], - 'message-test': [ - wayland_client_protocol_h, - wayland_server_protocol_h, -@@ -126,14 +134,16 @@ tests = { - wayland_server_protocol_h, - ], - 'protocol-logger-test': [ -- wayland_server_protocol_core_h, -- wayland_client_protocol_core_h, -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - ], - 'headers-test': [ -+ wayland_client_protocol_h, -+ wayland_server_protocol_h, - 'headers-protocol-test.c', -- 'headers-protocol-core-test.c', -- wayland_server_protocol_core_h, - wayland_client_protocol_core_h, -+ wayland_server_protocol_core_h, -+ 'headers-protocol-core-test.c', - ], - 'os-wrappers-test': [], - } diff --git a/meta-gnome/recipes-gnome/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta-gnome/recipes-gnome/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch deleted file mode 100644 index 2199548..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 17 Feb 2020 21:46:18 +0100 -Subject: [PATCH] Do not hardcode the path to wayland-scanner - -This results in host contamination during builds. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 294aee0..7e410fa 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -49,7 +49,7 @@ pkgconfig.generate( - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), -- 'wayland_scanner=${bindir}/wayland-scanner' -+ 'wayland_scanner=wayland-scanner' - ], - filebase: 'wayland-scanner' - ) diff --git a/meta-gnome/recipes-gnome/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta-gnome/recipes-gnome/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch deleted file mode 100644 index f98037a..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 16 Feb 2020 16:29:53 +0100 -Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH - -Otherwise, meson attempts to use the target pkg-config and fails. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - src/meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 3e8c9bf..294aee0 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -55,8 +55,7 @@ pkgconfig.generate( - ) - - if meson.is_cross_build() -- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') -- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) -+ wayland_scanner_for_build = find_program('wayland-scanner') - else - wayland_scanner_for_build = wayland_scanner - endif diff --git a/meta-gnome/recipes-gnome/wayland/wayland/run-ptest b/meta-gnome/recipes-gnome/wayland/wayland/run-ptest deleted file mode 100644 index 7e8d9de..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland/run-ptest +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -export WAYLAND_SCANNER=wayland-scanner -export TEST_DATA_DIR=tests/data -export TEST_OUTPUT_DIR=tests/output -export SED=sed -export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 -export NM=nm - -for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do - $i - if [ $? -eq 0 ]; then - echo "PASS: $i" - else - echo "FAIL: $i" - fi -done diff --git a/meta-gnome/recipes-gnome/wayland/wayland_1.18.0.bad b/meta-gnome/recipes-gnome/wayland/wayland_1.18.0.bad deleted file mode 100644 index 00be3aa..0000000 --- a/meta-gnome/recipes-gnome/wayland/wayland_1.18.0.bad +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ - file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" - -DEPENDS = "expat libffi wayland-native" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://run-ptest \ - file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ - file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ - file://0001-build-Fix-strndup-detection-on-MinGW.patch \ - file://0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch \ - " -SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" -SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit meson pkgconfig ptest - -PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," - -EXTRA_OEMESON = "-Ddocumentation=false" -EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/tests/data - cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests - cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} - cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ - cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ -} - -sysroot_stage_all_append_class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -FILES_${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-dev += "${bindir} ${datadir}/wayland" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN}-ptest += "binutils sed" diff --git a/meta-gnome/recipes-gnome/wayland/weston-init.bb b/meta-gnome/recipes-gnome/wayland/weston-init.bb deleted file mode 100644 index 2ad165c..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://init \ - file://weston.env \ - file://weston.ini \ - file://weston@.service \ - file://71-weston-drm.rules \ - file://weston-start" - -S = "${WORKDIR}" - -do_install() { - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston - - # Install Weston systemd service and accompanying udev rule - install -D -p -m0644 ${WORKDIR}/weston@.service ${D}${systemd_system_unitdir}/weston@.service - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/var:${localstatedir}:g \ - ${D}${systemd_unitdir}/system/weston@.service - install -D -p -m0644 ${WORKDIR}/71-weston-drm.rules \ - ${D}${sysconfdir}/udev/rules.d/71-weston-drm.rules - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start -} - -do_install_append_libc-musl_qemux86() { - echo "WESTON_DISABLE_ATOMIC=Y" >> ${D}${sysconfdir}/default/weston -} - -do_install_append_libc-musl_qemux86-64() { - echo "WESTON_DISABLE_ATOMIC=Y" >> ${D}${sysconfdir}/default/weston -} - -inherit update-rc.d distro_features_check systemd - -# rdepends on weston which depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -RDEPENDS_${PN} = "weston kbd" - -INITSCRIPT_NAME = "weston" -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." - -FILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini ${systemd_system_unitdir}/weston@.service ${sysconfdir}/default/weston" - -CONFFILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" - -SYSTEMD_SERVICE_${PN} = "weston@%i.service" -SYSTEMD_AUTO_ENABLE = "disable" - diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/71-weston-drm.rules b/meta-gnome/recipes-gnome/wayland/weston-init/71-weston-drm.rules deleted file mode 100644 index 1a1b8bb..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init/71-weston-drm.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fb0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="weston@root.service" -ACTION=="add", SUBSYSTEM=="drm", KERNEL=="card0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="weston@root.service" diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/init b/meta-gnome/recipes-gnome/wayland/weston-init/init deleted file mode 100644 index d3e87c6..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init/init +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -if test -e /etc/default/weston ; then - . /etc/default/weston -fi - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - - weston-start -- $OPTARGS - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/qemuall/weston.ini b/meta-gnome/recipes-gnome/wayland/weston-init/qemuall/weston.ini deleted file mode 100644 index 17ebd7f..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init/qemuall/weston.ini +++ /dev/null @@ -1,2 +0,0 @@ -[core] -backend=fbdev-backend.so diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/qemux86-64/weston.ini b/meta-gnome/recipes-gnome/wayland/weston-init/qemux86-64/weston.ini deleted file mode 100644 index e69de29..0000000 diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/qemux86/weston.ini b/meta-gnome/recipes-gnome/wayland/weston-init/qemux86/weston.ini deleted file mode 100644 index e69de29..0000000 diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/weston-start b/meta-gnome/recipes-gnome/wayland/weston-init/weston-start deleted file mode 100755 index ccc7093..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init/weston-start +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 O.S. Systems Software LTDA. -# Copyright (C) 2016 Freescale Semiconductor - -export PATH="/sbin:/usr/sbin:/bin:/usr/bin" - -usage() { - cat <] [-- ] -EOF -} - -## Module support -modules_dir=@DATADIR@/weston-start - -# Add weston extra argument -add_weston_argument() { - weston_args="$weston_args $1" -} - -# Add openvt extra argument -add_openvt_argument() { - openvt_args="$openvt_args $1" -} - -if [ -n "$WAYLAND_DISPLAY" ]; then - echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." - exit 1 -fi - -if [ -n "$WESTON_USER" ]; then - if [ -z "$WESTON_TTY" ]; then - echo "ERROR: If you have WESTON_USER variable set, you also need WESTON_TTY." - exit 1 - fi - weston_args_user="-u $WESTON_USER -t $WESTON_TTY" -fi - -if [ -n "$DISPLAY" ]; then - launcher="weston" -else - launcher="weston-launch $weston_args_user --" -fi - -openvt_args="-s" -while [ -n "$1" ]; do - if [ "$1" = "--" ]; then - shift - break - fi - openvt_args="$openvt_args $1" - shift -done - -weston_args=$* - -# Load and run modules -if [ -d "$modules_dir" ]; then - for m in "$modules_dir"/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - # process module - . $m - done -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - if [ -n "$WESTON_USER" ] - then - chown $WESTON_USER:$WESTON_USER $XDG_RUNTIME_DIR - fi -fi - -exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/weston.env b/meta-gnome/recipes-gnome/wayland/weston-init/weston.env deleted file mode 100644 index e69de29..0000000 diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/weston.ini b/meta-gnome/recipes-gnome/wayland/weston-init/weston.ini deleted file mode 100644 index 1e6dff6..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init/weston.ini +++ /dev/null @@ -1,75 +0,0 @@ -# configuration file for Weston - -[core] -#modules=xwayland.so,cms-colord.so -#shell=desktop-shell.so -#gbm-format=xrgb2101010 -require-input=false - -#[shell] -#background-image=/usr/share/backgrounds/gnome/Aqua.jpg -#background-color=0xff002244 -#background-type=tile -#clock-format=minutes -#panel-color=0x90ff0000 -#locking=true -#animation=zoom -#startup-animation=fade -#binding-modifier=ctrl -#num-workspaces=6 -#cursor-theme=whiteglass -#cursor-size=24 - -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg -#animation=fade - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/gnome-terminal - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/weston-terminal - -#[launcher] -#icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png -#path=/usr/bin/google-chrome - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/arts.png -#path=/build/weston-0lEgCh/weston-1.11.0/weston-flower - -#[input-method] -#path=/usr/lib/weston/weston-keyboard - -#[output] -#name=LVDS1 -#mode=1680x1050 -#transform=90 -#icc_profile=/usr/share/color/icc/colord/Bluish.icc - -#[output] -#name=VGA1 -#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync -#transform=flipped - -#[output] -#name=X1 -#mode=1024x768 -#transform=flipped-90 - -#[libinput] -#enable_tap=true - -#[touchpad] -#constant_accel_factor = 50 -#min_accel_factor = 0.16 -#max_accel_factor = 1.0 - -#[screen-share] -#command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize - -#[xwayland] -#path=/usr/bin/Xwayland diff --git a/meta-gnome/recipes-gnome/wayland/weston-init/weston@.service b/meta-gnome/recipes-gnome/wayland/weston-init/weston@.service deleted file mode 100644 index 39e1930..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston-init/weston@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Weston Wayland Compositor -RequiresMountsFor=/run -Conflicts=plymouth-quit.service -After=systemd-user-sessions.service plymouth-quit-wait.service - -[Service] -User=%i -PAMName=login -EnvironmentFile=-/etc/default/weston -StandardError=journal -PermissionsStartOnly=true -IgnoreSIGPIPE=no - -ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS diff --git a/meta-gnome/recipes-gnome/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-gnome/recipes-gnome/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch deleted file mode 100644 index 62b864c..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 5f2d71998eb77068cbaee2d468cbb296a42d5739 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Wed, 22 Feb 2017 15:53:30 +0200 -Subject: [PATCH] weston-launch: Provide a default version that doesn't require - PAM - -weston-launch requires PAM for starting weston as a non-root user. - -Since starting weston as root is a valid use case by itself, if -PAM is not available, provide a default version of weston-launch -without non-root-user support. - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein -Signed-off-by: Jussi Kukkonen -Signed-off-by: Denys Dmytriyenko -Signed-off-by: Ming Liu - ---- - libweston/meson.build | 16 ++++++++++++---- - libweston/weston-launch.c | 21 +++++++++++++++++++++ - meson_options.txt | 7 +++++++ - 3 files changed, 40 insertions(+), 4 deletions(-) - -diff --git a/libweston/meson.build b/libweston/meson.build -index 08d23ec..cb9fd3f 100644 ---- a/libweston/meson.build -+++ b/libweston/meson.build -@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency( - ) - - if get_option('weston-launch') -- dep_pam = cc.find_library('pam') -+ deps_weston_launch = [systemd_dep, dep_libdrm] - -- if not cc.has_function('pam_open_session', dependencies: dep_pam) -- error('pam_open_session not found for weston-launch') -+ if get_option('pam') -+ dep_pam = cc.find_library('pam') -+ if not cc.has_function('pam_open_session', dependencies: dep_pam) -+ error('pam_open_session not found for weston-launch') -+ endif -+ -+ if dep_pam.found() -+ deps_weston_launch += dep_pam -+ config_h.set('HAVE_PAM', '1') -+ endif - endif - - executable( - 'weston-launch', - 'weston-launch.c', -- dependencies: [dep_pam, systemd_dep, dep_libdrm], -+ dependencies: deps_weston_launch, - include_directories: common_inc, - install: true - ) -diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 8a711b4..54c567a 100644 ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c -@@ -51,7 +51,9 @@ - - #include - #include -+#ifdef HAVE_PAM - #include -+#endif - - #ifdef HAVE_SYSTEMD_LOGIN - #include -@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd) - #endif - - struct weston_launch { -+#ifdef HAVE_PAM - struct pam_conv pc; - pam_handle_t *ph; -+#endif - int tty; - int ttynr; - int sock[2]; -@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl) - return false; - } - -+#ifdef HAVE_PAM - static int - pam_conversation_fn(int msg_count, - const struct pam_message **messages, -@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl) - - return 0; - } -+#endif - - static int - setup_launcher_socket(struct weston_launch *wl) -@@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status) - close(wl->signalfd); - close(wl->sock[0]); - -+#ifdef HAVE_PAM - if (wl->new_user) { - err = pam_close_session(wl->ph, 0); - if (err) -@@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status) - err, pam_strerror(wl->ph, err)); - pam_end(wl->ph, err); - } -+#endif - - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - setenv("HOME", wl->pw->pw_dir, 1); - setenv("SHELL", wl->pw->pw_shell, 1); - -+#ifdef HAVE_PAM - env = pam_getenvlist(wl->ph); - if (env) { - for (i = 0; env[i]; ++i) { -@@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - } - free(env); - } -+#endif - - /* - * We open a new session, so it makes sense -@@ -745,8 +755,10 @@ static void - help(const char *name) - { - fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); -+#ifdef HAVE_PAM - fprintf(stderr, " -u, --user Start session as specified username,\n" - " e.g. -u joe, requires root.\n"); -+#endif - fprintf(stderr, " -t, --tty Start session on alternative tty,\n" - " e.g. -t /dev/tty4, requires -u option.\n"); - fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -760,7 +772,9 @@ main(int argc, char *argv[]) - int i, c; - char *tty = NULL; - struct option opts[] = { -+#ifdef HAVE_PAM - { "user", required_argument, NULL, 'u' }, -+#endif - { "tty", required_argument, NULL, 't' }, - { "verbose", no_argument, NULL, 'v' }, - { "help", no_argument, NULL, 'h' }, -@@ -772,11 +786,16 @@ main(int argc, char *argv[]) - while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { - switch (c) { - case 'u': -+#ifdef HAVE_PAM - wl.new_user = optarg; - if (getuid() != 0) { - fprintf(stderr, "weston: Permission denied. -u allowed for root only\n"); - exit(EXIT_FAILURE); - } -+#else -+ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n"); -+ exit(EXIT_FAILURE); -+#endif - break; - case 't': - tty = optarg; -@@ -828,8 +847,10 @@ main(int argc, char *argv[]) - if (setup_tty(&wl, tty) < 0) - exit(EXIT_FAILURE); - -+#ifdef HAVE_PAM - if (wl.new_user && setup_pam(&wl) < 0) - exit(EXIT_FAILURE); -+#endif - - if (setup_launcher_socket(&wl) < 0) - exit(EXIT_FAILURE); -diff --git a/meson_options.txt b/meson_options.txt -index c862ecc..73ef2c3 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -73,6 +73,13 @@ option( - ) - - option( -+ 'pam', -+ type: 'boolean', -+ value: true, -+ description: 'Define if PAM is available' -+) -+ -+option( - 'xwayland', - type: 'boolean', - value: true, diff --git a/meta-gnome/recipes-gnome/wayland/weston/weston.desktop b/meta-gnome/recipes-gnome/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-gnome/recipes-gnome/wayland/weston/weston.png b/meta-gnome/recipes-gnome/wayland/weston/weston.png deleted file mode 100644 index ea8b7e0..0000000 Binary files a/meta-gnome/recipes-gnome/wayland/weston/weston.png and /dev/null differ diff --git a/meta-gnome/recipes-gnome/wayland/weston/xwayland.weston-start b/meta-gnome/recipes-gnome/wayland/weston/xwayland.weston-start deleted file mode 100644 index b483c97..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston/xwayland.weston-start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if type Xwayland >/dev/null 2>/dev/null; then - mkdir -p /tmp/.X11-unix - - add_weston_argument "--modules=xwayland.so" -fi diff --git a/meta-gnome/recipes-gnome/wayland/weston_8.0.0.bb b/meta-gnome/recipes-gnome/wayland/weston_8.0.0.bb deleted file mode 100644 index 53cf7c2..0000000 --- a/meta-gnome/recipes-gnome/wayland/weston_8.0.0.bb +++ /dev/null @@ -1,112 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a" - -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://xwayland.weston-start \ - file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ -" -SRC_URI[md5sum] = "53e4810d852df0601d01fd986a5b22b3" -SRC_URI[sha256sum] = "7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit meson pkgconfig useradd distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" - -WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" - -EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ - ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - launch" -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" -# Weston on X11 -PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" -# Headless Weston -PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" -# Weston on framebuffer -PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev" -# weston-launch -PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" -# Weston with lcms support -PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" -# Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" -# colord CMS support -PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" -# Clients support -PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" -# Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer-1.0" -# Weston with PAM support -PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" - -do_install_append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then - chmod u+s ${D}${bindir}/weston-launch - fi -} - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ - libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" - -FILES_${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" - -FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" -SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." - -FILES_${PN}-examples = "${bindir}/*" - -FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" - -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "weston-init liberation-fonts" -RRECOMMENDS_${PN}-dev += "wayland-protocols" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/meta-gnome/recipes-support/clutter/clutter-1.0.inc b/meta-gnome/recipes-support/clutter/clutter-1.0.inc deleted file mode 100644 index 9df1d1d..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-1.0.inc +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2.1+" - -inherit clutter ptest-gnome distro_features_check upstream-version-is-even gobject-introspection -# depends on cogl-1.0 which needs opengl -REQUIRED_DISTRO_FEATURES ?= "opengl" - -DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" -PACKAGE_BEFORE_PN += "${PN}-examples" -AUTOTOOLS_AUXDIR = "${S}/build-aux" - -EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" -EDEPENDS_GLX = "virtual/libgl" -EDEPENDS_EGL = "virtual/egl" -EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" - -EDEPENDS_EVDEV = "libxkbcommon" -ERDEPENDS_EVDEV = "xkeyboard-config" - -# Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += "--disable-quartz-backend \ - --disable-win32-backend \ - --disable-cex100-backend \ - --disable-tslib-input \ - --enable-wayland-compositor \ - --enable-wayland-backend \ - " - -PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" -PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" -PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" -PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" -PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" -PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" -PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" - -# Default configuration, distros might want to override -PACKAGECONFIG ??= "egl \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" - -FILES_${PN}-examples = "${libdir}/clutter/examples" - -do_configure_prepend() { - # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this - touch -t 200001010000 ${S}/po/clutter-1.0.pot -} diff --git a/meta-gnome/recipes-support/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/meta-gnome/recipes-support/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch deleted file mode 100644 index 7b3c198..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 3a0404dfbc65c6a864e01d1200a48074e19d5def Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 2 Sep 2016 14:28:38 +0300 -Subject: [PATCH] Remove clutter.types as it is build configuration-specific. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - doc/reference/clutter.types | 122 -------------------------------------------- - 1 file changed, 122 deletions(-) - delete mode 100644 doc/reference/clutter.types - -diff --git a/doc/reference/clutter.types b/doc/reference/clutter.types -deleted file mode 100644 -index 0037acc..0000000 ---- a/doc/reference/clutter.types -+++ /dev/null -@@ -1,122 +0,0 @@ --cally_actor_get_type --cally_clone_get_type --cally_group_get_type --cally_rectangle_get_type --cally_root_get_type --cally_stage_get_type --cally_text_get_type --cally_texture_get_type --cally_util_get_type --clutter_action_get_type --clutter_actor_box_get_type --clutter_actor_get_type --clutter_actor_meta_get_type --clutter_align_constraint_get_type --clutter_alpha_get_type --clutter_animatable_get_type --clutter_animation_get_type --clutter_animator_get_type --clutter_animator_key_get_type --clutter_backend_get_type --clutter_behaviour_depth_get_type --clutter_behaviour_ellipse_get_type --clutter_behaviour_get_type --clutter_behaviour_opacity_get_type --clutter_behaviour_path_get_type --clutter_behaviour_rotate_get_type --clutter_behaviour_scale_get_type --clutter_bin_layout_get_type --clutter_bind_constraint_get_type --clutter_binding_pool_get_type --clutter_blur_effect_get_type --clutter_box_get_type --clutter_box_layout_get_type --clutter_brightness_contrast_effect_get_type --clutter_cairo_texture_get_type --clutter_canvas_get_type --clutter_child_meta_get_type --clutter_click_action_get_type --clutter_clip_node_get_type --clutter_clone_get_type --clutter_color_get_type --clutter_color_node_get_type --clutter_colorize_effect_get_type --clutter_constraint_get_type --clutter_container_get_type --clutter_content_get_type --clutter_deform_effect_get_type --clutter_desaturate_effect_get_type --clutter_device_manager_get_type --clutter_drag_action_get_type --clutter_drop_action_get_type --clutter_effect_get_type --clutter_event_get_type --clutter_event_sequence_get_type --clutter_fixed_layout_get_type --clutter_flow_layout_get_type --clutter_fog_get_type --clutter_geometry_get_type --clutter_gesture_action_get_type --clutter_glx_texture_pixmap_get_type --clutter_grid_layout_get_type --clutter_group_get_type --clutter_image_get_type --clutter_input_device_get_type --clutter_interval_get_type --clutter_keyframe_transition_get_type --clutter_knot_get_type --clutter_layout_manager_get_type --clutter_layout_meta_get_type --clutter_list_model_get_type --clutter_margin_get_type --clutter_media_get_type --clutter_model_get_type --clutter_model_iter_get_type --clutter_offscreen_effect_get_type --clutter_page_turn_effect_get_type --clutter_paint_node_get_type --clutter_paint_volume_get_type --clutter_pan_action_get_type --clutter_param_color_get_type --clutter_param_fixed_get_type --clutter_param_units_get_type --clutter_path_constraint_get_type --clutter_path_get_type --clutter_path_node_get_type --clutter_perspective_get_type --clutter_pipeline_node_get_type --clutter_point_get_type --clutter_property_transition_get_type --clutter_rect_get_type --clutter_rectangle_get_type --clutter_rotate_action_get_type --clutter_score_get_type --clutter_script_get_type --clutter_scriptable_get_type --clutter_scroll_actor_get_type --clutter_settings_get_type --clutter_shader_effect_get_type --clutter_shader_float_get_type --clutter_shader_get_type --clutter_shader_int_get_type --clutter_shader_matrix_get_type --clutter_size_get_type --clutter_snap_constraint_get_type --clutter_stage_get_type --clutter_stage_manager_get_type --clutter_state_get_type --clutter_state_key_get_type --clutter_swipe_action_get_type --clutter_table_layout_get_type --clutter_tap_action_get_type --clutter_text_buffer_get_type --clutter_text_get_type --clutter_text_node_get_type --clutter_texture_get_type --clutter_texture_node_get_type --clutter_timeline_get_type --clutter_transition_get_type --clutter_transition_group_get_type --clutter_units_get_type --clutter_vertex_get_type --clutter_zoom_action_get_type --- -2.9.3 - diff --git a/meta-gnome/recipes-support/clutter/clutter-1.0/install-examples.patch b/meta-gnome/recipes-support/clutter/clutter-1.0/install-examples.patch deleted file mode 100644 index ce9ab3a..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-1.0/install-examples.patch +++ /dev/null @@ -1,19 +0,0 @@ -Install the examples to $libdir/clutter/. - -Signed-off-by: Ross Burton -Upstream-Status: Inappropriate - -Index: clutter-1.26.2/examples/Makefile.am -=================================================================== ---- clutter-1.26.2.orig/examples/Makefile.am -+++ clutter-1.26.2/examples/Makefile.am -@@ -33,7 +33,8 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/clutter \ - -I$(top_builddir)/clutter - --noinst_PROGRAMS = $(all_examples) -+exampledir = $(pkglibdir)/examples -+example_PROGRAMS = $(all_examples) - - EXTRA_DIST = redhand.png - diff --git a/meta-gnome/recipes-support/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta-gnome/recipes-support/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch deleted file mode 100644 index fef82ea..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Mon, 27 Apr 2015 20:12:33 +0300 -Subject: [PATCH] Run installed tests with tap output - -Configure output from installed-tests to be TAP compliant such that -gnome-desktop-testing-runner properly interprets the results. - -Upstream-Status: Pending - -Signed-off-by: Tim Orling - ---- - build-aux/autotools/glib-tap.mk | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk -index a4f0dad..51cfa31 100644 ---- a/build-aux/autotools/glib-tap.mk -+++ b/build-aux/autotools/glib-tap.mk -@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) - %.test: %$(EXEEXT) Makefile - $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ - echo 'Type=session' >> $@.tmp; \ -- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ -+ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ -+ echo 'Output=TAP' >> $@.tmp; \ - mv $@.tmp $@) - - CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta-gnome/recipes-support/clutter/clutter-1.0/run-ptest b/meta-gnome/recipes-support/clutter/clutter-1.0/run-ptest deleted file mode 100644 index 98877e5..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-1.0/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -gnome-desktop-testing-runner clutter diff --git a/meta-gnome/recipes-support/clutter/clutter-1.0_1.26.4.bb b/meta-gnome/recipes-support/clutter/clutter-1.0_1.26.4.bb deleted file mode 100644 index 1f25e6f..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-1.0_1.26.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2" -SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" - -SRC_URI += "file://install-examples.patch \ - file://run-installed-tests-with-tap-output.patch \ - file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ - file://run-ptest" diff --git a/meta-gnome/recipes-support/clutter/clutter-gst-3.0.inc b/meta-gnome/recipes-support/clutter/clutter-gst-3.0.inc deleted file mode 100644 index 4c87798..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-gst-3.0.inc +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "GStreamer integration library for Clutter" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2+" - -inherit clutter distro_features_check upstream-version-is-even gobject-introspection -# depends on clutter-1.0 which depends on cogl-1.0 -REQUIRED_DISTRO_FEATURES ?= "opengl" - -SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" - -DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" -RDEPENDS_${PN} += "gstreamer1.0-meta-base" -PACKAGES =+ "${PN}-examples" - -FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" diff --git a/meta-gnome/recipes-support/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta-gnome/recipes-support/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch deleted file mode 100644 index 0b26b99..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 30 Apr 2015 12:19:13 +0300 -Subject: [PATCH] Install example binary needed for core-image-clutter - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [configuration] - -Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, -commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0 - -Signed-off-by: Tomas Frydrych -Signed-off-by: Alexander Kanavin ---- - examples/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index bfbc1b5..09655e3 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,6 +1,6 @@ - NULL = # - --noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content -+bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content - - AM_CPPFLAGS = -I$(top_srcdir) \ - $(MAINTAINER_CFLAGS) \ --- -2.1.4 - diff --git a/meta-gnome/recipes-support/clutter/clutter-gst-3.0_3.0.27.bb b/meta-gnome/recipes-support/clutter/clutter-gst-3.0_3.0.27.bb deleted file mode 100644 index 3538245..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-gst-3.0_3.0.27.bb +++ /dev/null @@ -1,7 +0,0 @@ -require clutter-gst-3.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" - -SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" -SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" diff --git a/meta-gnome/recipes-support/clutter/clutter-gtk-1.0.inc b/meta-gnome/recipes-support/clutter/clutter-gtk-1.0.inc deleted file mode 100644 index 11826a6..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-gtk-1.0.inc +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2+" - -CLUTTERBASEBUILDCLASS = "meson" -inherit clutter distro_features_check upstream-version-is-even gobject-introspection gtk-doc - -# depends on clutter-1.0 which depends on cogl-1.0 -REQUIRED_DISTRO_FEATURES ?= "opengl" -# depends on gtk+3 -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -DEPENDS = "clutter-1.0 gtk+3" -PACKAGES =+ "${PN}-examples" - -GTKDOC_MESON_OPTION = "enable_docs" - -GIR_MESON_OPTION = 'enable_gi' diff --git a/meta-gnome/recipes-support/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/meta-gnome/recipes-support/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch deleted file mode 100644 index e21c6fd..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 11 Feb 2019 16:41:13 +0100 -Subject: [PATCH] Add a config variable for enabling/disabling introspection - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - clutter-gtk/meson.build | 2 +- - meson_options.txt | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build -index 5d6847d..5d934b6 100644 ---- a/clutter-gtk/meson.build -+++ b/clutter-gtk/meson.build -@@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, - dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], - include_directories: include_directories('.')) - --if not meson.is_cross_build() -+if get_option('enable_gi') - gnome.generate_gir(clutter_gtk, - sources: clutter_gtk_headers + clutter_gtk_sources, - namespace: 'GtkClutter', -diff --git a/meson_options.txt b/meson_options.txt -index aaf59f1..b7e51c3 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('enable_docs', - type: 'boolean', - value: false, - description: 'Enable generating the API reference (depends on GTK-Doc)') -+option('enable_gi', -+ type: 'boolean', -+ value: false, -+ description: 'Enable gobject introspection') diff --git a/meta-gnome/recipes-support/clutter/clutter-gtk-1.0_1.8.4.bb b/meta-gnome/recipes-support/clutter/clutter-gtk-1.0_1.8.4.bb deleted file mode 100644 index 53948c8..0000000 --- a/meta-gnome/recipes-support/clutter/clutter-gtk-1.0_1.8.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch" -SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" -SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" diff --git a/meta-gnome/recipes-support/cogl/cogl-1.0.inc b/meta-gnome/recipes-support/cogl/cogl-1.0.inc deleted file mode 100644 index 4436163..0000000 --- a/meta-gnome/recipes-support/cogl/cogl-1.0.inc +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Modern 3D graphics API with associated utility APIs" -HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" -LICENSE = "MIT" - -inherit clutter distro_features_check upstream-version-is-even gobject-introspection -# cogl-1.0 needs opengl to build -REQUIRED_DISTRO_FEATURES ?= "opengl" - -DEPENDS = "glib-2.0 gdk-pixbuf" -PACKAGES =+ "${PN}-examples \ - libcogl libcogl-gles2 libcogl-pango libcogl-path \ - " -AUTOTOOLS_AUXDIR = "${S}/build" - -# Extra DEPENDS for PACKAGECONFIG -EDEPENDS_GL = "virtual/libgl libdrm" -EDEPENDS_GLES2 = "virtual/libgles2" -EDEPENDS_KMS = "libdrm virtual/egl" -EDEPENDS_EGL = "virtual/egl" -EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" -EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland" - -# Extra RDEPENDS for PACKAGECONFIG -# This has to be explictly listed, because cogl dlopens the backends -ERDEPENDS_GL = "libgl" -ERDEPENDS_GLES2 = "libgles2" - -# GLESv1 is rarely tested, so disable it -EXTRA_OECONF += "--enable-examples-install \ - --enable-debug \ - --disable-gles1 \ - --disable-cairo \ - " -DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" - -# OpenGL/GLX -PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" - -# GLESv2 -PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" - -# EGL backends -PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" -PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" -PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" - -# Wayland (server-side) -PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" - -# Support rendering text directly with Pango -PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" - -# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by -# default. -PACKAGECONFIG ??= "cogl-pango gles2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ - " - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" -} - -FILES_${PN} = "" -FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" -FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" -FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" -FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" - -FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" - -# For backwards compatibility after Debian-renaming -RPROVIDES_libcogl = "cogl-1.0" -RCONFLICTS_libcogl = "cogl-1.0" -RREPLACES_libcogl = "cogl-1.0" - -RDEPENDS_${PN}-dev = "libcogl" - -COMPATIBLE_HOST_armv4 = 'null' diff --git a/meta-gnome/recipes-support/cogl/cogl-1.0_1.22.6.bb b/meta-gnome/recipes-support/cogl/cogl-1.0_1.22.6.bb deleted file mode 100644 index 86bbdbf..0000000 --- a/meta-gnome/recipes-support/cogl/cogl-1.0_1.22.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cogl-1.0.inc - -SRC_URI[archive.md5sum] = "7bcc01edb5462d4d08d01bf893feddb0" -SRC_URI[archive.sha256sum] = "6d134bd3e48c067507167c001200b275997fb9c68b08b48ff038211c8c251b75" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" diff --git a/meta-gnome/recipes-support/ell/ell_0.31.bb b/meta-gnome/recipes-support/ell/ell_0.31.bb deleted file mode 100644 index 1db7131..0000000 --- a/meta-gnome/recipes-support/ell/ell_0.31.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Embedded Linux Library" -DESCRIPTION = "The Embedded Linux Library (ELL) provides core, \ -low-level functionality for system daemons. It typically has no \ -dependencies other than the Linux kernel, C standard library, and \ -libdl (for dynamic linking). While ELL is designed to be efficient \ -and compact enough for use on embedded Linux platforms, it is not \ -limited to resource-constrained systems." -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "dbus" - -inherit autotools pkgconfig - -SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "3f670230be4d89d621b0508c70b1d36b" -SRC_URI[sha256sum] = "ae88617275452f9f5840b2365e33e6c7fb6fa3405d42cbf9367de642ee8b6701" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} diff --git a/meta-gnome/recipes-support/graphene/graphene_1.10.0.bb b/meta-gnome/recipes-support/graphene/graphene_1.10.0.bb deleted file mode 100644 index 3d38837..0000000 --- a/meta-gnome/recipes-support/graphene/graphene_1.10.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -GNOMEBASEBUILDCLASS = "meson" - -inherit meson pkgconfig gnomebase gobject-introspection - -DESCRIPTION = "Graphene" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" - - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" -SRC_URI[archive.md5sum] = "07f72436bc7a85d12f5edd9fcedd0184" -SRC_URI[archive.sha256sum] = "406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499" - -DEPENDS = "gobject-introspection gobject-introspection-native" -#RDEPENDS_${PN} = "gobject-introspection" -BBCLASSEXTEND = "native" - -EXTRA_OEMESON = "-Dintrospection=true -Dinstalled_tests=false -Dtests=false -Darm_neon=false" - -SOLIBS = ".so" -FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" - -do_install() { - install -d ${D}${includedir}/graphene-1.0/ - install -m 0644 ${WORKDIR}/build/include/*.h ${D}${includedir}/graphene-1.0/ - install -m 0644 ${S}/include/*.h ${D}${includedir}/ - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/build/meson-private/graphene-gobject-1.0.pc ${D}${libdir}/pkgconfig/ - install -m 0644 ${WORKDIR}/build/meson-private/graphene-1.0.pc ${D}${libdir}/pkgconfig/ - install -d ${D}${datadir}/gir-1.0/ - install -m 0644 ${WORKDIR}/build/src/Graphene-1.0.gir ${D}/${datadir}/gir-1.0/ - install -d ${D}${libdir}/girepository-1.0/ - install -m 0644 ${WORKDIR}/build/src/Graphene-1.0.typelib ${D}/${libdir}/girepository-1.0/ - install -m 0644 ${WORKDIR}/build/src/libgraphene-1.0.* ${D}/${libdir}/ -} - -FILES_${PN} += "${includedir}/graphene-1.0/graphene-config.h ${includedir}/graphene.h ${libdir}/*.so.*" -FILES_${PN}-dev += "${libdir}/pkgconfig/graphene-gobject-1.0.pc ${libdir}/pkgconfig/graphene-1.0.pc ${datadir}/Graphene-1.0.gir $[libdir}/girepository-1.0/Graphene-1.0.typelib" diff --git a/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb b/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb new file mode 100644 index 0000000..d9cc0c7 --- /dev/null +++ b/meta-gnome/recipes-support/graphene/graphene_1.10.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A thin layer of graphic data types" +HOMEPAGE = "http://ebassi.github.io/graphene/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" + +#DEPENDS = "gtk+3 iso-codes enchant2" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.md5sum] = "a2c26c4f44a02ca053e0e9afb63cc94c" +SRC_URI[archive.sha256sum] = "e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dinstalled_tests=false" + +FILES_${PN} += "${libdir}/graphene-1.0" +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb b/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb index 6f6ef10..0818541 100644 --- a/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb +++ b/meta-gnome/recipes-support/ibus/ibus_1.5.22.bb @@ -16,7 +16,7 @@ DEPENDS = "prelink \ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SRC_URI = " \ - https://github.com/ibus/ibus/releases/download/${PV}/${PN}-${PV}.tar.gz \ + https://github.com/ibus/ibus/releases/download/${PV}/${BPN}-${PV}.tar.gz \ file://0001-strip-out-dbus-build-dep.patch \ file://0002-decorate-automake-for-valaflags.patch \ file://0003-use-wayland-display-on-wayland.patch \ @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "8170eba58c28aa4818970751ebdeada728ebb63d535967a5c5f5c21b00 S = "${WORKDIR}/${PN}-${PV}" -inherit autotools pkgconfig gtk-doc distro_features_check vala gobject-introspection +inherit autotools pkgconfig gtk-doc features_check vala gobject-introspection FILES_${PN} += "${datadir}" FILES_${PN} += "${libdir}" diff --git a/meta-gnome/recipes-support/itstool/itstool_2.0.4.bb b/meta-gnome/recipes-support/itstool/itstool_2.0.4.bb deleted file mode 100644 index 8a102fe..0000000 --- a/meta-gnome/recipes-support/itstool/itstool_2.0.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "XML to PO and back again using W3C ITS rules" -HOMEPAGE = "http://itstool.org/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5 \ - file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "http://files.itstool.org/itstool/itstool-${PV}.tar.bz2" -SRC_URI[md5sum] = "9415ddf6a12012ff688549d2ed767bc5" -SRC_URI[sha256sum] = "97c208b51da33e0b553e830b92655f8deb9132f8fbe9a646771f95c33226eb60" - -inherit distutils python3native setuptools3 - -do_configure_prepend() { - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/itstool.in - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/itstool -} -RDEPENDS_${PN} += "python-core" -BBCLASSEXTEND = "native" - diff --git a/meta-gnome/recipes-support/libinput/libinput/determinism.patch b/meta-gnome/recipes-support/libinput/libinput/determinism.patch deleted file mode 100644 index cb55403..0000000 --- a/meta-gnome/recipes-support/libinput/libinput/determinism.patch +++ /dev/null @@ -1,21 +0,0 @@ -This finds our outer git tree and that version information breaks -determinism of this recipe. Disable it. - -RP 2020/2/6 - -Upstream-Status: Pending -Signed-off-by: Richard Purdie - -Index: libinput-1.14.3/meson.build -=================================================================== ---- libinput-1.14.3.orig/meson.build -+++ libinput-1.14.3/meson.build -@@ -387,7 +387,7 @@ pkgconfig.generate( - libraries : lib_libinput - ) - --git_version_h = vcs_tag(command : ['git', 'describe'], -+git_version_h = vcs_tag(command : ['false'], - fallback : 'unknown', - input : 'src/libinput-git-version.h.in', - output :'libinput-git-version.h') diff --git a/meta-gnome/recipes-support/libinput/libinput/run-ptest b/meta-gnome/recipes-support/libinput/libinput/run-ptest deleted file mode 100644 index e32bd92..0000000 --- a/meta-gnome/recipes-support/libinput/libinput/run-ptest +++ /dev/null @@ -1,153 +0,0 @@ - - - -run-ptest\libinput\wayland\recipes-graphics\meta - openembedded-core - OpenEmbedded Core layer - - - - - - - - - -
- - - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
path: root/meta/recipes-graphics/wayland/libinput/run-ptest
blob: 5a84c568b976cbfb6f3d091c0db848e5d6850fba (plain) - - -
1
-2
-3
-4
-5
-6
-7
-8
-9
-
#!/bin/sh
-
-/usr/libexec/libinput/libinput-test-suite
-if [ $? -eq 0 ]; then
-  echo 'PASS: libinput-test-suite'
-else
-  echo 'FAIL: libinput-test-suite'
-fi
-

-
-
-
generated by cgit v1.2 (git 2.18.0) at 2020-05-07 18:03:07 +0000
-
- - diff --git a/meta-gnome/recipes-support/libinput/libinput_1.15.5.bb b/meta-gnome/recipes-support/libinput/libinput_1.15.5.bb deleted file mode 100644 index e56f181..0000000 --- a/meta-gnome/recipes-support/libinput/libinput_1.15.5.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -DESCRIPTION = "libinput is a library to handle input devices in Wayland \ -compositors and to provide a generic X.Org input driver. It provides \ -device detection, device handling, input device event processing and \ -abstraction so minimize the amount of custom input code compositors need to \ -provide the common set of functionality that users expect." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" - -DEPENDS = "libevdev udev mtdev libcheck" - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://run-ptest \ - file://determinism.patch \ - " -SRC_URI[md5sum] = "c9a1b15bb932eaf22f840efe4c3f84eb" -SRC_URI[sha256sum] = "a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97" - -UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig lib_package ptest - -# Patch out build directory, otherwise it leaks into ptest binary -do_configure_append() { - sed -i -e "s,${WORKDIR},,g" config.h - if [ -e "litest-config.h" ]; then - sed -i -e "s,${WORKDIR},,g" litest-config.h - fi -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" - -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ - -Ddocumentation=false \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ - -Dzshcompletiondir=no" - -# package name changed in 1.8.1 upgrade: make sure package upgrades work -RPROVIDES_${PN} = "libinput" -RREPLACES_${PN} = "libinput" -RCONFLICTS_${PN} = "libinput" - -FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment-new.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment-new.patch deleted file mode 100644 index b42aff3..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0001-do-not-create-python-environment-new.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9b32dd063116186d679578cff24366b19874699d Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:30:20 -0400 -Subject: [PATCH] do not create python environment new - ---- - build/moz.configure/init.configure | 18 ------------------ - configure.py | 10 +++++++++- - js/src/old-configure | 2 +- - 3 files changed, 10 insertions(+), 20 deletions(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 83b8d705..79d04b60 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -257,24 +257,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 - - -diff --git a/configure.py b/configure.py -index 9b2bae9a..771e34e3 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", "third_party/python"]: -+ 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.makeutil import Makefile - from mozbuild.pythonutil import iter_modules_in_path -diff --git a/js/src/old-configure b/js/src/old-configure -index 2c579b77..830b6361 100644 ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -9974,7 +9974,7 @@ if test "$JS_STANDALONE"; then - - if test "$no_recursion" != yes; then - trap '' EXIT -- if ! $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then -+ if ! PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then - exit 1 - fi - fi diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0002-do-not-include-requireddefines.patch b/meta-gnome/recipes-support/mozjs/mozjs/0002-do-not-include-requireddefines.patch deleted file mode 100644 index f4e4b2b..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0002-do-not-include-requireddefines.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 39df72a4abd14d65f888bda6045d4255bd5ce2fc Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:31:45 -0400 -Subject: [PATCH] do not include requireddefines - ---- - js/src/build/js.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in -index 2eae393a..c2dea62d 100644 ---- a/js/src/build/js.pc.in -+++ b/js/src/build/js.pc.in -@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript - Version: @MOZILLA_VERSION@ - @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@ diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch b/meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch deleted file mode 100644 index b3ff38e..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0003-fix-coredump-caused-by-getenv.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5d3bd1a8d7cdbbf193079ed6500070276b7c8c70 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:33:10 -0400 -Subject: [PATCH] fix coredump caused by getenv - ---- - mozglue/misc/TimeStamp.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mozglue/misc/TimeStamp.cpp b/mozglue/misc/TimeStamp.cpp -index c123bd71..b849254b 100644 ---- a/mozglue/misc/TimeStamp.cpp -+++ b/mozglue/misc/TimeStamp.cpp -@@ -11,6 +11,7 @@ - #include "mozilla/TimeStamp.h" - #include - #include -+#include - - namespace mozilla { - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0004-new-fix-cannot-find-link.patch b/meta-gnome/recipes-support/mozjs/mozjs/0004-new-fix-cannot-find-link.patch deleted file mode 100644 index b2e4de4..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0004-new-fix-cannot-find-link.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2f0d0585ffc7640e3e10a7260991b33a0783bbd4 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:34:56 -0400 -Subject: [PATCH] new fix cannot find link - ---- - 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 dc140a42..516652da 100644 ---- a/build/moz.configure/checks.configure -+++ b/build/moz.configure/checks.configure -@@ -133,7 +133,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 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch b/meta-gnome/recipes-support/mozjs/mozjs/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch deleted file mode 100644 index 3a0709f..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8d26c3717dfb677d8c7a739e26352c1c5ef7838a Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:39:26 -0400 -Subject: [PATCH] do not use autoconf 213 to refresh old configure - ---- - build/moz.configure/old.configure | 4 ++-- - js/src/old-configure | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure -index 17d0c5bf..436fcc5e 100644 ---- a/build/moz.configure/old.configure -+++ b/build/moz.configure/old.configure -@@ -33,7 +33,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: -@@ -87,7 +87,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 830b6361..129b131f 100644 ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -587,7 +587,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 diff --git a/meta-gnome/recipes-support/mozjs/mozjs/pre-generated-old-configure.patch b/meta-gnome/recipes-support/mozjs/mozjs/pre-generated-old-configure.patch deleted file mode 100644 index e5a5d5f..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs/pre-generated-old-configure.patch +++ /dev/null @@ -1,9047 +0,0 @@ -diff -Nur '--exclude=mozconfig' '--exclude=firefox-build-dir' '--exclude=*.pyc' firefox-68.0-bak/js/src/old-configure firefox-68.0/js/src/old-configure ---- firefox-68.0-bak/js/src/old-configure 1970-01-01 09:00:00.000000000 +0900 -+++ firefox-68.0/js/src/old-configure 2019-07-14 20:32:27.318145584 +0900 -@@ -0,0 +1,8987 @@ -+#! /bin/sh -+ -+if test `uname -s | grep -c MINGW 2>/dev/null` != "0"; then -+ msyshost=1 -+fi -+ -+. ./old-configure.vars -+ -+# Guess values for system-dependent variables and create Makefiles. -+# Generated automatically using autoconf version 2.13 -+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -+# -+# This configure script is free software; the Free Software Foundation -+# gives unlimited permission to copy, distribute and modify it. -+ -+# Defaults: -+ac_help= -+ac_default_prefix=/usr/local -+# Any additions from configure.in: -+ac_help="$ac_help -+ --with-ios-sdk=TYPE -+ Type of iOS SDK to use (iphonesimulator, iphoneos) -+ and optionally version (like iphoneos8.2)" -+ac_help="$ac_help -+ --enable-ios-target=VER (default=8.0) -+ Set the minimum iOS version needed at runtime" -+ac_help="$ac_help -+ --with-x use the X Window System" -+ac_help="$ac_help -+ --enable-memory-sanitizer Enable Memory Sanitizer (default=no)" -+ac_help="$ac_help -+ --enable-thread-sanitizer Enable Thread Sanitizer (default=no)" -+ac_help="$ac_help -+ --enable-signed-overflow-sanitizer Enable UndefinedBehavior Sanitizer (Signed Integer Overflow Parts, default=no)" -+ac_help="$ac_help -+ --enable-unsigned-overflow-sanitizer Enable UndefinedBehavior Sanitizer (Unsigned Integer Overflow Parts, default=no)" -+ac_help="$ac_help -+ --with-debug-label=LABELS -+ Define DEBUG_ for each comma-separated -+ value given." -+ac_help="$ac_help -+ --enable-cpp-rtti Enable C++ RTTI " -+ac_help="$ac_help -+ --disable-icf Disable Identical Code Folding" -+ac_help="$ac_help -+ --enable-dtrace build with dtrace support if available (default=no)" -+ac_help="$ac_help -+ --with-nspr-cflags=FLAGS -+ Pass FLAGS to CC when building code that uses NSPR. -+ Use this when there's no accurate nspr-config -+ script available. This is the case when building -+ SpiderMonkey as part of the Mozilla tree: the -+ top-level configure script computes NSPR flags -+ that accomodate the quirks of that environment." -+ac_help="$ac_help -+ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR. -+ See --with-nspr-cflags for more details." -+ac_help="$ac_help -+ --enable-nspr-build Build NSPR from source tree" -+ac_help="$ac_help -+ --with-system-nspr Use an NSPR that is already built and installed. -+ Use the 'nspr-config' script in the current path, -+ or look for the script in the directories given with -+ --with-nspr-exec-prefix or --with-nspr-prefix. -+ (Those flags are only checked if you specify -+ --with-system-nspr.)" -+ac_help="$ac_help -+ --enable-posix-nspr-emulation -+ Enable emulation of NSPR for POSIX systems" -+ac_help="$ac_help -+ --with-nspr-prefix=PFX Prefix where NSPR is installed" -+ac_help="$ac_help -+ --with-nspr-exec-prefix=PFX -+ Exec prefix where NSPR is installed" -+ac_help="$ac_help -+ --with-system-zlib[=PFX] -+ Use system libz [installed at prefix PFX]" -+ac_help="$ac_help -+ --with-sixgill=path/to/sixgill -+ Enable static checking of code using sixgill" -+ac_help="$ac_help -+ --enable-strip Enable stripping of libs & executables " -+ac_help="$ac_help -+ --enable-install-strip Enable stripping of libs & executables when packaging " -+ac_help="$ac_help -+ --jitreport-granularity=N -+ Default granularity at which to report JIT code -+ to external tools -+ 0 - no info -+ 1 - code ranges for whole functions only -+ 2 - per-line information -+ 3 - per-op information" -+ac_help="$ac_help -+ --enable-readline Link js shell to system readline library" -+ac_help="$ac_help -+ --with-qemu-exe=path Use path as an arm emulator on host platforms" -+ac_help="$ac_help -+ --with-cross-lib=dir Use dir as the location for arm libraries" -+ac_help="$ac_help -+ --with-system-icu -+ Use system ICU (located with pkgconfig)" -+ac_help="$ac_help -+ --with-intl-api, --with-intl-api=build, --without-intl-api -+ Determine the status of the ECMAScript Internationalization API. The first -+ (or lack of any of these) builds and exposes the API. The second builds it -+ but doesn't use ICU or expose the API to script. The third doesn't build -+ ICU at all." -+ -+# Initialize some variables set by options. -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+build=NONE -+cache_file=./config.cache -+exec_prefix=NONE -+host=NONE -+no_create= -+nonopt=NONE -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+target=NONE -+verbose= -+x_includes=NONE -+x_libraries=NONE -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datadir='${prefix}/share' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+libdir='${exec_prefix}/lib' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+infodir='${prefix}/info' -+mandir='${prefix}/man' -+ -+# Initialize some other variables. -+subdirs= -+MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 -+ -+ac_prev= -+for ac_option -+do -+ -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval "$ac_prev=\$ac_option" -+ ac_prev= -+ continue -+ fi -+ -+ case "$ac_option" in -+ -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) ac_optarg= ;; -+ esac -+ -+ # Accept the important Cygnus configure options, so we can diagnose typos. -+ -+ case "$ac_option" in -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir="$ac_optarg" ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build="$ac_optarg" ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file="$ac_optarg" ;; -+ -+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -+ | --da=*) -+ datadir="$ac_optarg" ;; -+ -+ -disable-* | --disable-*) -+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; echo "configure: error: $ac_feature: invalid feature name" 1>&5; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ eval "enable_${ac_feature}=no" ;; -+ -+ -enable-* | --enable-*) -+ ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; echo "configure: error: $ac_feature: invalid feature name" 1>&5; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; -+ *) ac_optarg=yes ;; -+ esac -+ eval "enable_${ac_feature}='$ac_optarg'" ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix="$ac_optarg" ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he) -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat << EOF -+Usage: configure [options] [host] -+Options: [defaults in brackets after descriptions] -+Configuration: -+ --cache-file=FILE cache test results in FILE -+ --help print this message -+ --no-create do not create output files -+ --quiet, --silent do not print \`checking...' messages -+ --version print the version of autoconf that created configure -+Directory and file names: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [same as prefix] -+ --bindir=DIR user executables in DIR [EPREFIX/bin] -+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data in DIR -+ [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data in DIR -+ [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] -+ --includedir=DIR C header files in DIR [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -+ --infodir=DIR info documentation in DIR [PREFIX/info] -+ --mandir=DIR man documentation in DIR [PREFIX/man] -+ --srcdir=DIR find the sources in DIR [configure dir or ..] -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM -+ run sed PROGRAM on installed program names -+EOF -+ cat << EOF -+Host type: -+ --build=BUILD configure for building on BUILD [BUILD=HOST] -+ --host=HOST configure for HOST [guessed] -+ --target=TARGET configure for TARGET [TARGET=HOST] -+Features and packages: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+EOF -+ if test -n "$ac_help"; then -+ echo "--enable and --with options recognized:$ac_help" -+ fi -+ exit 0 ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host="$ac_optarg" ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir="$ac_optarg" ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir="$ac_optarg" ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir="$ac_optarg" ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir="$ac_optarg" ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst \ -+ | --locals | --local | --loca | --loc | --lo) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ localstatedir="$ac_optarg" ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir="$ac_optarg" ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir="$ac_optarg" ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix="$ac_optarg" ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix="$ac_optarg" ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix="$ac_optarg" ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name="$ac_optarg" ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir="$ac_optarg" ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir="$ac_optarg" ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site="$ac_optarg" ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir="$ac_optarg" ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir="$ac_optarg" ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target="$ac_optarg" ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers) -+ echo "configure generated by autoconf version 2.13" -+ exit 0 ;; -+ -+ -with-* | --with-*) -+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; echo "configure: error: $ac_package: invalid package name" 1>&5; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; -+ *) ac_optarg=yes ;; -+ esac -+ eval "with_${ac_package}='$ac_optarg'" ;; -+ -+ -without-* | --without-*) -+ ac_package=`echo $ac_option|sed -e 's/-*without-//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; echo "configure: error: $ac_package: invalid package name" 1>&5; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ eval "with_${ac_package}=no" ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes="$ac_optarg" ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries="$ac_optarg" ;; -+ -+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&5; exit 1; } -+ ;; -+ -+ *) -+ if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then -+ echo "configure: warning: $ac_option: invalid host type" 1>&2 -+ fi -+ if test "x$nonopt" != xNONE; then -+ { echo "configure: error: can only configure for one host and one target at a time" 1>&2; echo "configure: error: can only configure for one host and one target at a time" 1>&5; exit 1; } -+ fi -+ nonopt="$ac_option" -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&5; exit 1; } -+fi -+ -+if test -z "$srcdir"; then -+ srcdir=`dirname "$0"` -+fi -+srcdir="$srcdir/../.." -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -+ -+# File descriptor usage: -+# 0 standard input -+# 1 file creation -+# 2 errors and warnings -+# 3 some systems may open it to /dev/tty -+# 4 used on the Kubota Titan -+# 6 checking for... messages and results -+# 5 compiler messages saved in config.log -+if test "$silent" = yes; then -+ exec 6>/dev/null -+else -+ exec 6>&1 -+fi -+exec 5>>${CONFIG_LOG=./config.log} -+ -+echo "\ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+" 1>&5 -+ -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Also quote any args containing shell metacharacters. -+ac_configure_args= -+for ac_arg -+do -+ case "$ac_arg" in -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) ;; -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -+ ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) ac_configure_args="$ac_configure_args $ac_arg" ;; -+ esac -+done -+ -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -rf conftest* confdefs.h -+# AIX cpp loses on an empty file, so make sure it contains at least a newline. -+echo > confdefs.h -+ -+# A filename unique to this package, relative to the directory that -+# configure is in, which we can look for to find out if srcdir is correct. -+ac_unique_file=js/src/jsapi.h -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then its parent. -+ ac_prog=$0 -+ ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -+ test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. -+ srcdir=$ac_confdir -+ if test ! -r $srcdir/$ac_unique_file; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r $srcdir/$ac_unique_file; then -+ if test "$ac_srcdir_defaulted" = yes; then -+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; echo "configure: error: can not find sources in $ac_confdir or .." 1>&5; exit 1; } -+ else -+ { echo "configure: error: can not find sources in $srcdir" 1>&2; echo "configure: error: can not find sources in $srcdir" 1>&5; exit 1; } -+ fi -+fi -+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -+ -+# Prefer explicitly selected file to automatically selected ones. -+if test -z "$CONFIG_SITE"; then -+ if test "x$prefix" != xNONE; then -+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -+ else -+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+ fi -+fi -+for ac_site_file in $CONFIG_SITE; do -+ if test -r "$ac_site_file"; then -+ echo "loading site script $ac_site_file" -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ echo "loading cache $cache_file" -+ . $cache_file -+else -+ echo "creating cache $cache_file" -+ > $cache_file -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ac_exeext= -+ac_objext=o -+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -+ ac_n= ac_c=' -+' ac_t=' ' -+ else -+ ac_n=-n ac_c= ac_t= -+ fi -+else -+ ac_n= ac_c='\c' ac_t= -+fi -+ -+ -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+ -+ac_aux_dir= -+for ac_dir in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf; do -+ if test -f $ac_dir/install-sh; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f $ac_dir/install.sh; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then -+ { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf" 1>&2; echo "configure: error: can not find install-sh or install.sh in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf" 1>&5; exit 1; } -+fi -+ac_config_guess=$ac_aux_dir/config.guess -+ac_config_sub=$ac_aux_dir/config.sub -+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -+ -+ -+# Do some error checking and defaulting for the host and target type. -+# The inputs are: -+# configure --host=HOST --target=TARGET --build=BUILD NONOPT -+# -+# The rules are: -+# 1. You are not allowed to specify --host, --target, and nonopt at the -+# same time. -+# 2. Host defaults to nonopt. -+# 3. If nonopt is not specified, then host defaults to the current host, -+# as determined by config.guess. -+# 4. Target and build default to nonopt. -+# 5. If nonopt is not specified, then target and build default to host. -+ -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+case $host---$target---$nonopt in -+NONE---*---* | *---NONE---* | *---*---NONE) ;; -+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; echo "configure: error: can only configure for one host and one target at a time" 1>&5; exit 1; } ;; -+esac -+ -+ -+# Make sure we can run config.sub. -+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -+else { echo "configure: error: can not run $ac_config_sub" 1>&2; echo "configure: error: can not run $ac_config_sub" 1>&5; exit 1; } -+fi -+ -+echo $ac_n "checking host system type""... $ac_c" 1>&6 -+echo "configure:680: checking host system type" >&5 -+ -+host_alias=$host -+case "$host_alias" in -+NONE) -+ case $nonopt in -+ NONE) -+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : -+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; echo "configure: error: can not guess host type; you must specify one" 1>&5; exit 1; } -+ fi ;; -+ *) host_alias=$nonopt ;; -+ esac ;; -+esac -+ -+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$host" 1>&6 -+ -+echo $ac_n "checking target system type""... $ac_c" 1>&6 -+echo "configure:701: checking target system type" >&5 -+ -+target_alias=$target -+case "$target_alias" in -+NONE) -+ case $nonopt in -+ NONE) target_alias=$host_alias ;; -+ *) target_alias=$nonopt ;; -+ esac ;; -+esac -+ -+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$target" 1>&6 -+ -+echo $ac_n "checking build system type""... $ac_c" 1>&6 -+echo "configure:719: checking build system type" >&5 -+ -+build_alias=$build -+case "$build_alias" in -+NONE) -+ case $nonopt in -+ NONE) build_alias=$host_alias ;; -+ *) build_alias=$nonopt ;; -+ esac ;; -+esac -+ -+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$build" 1>&6 -+ -+test "$host_alias" != "$target_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && -+ program_prefix=${target_alias}- -+ -+ -+CFLAGS="${CFLAGS=}" -+CPPFLAGS="${CPPFLAGS=}" -+CXXFLAGS="${CXXFLAGS=}" -+LDFLAGS="${LDFLAGS=}" -+HOST_CFLAGS="${HOST_CFLAGS=}" -+HOST_CXXFLAGS="${HOST_CXXFLAGS=}" -+HOST_LDFLAGS="${HOST_LDFLAGS=}" -+ -+_SUBDIR_CC="$CC" -+_SUBDIR_CXX="$CXX" -+_SUBDIR_CFLAGS="$CFLAGS" -+_SUBDIR_CPPFLAGS="$CPPFLAGS" -+_SUBDIR_CXXFLAGS="$CXXFLAGS" -+_SUBDIR_LDFLAGS="$LDFLAGS" -+_SUBDIR_HOST_CC="$HOST_CC" -+_SUBDIR_HOST_CFLAGS="$HOST_CFLAGS" -+_SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS" -+_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS" -+_SUBDIR_CONFIG_ARGS="$ac_configure_args" -+ -+NSPR_VERSION=4 -+NSPR_MINVER=4.9.2 -+ -+W32API_VERSION=3.14 -+ -+MISSING_X= -+ -+USE_PTHREADS= -+_PTHREAD_LDFLAGS="" -+ -+LDFLAGS="$LDFLAGS $LINKER_LDFLAGS" -+ -+if test -z "$JS_STANDALONE"; then -+ autoconfmk=autoconf-js.mk -+fi -+ -+ -+if test -n "$JS_STANDALONE"; then -+ jsconfdefs=$_objdir/js/src/js-confdefs.h -+else -+ jsconfdefs=$_objdir/js-confdefs.h -+fi -+ -+ -+ -+case "$target" in -+*-android*|*-linuxandroid*) -+ directory_include_args="-isystem $android_system -isystem $android_sysroot/usr/include" -+ -+ # clang will do any number of interesting things with host tools unless we tell -+ # it to use the NDK tools. -+ extra_opts="-gcc-toolchain $(dirname $(dirname $TOOLCHAIN_PREFIX))" -+ CPPFLAGS="$extra_opts -D__ANDROID_API__=$android_version $CPPFLAGS" -+ ASFLAGS="$extra_opts $ASFLAGS" -+ LDFLAGS="$extra_opts $LDFLAGS" -+ -+ CPPFLAGS="$directory_include_args $CPPFLAGS" -+ CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS" -+ CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS $stlport_cppflags" -+ ASFLAGS="$directory_include_args -DANDROID $ASFLAGS" -+ -+ LDFLAGS="-L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS" -+ ANDROID_PLATFORM="${android_platform}" -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' ANDROID ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define ANDROID 1 -+EOF -+ -+ -+ -+ ;; -+esac -+ -+ -+ -+case "$target" in -+*-apple-darwin*) -+ -+ -+# Check whether --with-ios-sdk or --without-ios-sdk was given. -+if test "${with_ios_sdk+set}" = set; then -+ withval="$with_ios_sdk" -+ ios_sdk=$withval -+fi -+ -+ -+# Check whether --enable-ios-target or --disable-ios-target was given. -+if test "${enable_ios_target+set}" = set; then -+ enableval="$enable_ios_target" -+ _IOS_TARGET=$enableval -+fi -+ -+_IOS_TARGET_DEFAULT=8.0 -+ -+case "$target" in -+arm*-apple-darwin*) -+ if test -z "$ios_sdk" -o "$ios_sdk" = "yes"; then -+ ios_sdk=iphoneos -+ fi -+ case "$ios_sdk" in -+ iphoneos*) -+ ios_target_arg="-miphoneos-version-min" -+ ;; -+ *) -+ { echo "configure: error: Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'." 1>&2; echo "configure: error: Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'." 1>&5; exit 1; } -+ ;; -+ esac -+ ;; -+*-apple-darwin*) -+ ios_target_arg="-mios-simulator-version-min" -+ case "$ios_sdk" in -+ # Empty SDK is okay, this might be an OS X desktop build. -+ ""|iphonesimulator*) -+ ;; -+ # Default to iphonesimulator -+ yes) -+ ios_sdk=iphonesimulator -+ ;; -+ *) -+ { echo "configure: error: Only 'iphonesimulator' SDKs are valid when targeting iOS simulator." 1>&2; echo "configure: error: Only 'iphonesimulator' SDKs are valid when targeting iOS simulator." 1>&5; exit 1; } -+ ;; -+ esac -+ ;; -+esac -+ -+ -+if test -n "$ios_sdk"; then -+ if test -z "$_IOS_TARGET"; then -+ _IOS_TARGET=$_IOS_TARGET_DEFAULT -+ ios_target_arg="${ios_target_arg}=${_IOS_TARGET}" -+ fi -+ # Ensure that xcrun knows where this SDK is. -+ ios_sdk_path=`xcrun --sdk $ios_sdk --show-sdk-path 2>/dev/null` -+ _ret=$? -+ if test $_ret -ne 0; then -+ { echo "configure: error: iOS SDK '$ios_sdk' could not be found." 1>&2; echo "configure: error: iOS SDK '$ios_sdk' could not be found." 1>&5; exit 1; } -+ fi -+ MOZ_IOS=1 -+ export HOST_CC=clang -+ export HOST_CXX=clang++ -+ # Add isysroot, arch, and ios target arguments -+ case "$target_cpu" in -+ arm*) -+ ARGS="-arch armv7" -+ ;; -+ *) -+ # Unfortunately simulator builds need this. -+ export CROSS_COMPILE=1 -+ ;; -+ esac -+ ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg" -+ # Now find our tools -+ -+ -+_prog_name=clang -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:902: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_CC=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_CC" 1>&6 -+CC="${ac_cv_ios_path_CC}$ARGS" -+ -+ -+ -+_prog_name=clang++ -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:924: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_CXX'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_CXX=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_CXX" 1>&6 -+CXX="${ac_cv_ios_path_CXX}$ARGS" -+ -+ export CPP="$CC -E" -+ -+ -+_prog_name=`echo AR | tr "[:upper:]" "[:lower:]"` -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:947: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_AR'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_AR=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_AR" 1>&6 -+AR="${ac_cv_ios_path_AR}" -+ -+ -+ -+_prog_name=as -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:969: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_AS'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_AS=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_AS" 1>&6 -+AS="${ac_cv_ios_path_AS}$ARGS" -+ -+ -+ -+_prog_name=`echo OTOOL | tr "[:upper:]" "[:lower:]"` -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:991: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_OTOOL'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_OTOOL=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_OTOOL" 1>&6 -+OTOOL="${ac_cv_ios_path_OTOOL}" -+ -+ -+ -+_prog_name=`echo STRIP | tr "[:upper:]" "[:lower:]"` -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:1013: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_STRIP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_STRIP=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_STRIP" 1>&6 -+STRIP="${ac_cv_ios_path_STRIP}" -+ -+ export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/ -+fi -+ -+ -+ -+ ;; -+esac -+ -+ -+if test "$COMPILE_ENVIRONMENT"; then -+ -+# Note: -+# In Mozilla, we use the names $target, $host and $build incorrectly, but are -+# too far gone to back out now. See Bug 475488: -+# - When we say $target, we mean $host, that is, the system on which -+# Mozilla will be run. -+# - When we say $host, we mean $build, that is, the system on which Mozilla -+# is built. -+# - $target (in its correct usage) is for compilers who generate code for a -+# different platform than $host, so it would not be used by Mozilla. -+if test "$target" != "$host"; then -+ -+echo "cross compiling from $host to $target" -+ -+_SAVE_PATH=$PATH -+case "${TOOLCHAIN_PREFIX}" in -+/*) -+ PATH="/:$PATH" -+ ;; -+esac -+# Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1063: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1093: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_prog_rejected=no -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# -gt 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" -+ fi -+fi -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1144: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; echo "configure: error: no acceptable cc found in \$PATH" 1>&5; exit 1; } -+fi -+ -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1176: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cc_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1194 "configure" -+#include "confdefs.h" -+ -+main(){return(0);} -+EOF -+if { (eval echo configure:1199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no -+ else -+ ac_cv_prog_cc_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1231: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:1236: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gcc=yes -+else -+ ac_cv_prog_gcc=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+ -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes -+else -+ GCC= -+fi -+ -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:1264: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -+ ac_cv_prog_cc_g=yes -+else -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+ -+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -+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:1300: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CXX="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CXX="$ac_cv_prog_CXX" -+if test -n "$CXX"; then -+ echo "$ac_t""$CXX" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$CXX" && break -+done -+test -n "$CXX" || CXX="gcc" -+ -+ -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1332: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1350 "configure" -+#include "confdefs.h" -+ -+int main(){return(0);} -+EOF -+if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cxx_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cxx_cross=no -+ else -+ ac_cv_prog_cxx_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cxx_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -+if test $ac_cv_prog_cxx_works = no; then -+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1387: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -+echo "configure:1392: checking whether we are using GNU C++" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gxx=yes -+else -+ ac_cv_prog_gxx=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -+ -+if test $ac_cv_prog_gxx = yes; then -+ GXX=yes -+else -+ GXX= -+fi -+ -+ac_test_CXXFLAGS="${CXXFLAGS+set}" -+ac_save_CXXFLAGS="$CXXFLAGS" -+CXXFLAGS= -+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -+echo "configure:1420: checking whether ${CXX-g++} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.cc -+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then -+ ac_cv_prog_cxx_g=yes -+else -+ ac_cv_prog_cxx_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS="$ac_save_CXXFLAGS" -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi -+ -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}ranlib" -+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:1457: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+RANLIB="$ac_cv_prog_RANLIB" -+if test -n "$RANLIB"; then -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$RANLIB" && break -+done -+test -n "$RANLIB" || RANLIB=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}as" -+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:1492: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$AS"; then -+ ac_cv_prog_AS="$AS" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AS="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+AS="$ac_cv_prog_AS" -+if test -n "$AS"; then -+ echo "$ac_t""$AS" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$AS" && break -+done -+test -n "$AS" || AS=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}lipo" -+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:1527: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$LIPO"; then -+ ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_LIPO="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+LIPO="$ac_cv_prog_LIPO" -+if test -n "$LIPO"; then -+ echo "$ac_t""$LIPO" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$LIPO" && break -+done -+test -n "$LIPO" || LIPO=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}strip" -+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:1562: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_STRIP="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+STRIP="$ac_cv_prog_STRIP" -+if test -n "$STRIP"; then -+ echo "$ac_t""$STRIP" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$STRIP" && break -+done -+test -n "$STRIP" || STRIP=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}otool" -+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:1597: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_OTOOL'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$OTOOL"; then -+ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_OTOOL="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+OTOOL="$ac_cv_prog_OTOOL" -+if test -n "$OTOOL"; then -+ echo "$ac_t""$OTOOL" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$OTOOL" && break -+done -+test -n "$OTOOL" || OTOOL=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}install_name_tool" -+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:1632: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_INSTALL_NAME_TOOL'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$INSTALL_NAME_TOOL"; then -+ ac_cv_prog_INSTALL_NAME_TOOL="$INSTALL_NAME_TOOL" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_INSTALL_NAME_TOOL="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+INSTALL_NAME_TOOL="$ac_cv_prog_INSTALL_NAME_TOOL" -+if test -n "$INSTALL_NAME_TOOL"; then -+ echo "$ac_t""$INSTALL_NAME_TOOL" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$INSTALL_NAME_TOOL" && break -+done -+test -n "$INSTALL_NAME_TOOL" || INSTALL_NAME_TOOL=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}objcopy" -+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:1667: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$OBJCOPY"; then -+ ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_OBJCOPY="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+OBJCOPY="$ac_cv_prog_OBJCOPY" -+if test -n "$OBJCOPY"; then -+ echo "$ac_t""$OBJCOPY" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$OBJCOPY" && break -+done -+test -n "$OBJCOPY" || OBJCOPY=":" -+ -+PATH=$_SAVE_PATH -+ -+else -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1703: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1733: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_prog_rejected=no -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# -gt 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" -+ fi -+fi -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1784: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; echo "configure: error: no acceptable cc found in \$PATH" 1>&5; exit 1; } -+fi -+ -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1816: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cc_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1834 "configure" -+#include "confdefs.h" -+ -+main(){return(0);} -+EOF -+if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no -+ else -+ ac_cv_prog_cc_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1871: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:1876: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gcc=yes -+else -+ ac_cv_prog_gcc=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+ -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes -+else -+ GCC= -+fi -+ -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:1904: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -+ ac_cv_prog_cc_g=yes -+else -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+ -+ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -+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:1940: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CXX="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CXX="$ac_cv_prog_CXX" -+if test -n "$CXX"; then -+ echo "$ac_t""$CXX" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$CXX" && break -+done -+test -n "$CXX" || CXX="gcc" -+ -+ -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1972: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1990 "configure" -+#include "confdefs.h" -+ -+int main(){return(0);} -+EOF -+if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cxx_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cxx_cross=no -+ else -+ ac_cv_prog_cxx_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cxx_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -+if test $ac_cv_prog_cxx_works = no; then -+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:2027: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -+echo "configure:2032: checking whether we are using GNU C++" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gxx=yes -+else -+ ac_cv_prog_gxx=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -+ -+if test $ac_cv_prog_gxx = yes; then -+ GXX=yes -+else -+ GXX= -+fi -+ -+ac_test_CXXFLAGS="${CXXFLAGS+set}" -+ac_save_CXXFLAGS="$CXXFLAGS" -+CXXFLAGS= -+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -+echo "configure:2060: checking whether ${CXX-g++} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.cc -+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then -+ ac_cv_prog_cxx_g=yes -+else -+ ac_cv_prog_cxx_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS="$ac_save_CXXFLAGS" -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi -+ -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:2094: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -+fi -+fi -+RANLIB="$ac_cv_prog_RANLIB" -+if test -n "$RANLIB"; then -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ for ac_prog in $AS as -+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:2126: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$AS" in -+ /*) -+ ac_cv_path_AS="$AS" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_AS="$AS" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_AS="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+AS="$ac_cv_path_AS" -+if test -n "$AS"; then -+ echo "$ac_t""$AS" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$AS" && break -+done -+test -n "$AS" || AS="$CC" -+ -+ if test "$msyshost"; then -+ case "$AS" in -+ /*) -+ tmp_DIRNAME=`dirname "$AS"` -+ tmp_BASENAME=`basename "$AS"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ AS="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$AS.exe"; then -+ AS="$AS.exe" -+ fi -+ esac -+ fi -+ -+ for ac_prog in strip -+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:2180: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_STRIP="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+STRIP="$ac_cv_prog_STRIP" -+if test -n "$STRIP"; then -+ echo "$ac_t""$STRIP" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$STRIP" && break -+done -+test -n "$STRIP" || STRIP=":" -+ -+ if test -z "$HOST_CC"; then -+ HOST_CC='$(CC)' -+ fi -+ if test -z "$HOST_CXX"; then -+ HOST_CXX='$(CXX)' -+ fi -+fi -+ -+ -+GNU_CC= -+GNU_CXX= -+if test "$CC_TYPE" = "gcc"; then -+ GNU_CC=1 -+ GNU_CXX=1 -+fi -+ -+CLANG_CC= -+CLANG_CXX= -+CLANG_CL= -+if test "$CC_TYPE" = "clang"; then -+ GNU_CC=1 -+ GNU_CXX=1 -+ CLANG_CC=1 -+ CLANG_CXX=1 -+fi -+if test "$CC_TYPE" = "clang-cl"; then -+ CLANG_CL=1 -+fi -+ -+ -+ -+ -+ -+ -+# Target the Windows 8.1 SDK by default -+WINVER=601 -+ -+case "$target" in -+*-mingw*) -+ if test "$GCC" != "yes"; then -+ # Check to see if we are really running in a msvc environemnt -+ _WIN32_MSVC=1 -+ -+ # Make sure compilers are valid -+ CFLAGS="$CFLAGS -nologo" -+ CXXFLAGS="$CXXFLAGS -TP -nologo" -+ if test -z "$CLANG_CL"; then -+ CPPFLAGS="$CPPFLAGS -utf-8" -+ fi -+ # _CRT_SECURE_NO_WARNINGS disables warnings about using MSVC-specific -+ # secure CRT functions. -+ CXXFLAGS="$CXXFLAGS -D_CRT_SECURE_NO_WARNINGS" -+ -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ cat > conftest.$ac_ext < -+int main() { -+ printf("Hello World\n"); -+; return 0; } -+EOF -+if { (eval echo configure:2282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: \$(CC) test failed. You must have MS VC++ in your path to build." 1>&2; echo "configure: error: \$(CC) test failed. You must have MS VC++ in your path to build." 1>&5; exit 1; } -+fi -+rm -f conftest* -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ cat > conftest.$ac_ext < -+int main() { -+ unsigned *test = new unsigned(42); -+; return 0; } -+EOF -+if { (eval echo configure:2311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: \$(CXX) test failed. You must have MS VC++ in your path to build." 1>&2; echo "configure: error: \$(CXX) test failed. You must have MS VC++ in your path to build." 1>&5; exit 1; } -+fi -+rm -f conftest* -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+ _MSVC_VER_FILTER='s|.*[^!-~]([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p' -+ -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _CRT_SECURE_NO_WARNINGS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _CRT_SECURE_NO_WARNINGS 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _CRT_NONSTDC_NO_WARNINGS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _CRT_NONSTDC_NO_WARNINGS 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _USE_MATH_DEFINES ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _USE_MATH_DEFINES 1 -+EOF -+ # Otherwise MSVC's math.h doesn't #define M_PI. -+ -+ _CC_SUITE=14 -+ MSVC_C_RUNTIME_DLL=vcruntime140.dll -+ MSVC_CXX_RUNTIME_DLL=msvcp140.dll -+ -+ # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146) -+ CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-" -+ -+ -+ -+ -+ # Check linker version, except in lld builds -+ case "$LINKER" in -+ *lld*) -+ ;; -+ *) -+ _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` -+ _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` -+ if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then -+ { echo "configure: error: The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE." 1>&2; echo "configure: error: The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE." 1>&5; exit 1; } -+ fi -+ ;; -+ esac -+ -+ INCREMENTAL_LINKER=1 -+ -+ unset _MSVC_VER_FILTER -+ -+ CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0" -+ CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0" -+ else -+ # Check w32api version -+ _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` -+ _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` -+ echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 -+echo "configure:2392: checking for w32api version >= $W32API_VERSION" >&5 -+ cat > conftest.$ac_ext < -+int main() { -+#if (__W32API_MAJOR_VERSION < $_W32API_MAJOR_VERSION) || \ -+ (__W32API_MAJOR_VERSION == $_W32API_MAJOR_VERSION && \ -+ __W32API_MINOR_VERSION < $_W32API_MINOR_VERSION) -+ #error "test failed." -+ #endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ res=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ res=no -+fi -+rm -f conftest* -+ echo "$ac_t""$res" 1>&6 -+ if test "$res" != "yes"; then -+ { echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&2; echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&5; exit 1; } -+ fi -+ fi # !GNU_CC -+ -+ cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <<\EOF -+ (''' HAVE_LOCALECONV ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_LOCALECONV 1 -+EOF -+ -+ for ac_func in _getc_nolock -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:2468: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:2500: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+fi -+ -+fi # COMPILE_ENVIRONMENT -+ -+# Check to see if we are running in a broken QEMU scratchbox. -+# We know that anything below 1.0.16 is broken. -+for ac_prog in sb-conf ve -+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:2538: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_SBCONF'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$SBCONF"; then -+ ac_cv_prog_SBCONF="$SBCONF" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_SBCONF="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+SBCONF="$ac_cv_prog_SBCONF" -+if test -n "$SBCONF"; then -+ echo "$ac_t""$SBCONF" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$SBCONF" && break -+done -+test -n "$SBCONF" || SBCONF="""" -+ -+if test -n "$SBCONF"; then -+ _sb_version=`$SBCONF ve` -+ _sb_version_major=`echo $_sb_version | cut -f1 -d.` -+ _sb_version_minor=`echo $_sb_version | cut -f2 -d.` -+ _sb_version_point=`echo $_sb_version | cut -f3 -d.` -+ if test $_sb_version_major -eq 1 -a $_sb_version_minor -eq 0 -a $_sb_version_point -le 16; then -+ QEMU_CANT_RUN_JS_SHELL=1 -+ fi -+fi -+ -+ -+ -+ -+ -+if test "$COMPILE_ENVIRONMENT"; then -+ -+ -+ -+# If we find X, set shell vars x_includes and x_libraries to the -+# paths, otherwise set no_x=yes. -+# Uses ac_ vars as temps to allow command line to override cache and checks. -+# --without-x overrides everything else, but does not touch the cache. -+echo $ac_n "checking for X""... $ac_c" 1>&6 -+echo "configure:2591: checking for X" >&5 -+ -+# Check whether --with-x or --without-x was given. -+if test "${with_x+set}" = set; then -+ withval="$with_x" -+ : -+fi -+ -+# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -+if test "x$with_x" = xno; then -+ # The user explicitly disabled X. -+ have_x=disabled -+else -+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then -+ # Both variables are already set. -+ have_x=yes -+ else -+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=NO ac_x_libraries=NO -+rm -fr conftestdir -+if mkdir conftestdir; then -+ cd conftestdir -+ # Make sure to not put "make" in the Imakefile rules, since we grep it out. -+ cat > Imakefile <<'EOF' -+acfindx: -+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -+EOF -+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -+ for ac_extension in a so sl; do -+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -+ test -f $ac_im_libdir/libX11.$ac_extension; then -+ ac_im_usrlibdir=$ac_im_libdir; break -+ fi -+ done -+ # Screen out bogus values from the imake configuration. They are -+ # bogus both because they are the default anyway, and because -+ # using them would break gcc on systems where it needs fixed includes. -+ case "$ac_im_incroot" in -+ /usr/include) ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; -+ esac -+ case "$ac_im_usrlibdir" in -+ /usr/lib | /lib) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; -+ esac -+ fi -+ cd .. -+ rm -fr conftestdir -+fi -+ -+if test "$ac_x_includes" = NO; then -+ # Guess where to find include files, by looking for this one X11 .h file. -+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -+ -+ # First, try using that file with no special directory specified. -+cat > conftest.$ac_ext < -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:2658: \"$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* -+ # We can compile using X headers with no special include directory. -+ac_x_includes= -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ # Look for the header file in a standard set of common directories. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ for ac_dir in \ -+ /usr/X11/include \ -+ /usr/X11R6/include \ -+ /usr/X11R5/include \ -+ /usr/X11R4/include \ -+ \ -+ /usr/include/X11 \ -+ /usr/include/X11R6 \ -+ /usr/include/X11R5 \ -+ /usr/include/X11R4 \ -+ \ -+ /usr/local/X11/include \ -+ /usr/local/X11R6/include \ -+ /usr/local/X11R5/include \ -+ /usr/local/X11R4/include \ -+ \ -+ /usr/local/include/X11 \ -+ /usr/local/include/X11R6 \ -+ /usr/local/include/X11R5 \ -+ /usr/local/include/X11R4 \ -+ \ -+ /usr/X386/include \ -+ /usr/x386/include \ -+ /usr/XFree86/include/X11 \ -+ \ -+ /usr/include \ -+ /usr/local/include \ -+ /usr/unsupported/include \ -+ /usr/athena/include \ -+ /usr/local/x11r5/include \ -+ /usr/lpp/Xamples/include \ -+ \ -+ /usr/openwin/include \ -+ /usr/openwin/share/include \ -+ ; \ -+ do -+ if test -r "$ac_dir/$x_direct_test_include"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+ done -+fi -+rm -f conftest* -+fi # $ac_x_includes = NO -+ -+if test "$ac_x_libraries" = NO; then -+ # Check for the libraries. -+ -+ test -z "$x_direct_test_library" && x_direct_test_library=Xt -+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc -+ -+ # See if we find them without any special options. -+ # Don't add to $LIBS permanently. -+ ac_save_LIBS="$LIBS" -+ LIBS="-l$x_direct_test_library $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ LIBS="$ac_save_LIBS" -+# We can link X programs with no special library path. -+ac_x_libraries= -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ LIBS="$ac_save_LIBS" -+# First see if replacing the include by lib works. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -+ /usr/X11/lib \ -+ /usr/X11R6/lib \ -+ /usr/X11R5/lib \ -+ /usr/X11R4/lib \ -+ \ -+ /usr/lib/X11 \ -+ /usr/lib/X11R6 \ -+ /usr/lib/X11R5 \ -+ /usr/lib/X11R4 \ -+ \ -+ /usr/local/X11/lib \ -+ /usr/local/X11R6/lib \ -+ /usr/local/X11R5/lib \ -+ /usr/local/X11R4/lib \ -+ \ -+ /usr/local/lib/X11 \ -+ /usr/local/lib/X11R6 \ -+ /usr/local/lib/X11R5 \ -+ /usr/local/lib/X11R4 \ -+ \ -+ /usr/X386/lib \ -+ /usr/x386/lib \ -+ /usr/XFree86/lib/X11 \ -+ \ -+ /usr/lib \ -+ /usr/local/lib \ -+ /usr/unsupported/lib \ -+ /usr/athena/lib \ -+ /usr/local/x11r5/lib \ -+ /usr/lpp/Xamples/lib \ -+ /lib/usr/lib/X11 \ -+ \ -+ /usr/openwin/lib \ -+ /usr/openwin/share/lib \ -+ ; \ -+do -+ for ac_extension in a so sl; do -+ if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then -+ ac_x_libraries=$ac_dir -+ break 2 -+ fi -+ done -+done -+fi -+rm -f conftest* -+fi # $ac_x_libraries = NO -+ -+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then -+ # Didn't find X anywhere. Cache the known absence of X. -+ ac_cv_have_x="have_x=no" -+else -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes \ -+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -+fi -+fi -+ fi -+ eval "$ac_cv_have_x" -+fi # $with_x != no -+ -+if test "$have_x" != yes; then -+ echo "$ac_t""$have_x" 1>&6 -+ no_x=yes -+else -+ # If each of the values was on the command line, it overrides each guess. -+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes -+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -+ # Update the cache value to reflect the command line values. -+ ac_cv_have_x="have_x=yes \ -+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 -+fi -+ -+if test "$no_x" = yes; then -+ # Not all programs may use this symbol, but it does not hurt to define it. -+ cat >> confdefs.pytmp <<\EOF -+ (''' X_DISPLAY_MISSING ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define X_DISPLAY_MISSING 1 -+EOF -+ -+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+else -+ if test -n "$x_includes"; then -+ X_CFLAGS="$X_CFLAGS -I$x_includes" -+ fi -+ -+ # It would also be nice to do this for all -L options, not just this one. -+ if test -n "$x_libraries"; then -+ X_LIBS="$X_LIBS -L$x_libraries" -+ # For Solaris; some versions of Sun CC require a space after -R and -+ # others require no space. Words are not sufficient . . . . -+ case "`(uname -sr) 2>/dev/null`" in -+ "SunOS 5"*) -+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -+echo "configure:2843: checking whether -R must be followed by a space" >&5 -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_R_nospace=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_R_nospace=no -+fi -+rm -f conftest* -+ if test $ac_R_nospace = yes; then -+ echo "$ac_t""no" 1>&6 -+ X_LIBS="$X_LIBS -R$x_libraries" -+ else -+ LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_R_space=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_R_space=no -+fi -+rm -f conftest* -+ if test $ac_R_space = yes; then -+ echo "$ac_t""yes" 1>&6 -+ X_LIBS="$X_LIBS -R $x_libraries" -+ else -+ echo "$ac_t""neither works" 1>&6 -+ fi -+ fi -+ LIBS="$ac_xsave_LIBS" -+ esac -+ fi -+ -+ # Check for system-dependent libraries X programs must link with. -+ # Do this before checking for the system-independent R6 libraries -+ # (-lICE), since we may need -lsocket or whatever for X linking. -+ -+ if test "$ISC" = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -+ else -+ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And karl@cs.umb.edu says -+ # the Alpha needs dnet_stub (dnet does not exist). -+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -+echo "configure:2908: checking for dnet_ntoa in -ldnet" >&5 -+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldnet $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -+echo "configure:2949: checking for dnet_ntoa in -ldnet_stub" >&5 -+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldnet_stub $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -+ # to get the SysV transport functions. -+ # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # needs -lnsl. -+ # The nsl library prevents programs from opening the X display -+ # on Irix 5.2, according to dickey@clark.net. -+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -+echo "configure:2997: checking for gethostbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef gethostbyname -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char gethostbyname(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -+choke me -+#else -+gethostbyname(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_gethostbyname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_gethostbyname=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_gethostbyname = no; then -+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:3050: checking for gethostbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lnsl $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # lieder@skyler.mavd.honeywell.com says without -lsocket, -+ # socket/setsockopt and other routines are undefined under SCO ODT -+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -+ # on later versions), says simon@lia.di.epfl.ch: it contains -+ # gethostby* variants that don't use the nameserver (or something). -+ # -lsocket must be given before -lnsl if both are needed. -+ # We assume that if connect needs -lnsl, so does gethostbyname. -+ echo $ac_n "checking for connect""... $ac_c" 1>&6 -+echo "configure:3099: checking for connect" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef connect -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char connect(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_connect) || defined (__stub___connect) -+choke me -+#else -+connect(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_connect=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_connect=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_connect = no; then -+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -+echo "configure:3152: checking for connect in -lsocket" >&5 -+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. -+ echo $ac_n "checking for remove""... $ac_c" 1>&6 -+echo "configure:3195: checking for remove" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef remove -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char remove(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_remove) || defined (__stub___remove) -+choke me -+#else -+remove(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_remove=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_remove=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_remove = no; then -+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -+echo "configure:3248: checking for remove in -lposix" >&5 -+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lposix $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ echo $ac_n "checking for shmat""... $ac_c" 1>&6 -+echo "configure:3291: checking for shmat" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef shmat -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char shmat(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_shmat) || defined (__stub___shmat) -+choke me -+#else -+shmat(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_shmat=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_shmat=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_shmat = no; then -+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -+echo "configure:3344: checking for shmat in -lipc" >&5 -+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lipc $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ fi -+ -+ # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS="$LDFLAGS" -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -+ # check for ICE first), but we must link in the order -lSM -lICE or -+ # we get undefined symbols. So assume we have SM if we have ICE. -+ # These have to be linked with before -lX11, unlike the other -+ # libraries we check for below, so use a different variable. -+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -+echo "configure:3396: checking for IceConnectionNumber in -lICE" >&5 -+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ LDFLAGS="$ac_save_LDFLAGS" -+ -+fi -+ -+ -+XCFLAGS="$X_CFLAGS" -+ -+fi # COMPILE_ENVIRONMENT -+ -+# Separate version into components for use in shared object naming etc -+ -+MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"` -+MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"` -+MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` -+IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` -+ -+JS_SHELL_NAME=js -+JS_CONFIG_NAME=js-config -+ -+ -+if test -n "$IS_ALPHA"; then -+ -+ MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"` -+ -+fi -+cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <&2; echo "configure: error: Couldn't find path to llvm-libc++ in the android ndk" 1>&5; exit 1; } -+ fi -+ -+ STLPORT_LIBS="-L$cxx_libs -lc++_static" -+ # NDK r12 split the libc++ runtime libraries into pieces. -+ for lib in c++abi unwind android_support; do -+ if test -e "$cxx_libs/lib${lib}.a"; then -+ STLPORT_LIBS="$STLPORT_LIBS -l${lib}" -+ fi -+ done -+ fi -+fi -+ -+ -+ -+ -+WARNINGS_CFLAGS="$_WARNINGS_CFLAGS" -+if test -n "${CLANG_CC}${CLANG_CL}"; then -+ WARNINGS_CFLAGS="-Qunused-arguments $WARNINGS_CFLAGS" -+ CPPFLAGS="-Qunused-arguments ${CPPFLAGS}" -+fi -+if test -n "${CLANG_CXX}${CLANG_CL}"; then -+ _WARNINGS_CXXFLAGS="-Qunused-arguments ${_WARNINGS_CXXFLAGS}" -+fi -+ -+ -+ -+if test -n "$MOZ_ASAN"; then -+ if test -n "$CLANG_CL"; then -+ # Look for the ASan runtime binary -+ if test "$CPU_ARCH" = "x86_64"; then -+ MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-x86_64.dll -+ else -+ MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-i386.dll -+ fi -+ # We use MOZ_PATH_PROG in order to get a Windows style path. -+ # Extract the first word of "$MOZ_CLANG_RT_ASAN_LIB", so it can be a program name with args. -+set dummy $MOZ_CLANG_RT_ASAN_LIB; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3571: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$MOZ_CLANG_RT_ASAN_LIB_PATH" in -+ /*) -+ ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH="$MOZ_CLANG_RT_ASAN_LIB_PATH" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH="$MOZ_CLANG_RT_ASAN_LIB_PATH" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+MOZ_CLANG_RT_ASAN_LIB_PATH="$ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH" -+if test -n "$MOZ_CLANG_RT_ASAN_LIB_PATH"; then -+ echo "$ac_t""$MOZ_CLANG_RT_ASAN_LIB_PATH" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$MOZ_CLANG_RT_ASAN_LIB_PATH" in -+ /*) -+ tmp_DIRNAME=`dirname "$MOZ_CLANG_RT_ASAN_LIB_PATH"` -+ tmp_BASENAME=`basename "$MOZ_CLANG_RT_ASAN_LIB_PATH"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ MOZ_CLANG_RT_ASAN_LIB_PATH="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$MOZ_CLANG_RT_ASAN_LIB_PATH.exe"; then -+ MOZ_CLANG_RT_ASAN_LIB_PATH="$MOZ_CLANG_RT_ASAN_LIB_PATH.exe" -+ fi -+ esac -+ fi -+ -+ if test -z "$MOZ_CLANG_RT_ASAN_LIB_PATH"; then -+ { echo "configure: error: Couldn't find $MOZ_CLANG_RT_ASAN_LIB. It should be available in the same location as clang-cl." 1>&2; echo "configure: error: Couldn't find $MOZ_CLANG_RT_ASAN_LIB. It should be available in the same location as clang-cl." 1>&5; exit 1; } -+ fi -+ -+ # Suppressing errors in recompiled code. -+ if test "$OS_ARCH" = "WINNT"; then -+ CFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CFLAGS" -+ CXXFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CXXFLAGS" -+ fi -+ fi -+ CFLAGS="-fsanitize=address $CFLAGS" -+ CXXFLAGS="-fsanitize=address $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=address -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_ASAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_ASAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3641: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+# Check whether --enable-memory-sanitizer or --disable-memory-sanitizer was given. -+if test "${enable_memory_sanitizer+set}" = set; then -+ enableval="$enable_memory_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_MSAN=1 -+ elif test "$enableval" = "no"; then -+ MOZ_MSAN= -+ else -+ { echo "configure: error: Option, memory-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, memory-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+if test -n "$MOZ_MSAN"; then -+ CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins $CFLAGS" -+ CXXFLAGS="-fsanitize=memory -fsanitize-memory-track-origins $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_MSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_MSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3717: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+# Check whether --enable-thread-sanitizer or --disable-thread-sanitizer was given. -+if test "${enable_thread_sanitizer+set}" = set; then -+ enableval="$enable_thread_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_TSAN=1 -+ elif test "$enableval" = "no"; then -+ MOZ_TSAN= -+ else -+ { echo "configure: error: Option, thread-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, thread-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+if test -n "$MOZ_TSAN"; then -+ CFLAGS="-fsanitize=thread $CFLAGS" -+ CXXFLAGS="-fsanitize=thread $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=thread -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_TSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_TSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3793: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+if test -n "$MOZ_UBSAN_CHECKS"; then -+ MOZ_UBSAN=1 -+ UBSAN_TXT="$_objdir/ubsan_blacklist.txt" -+ cat $_topsrcdir/build/sanitizers/ubsan_*_blacklist.txt > $UBSAN_TXT -+ UBSAN_FLAGS="-fsanitize=$MOZ_UBSAN_CHECKS -fno-sanitize-recover=$MOZ_UBSAN_CHECKS -fsanitize-blacklist=$UBSAN_TXT" -+ CFLAGS="$UBSAN_FLAGS $CFLAGS" -+ CXXFLAGS="$UBSAN_FLAGS $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=undefined -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_UBSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_UBSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3861: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+ -+# Check whether --enable-signed-overflow-sanitizer or --disable-signed-overflow-sanitizer was given. -+if test "${enable_signed_overflow_sanitizer+set}" = set; then -+ enableval="$enable_signed_overflow_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_SIGNED_OVERFLOW_SANITIZE=1 -+ elif test "$enableval" = "no"; then -+ MOZ_SIGNED_OVERFLOW_SANITIZE= -+ else -+ { echo "configure: error: Option, signed-overflow-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, signed-overflow-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+# Check whether --enable-unsigned-overflow-sanitizer or --disable-unsigned-overflow-sanitizer was given. -+if test "${enable_unsigned_overflow_sanitizer+set}" = set; then -+ enableval="$enable_unsigned_overflow_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_UNSIGNED_OVERFLOW_SANITIZE=1 -+ elif test "$enableval" = "no"; then -+ MOZ_UNSIGNED_OVERFLOW_SANITIZE= -+ else -+ { echo "configure: error: Option, unsigned-overflow-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, unsigned-overflow-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test -n "$MOZ_SIGNED_OVERFLOW_SANITIZE$MOZ_UNSIGNED_OVERFLOW_SANITIZE"; then -+ MOZ_UBSAN=1 -+ SANITIZER_BLACKLISTS="" -+ if test -n "$MOZ_SIGNED_OVERFLOW_SANITIZE"; then -+ SANITIZER_BLACKLISTS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/ubsan_signed_overflow_blacklist.txt $SANITIZER_BLACKLISTS" -+ CFLAGS="-fsanitize=signed-integer-overflow $CFLAGS" -+ CXXFLAGS="-fsanitize=signed-integer-overflow $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=signed-integer-overflow -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_SIGNED_OVERFLOW_SANITIZE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_SIGNED_OVERFLOW_SANITIZE 1 -+EOF -+ -+ fi -+ if test -n "$MOZ_UNSIGNED_OVERFLOW_SANITIZE"; then -+ SANITIZER_BLACKLISTS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/ubsan_unsigned_overflow_blacklist.txt $SANITIZER_BLACKLISTS" -+ CFLAGS="-fsanitize=unsigned-integer-overflow $CFLAGS" -+ CXXFLAGS="-fsanitize=unsigned-integer-overflow $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=unsigned-integer-overflow -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_UNSIGNED_OVERFLOW_SANITIZE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_UNSIGNED_OVERFLOW_SANITIZE 1 -+EOF -+ -+ fi -+ CFLAGS="$SANITIZER_BLACKLISTS $CFLAGS" -+ CXXFLAGS="$SANITIZER_BLACKLISTS $CXXFLAGS" -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_UBSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_UBSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3980: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+ -+ -+if test -n "$LIBFUZZER"; then -+ LDFLAGS="$LIBFUZZER_FLAGS -rdynamic $LDFLAGS" -+fi -+ -+# The LLVM symbolizer is used by all sanitizers -+ -+ -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: compiler is incompatible with sanitize options" 1>&2; echo "configure: error: compiler is incompatible with sanitize options" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ -+ -+ -+if test "$GNU_CC"; then -+ DSO_LDOPTS='-shared' -+ if test "$GCC_USE_GNU_LD"; then -+ # Some tools like ASan use a runtime library that is only -+ # linked against executables, so we must allow undefined -+ # symbols for shared objects in some cases. -+ if test -z "$MOZ_ASAN$MOZ_MSAN$MOZ_UBSAN$MOZ_TSAN$FUZZING_INTERFACES"; then -+ # Don't allow undefined symbols in libraries -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" -+ fi -+ fi -+ WARNINGS_AS_ERRORS='-Werror' -+ DSO_CFLAGS='' -+ -+ if test "$OS_ARCH" != "WINNT"; then -+ DSO_PIC_CFLAGS='-fPIC' -+ ASFLAGS="$ASFLAGS -fPIC" -+ fi -+ -+ echo $ac_n "checking for --noexecstack option to as""... $ac_c" 1>&6 -+echo "configure:4077: checking for --noexecstack option to as" >&5 -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS -Wa,--noexecstack" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+ ASFLAGS="$ASFLAGS -Wa,--noexecstack" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ CFLAGS=$_SAVE_CFLAGS -+ echo $ac_n "checking for -z noexecstack option to ld""... $ac_c" 1>&6 -+echo "configure:4101: checking for -z noexecstack option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -z text option to ld""... $ac_c" 1>&6 -+echo "configure:4125: checking for -z text option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,text" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -z relro option to ld""... $ac_c" 1>&6 -+echo "configure:4149: checking for -z relro option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,relro" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -z nocopyreloc option to ld""... $ac_c" 1>&6 -+echo "configure:4173: checking for -z nocopyreloc option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,nocopyreloc" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -Bsymbolic-functions option to ld""... $ac_c" 1>&6 -+echo "configure:4197: checking for -Bsymbolic-functions option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for --build-id=sha1 option to ld""... $ac_c" 1>&6 -+echo "configure:4221: checking for --build-id=sha1 option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,--build-id=sha1" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ _DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT" -+ _USE_CPP_INCLUDE_FLAG=1 -+fi -+ -+if test "$GNU_CXX"; then -+ _DEFINES_CXXFLAGS="-DMOZILLA_CLIENT -include $jsconfdefs" -+ _USE_CPP_INCLUDE_FLAG=1 -+fi -+ -+case "$host" in -+*mingw*) -+ if test -n "$_WIN32_MSVC"; then -+ HOST_CFLAGS="$HOST_CFLAGS -nologo" -+ else -+ HOST_CFLAGS="$HOST_CFLAGS -mwindows" -+ fi -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN -DWIN32 -D_WIN32 -D_CRT_SECURE_NO_WARNINGS" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" -+ HOST_BIN_SUFFIX=.exe -+ -+ case "${host_cpu}" in -+ i*86) -+ if test -n "$_WIN32_MSVC"; then -+ HOST_LDFLAGS="$HOST_LDFLAGS -MACHINE:X86" -+ fi -+ ;; -+ x86_64) -+ if test -n "$_WIN32_MSVC"; then -+ HOST_LDFLAGS="$HOST_LDFLAGS -MACHINE:X64" -+ fi -+ HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" -+ ;; -+ esac -+ ;; -+ -+*-darwin*) -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ ;; -+ -+*-linux*|*-kfreebsd*-gnu|*-gnu*) -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ ;; -+ -+*) -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" -+ ;; -+esac -+ -+ -+CFLAGS="$CFLAGS $MOZ_HARDENING_CFLAGS_JS" -+CPPFLAGS="$CPPFLAGS $MOZ_HARDENING_CFLAGS_JS" -+CXXFLAGS="$CXXFLAGS $MOZ_HARDENING_CFLAGS_JS" -+LDFLAGS="$LDFLAGS $MOZ_HARDENING_LDFLAGS_JS" -+ -+ -+case "$target" in -+*-darwin*) -+ MOZ_OPTIMIZE_FLAGS="-O3" -+ CFLAGS="$CFLAGS -fno-common" -+ CXXFLAGS="$CXXFLAGS -fno-common -stdlib=libc++" -+ DSO_LDOPTS='' -+ STRIP="$STRIP -x -S" -+ LDFLAGS="$LDFLAGS -lobjc" -+ # The ExceptionHandling framework is needed for Objective-C exception -+ # logging code in nsObjCExceptions.h. Currently we only use that in debug -+ # builds. -+ _SAVE_LDFLAGS=$LDFLAGS -+ echo $ac_n "checking for -framework ExceptionHandling""... $ac_c" 1>&6 -+echo "configure:4315: checking for -framework ExceptionHandling" >&5 -+ LDFLAGS="$LDFLAGS -framework ExceptionHandling" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_have_framework_exceptionhandling="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_have_framework_exceptionhandling="no" -+fi -+rm -f conftest* -+ echo "$ac_t""$ac_cv_have_framework_exceptionhandling" 1>&6 -+ if test "$ac_cv_have_framework_exceptionhandling" = "yes"; then -+ MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"; -+ fi -+ LDFLAGS=$_SAVE_LDFLAGS -+ -+ if test "x$enable_dtrace" = "xyes"; then -+ 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:4345: checking for -dead_strip option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-dead_strip" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ _HAVE_DEAD_STRIP=1 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _HAVE_DEAD_STRIP= -+fi -+rm -f conftest* -+ if test -n "$_HAVE_DEAD_STRIP" ; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip" -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ LDFLAGS=$_SAVE_LDFLAGS -+ fi -+ MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin" -+ ;; -+ -+*-android*|*-linuxandroid*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' NO_PW_GECOS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define NO_PW_GECOS 1 -+EOF -+ -+ MOZ_GFX_OPTIMIZE_MOBILE=1 -+ MOZ_OPTIMIZE_FLAGS="-O3" -+ if test -z "$CLANG_CC"; then -+ MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS" -+ fi -+ ;; -+ -+*-*linux*) -+ if test "$GNU_CC" -o "$GNU_CXX"; then -+ MOZ_PGO_OPTIMIZE_FLAGS="-O3" -+ MOZ_OPTIMIZE_FLAGS="-O3" -+ if test -z "$CLANG_CC"; then -+ MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS" -+ fi -+ fi -+ -+ case "${target_cpu}" in -+ alpha*) -+ CFLAGS="$CFLAGS -mieee" -+ CXXFLAGS="$CXXFLAGS -mieee" -+ ;; -+ esac -+ ;; -+ -+*-mingw*) -+ DSO_CFLAGS= -+ DSO_PIC_CFLAGS= -+ if test -n "$GNU_CC" -o -n "$CLANG_CC"; then -+ CC="$CC -mwindows" -+ CXX="$CXX -mwindows" -+ CPP="$CPP -mwindows" -+ CFLAGS="$CFLAGS -mms-bitfields" -+ CXXFLAGS="$CXXFLAGS -mms-bitfields" -+ DSO_LDOPTS='-shared' -+ # Use temp file for windres (bug 213281) -+ RCFLAGS='-O coff --use-temp-file' -+ # mingw doesn't require kernel32, user32, and advapi32 explicitly -+ LIBS="$LIBS -lusp10 -lgdi32 -lwinmm -lwsock32" -+ MOZ_FIX_LINK_PATHS= -+ -+ if test -z "$CLANG_CC"; then -+ # Use static libgcc and libstdc++ -+ LDFLAGS="$LDFLAGS -static" -+ else -+ # Silence problematic clang warnings -+ CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct" -+ fi -+ -+ MOZ_OPTIMIZE_FLAGS="-O2" -+ -+ WIN32_CONSOLE_EXE_LDFLAGS=-mconsole -+ WIN32_GUI_EXE_LDFLAGS=-mwindows -+ else -+ TARGET_COMPILER_ABI=msvc -+ HOST_CC='$(CC)' -+ HOST_CXX='$(CXX)' -+ RANLIB='echo not_ranlib' -+ STRIP='echo not_strip' -+ PKG_SKIP_STRIP=1 -+ # aarch64 doesn't support subsystems below 6.02 -+ if test "$CPU_ARCH" = "aarch64"; then -+ WIN32_SUBSYSTEM_VERSION=6.02 -+ else -+ WIN32_SUBSYSTEM_VERSION=6.01 -+ fi -+ WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION -+ WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION -+ DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION -+ _USE_CPP_INCLUDE_FLAG=1 -+ _DEFINES_CFLAGS="-FI $jsconfdefs -DMOZILLA_CLIENT" -+ _DEFINES_CXXFLAGS="-FI $jsconfdefs -DMOZILLA_CLIENT" -+ CFLAGS="$CFLAGS -W3 -Gy -Zc:inline" -+ CXXFLAGS="$CXXFLAGS -W3 -Gy -Zc:inline" -+ if test "$CPU_ARCH" = "x86";then -+ -+ if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then -+ CFLAGS="$CFLAGS -arch:SSE2" -+ fi -+ if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then -+ CXXFLAGS="$CXXFLAGS -arch:SSE2" -+ fi -+ -+ fi -+ if test -z "$MOZ_ASAN"; then -+ CFLAGS="$CFLAGS -Gw" -+ CXXFLAGS="$CXXFLAGS -Gw" -+ else -+ # String tail merging doesn't play nice with ASan's ODR checker. -+ LDFLAGS="$LDFLAGS -opt:nolldtailmerge" -+ fi -+ if test -n "$CLANG_CL"; then -+ # XXX We should combine some of these with our generic GCC-style -+ # warning checks. -+ # -+ # Suppress the clang-cl warning for the inline 'new' and 'delete' in mozalloc -+ CXXFLAGS="$CXXFLAGS -Wno-inline-new-delete" -+ # We use offsetof on non-POD objects all the time. -+ # We also suppress this warning on other platforms. -+ CXXFLAGS="$CXXFLAGS -Wno-invalid-offsetof" -+ # This warns for reasonable things like: -+ # enum { X = 0xffffffffU }; -+ # which is annoying for IDL headers. -+ CXXFLAGS="$CXXFLAGS -Wno-microsoft-enum-value" -+ # This warns for cases that would be reached by the Microsoft -+ # #include rules, but also currently warns on cases that would -+ # *also* be reached by standard C++ include rules. That -+ # behavior doesn't seem useful, so we turn it off. -+ CXXFLAGS="$CXXFLAGS -Wno-microsoft-include" -+ # We normally error out on unknown pragmas, but since clang-cl -+ # claims to be MSVC, it would be difficult to add -+ # #if defined(_MSC_VER) && !defined(__clang__) everywhere we -+ # use such pragmas, so just ignore them. -+ CFLAGS="$CFLAGS -Wno-unknown-pragmas" -+ CXXFLAGS="$CXXFLAGS -Wno-unknown-pragmas" -+ # We get errors about various #pragma intrinsic directives from -+ # clang-cl, and we don't need to hear about those. -+ CFLAGS="$CFLAGS -Wno-ignored-pragmas" -+ CXXFLAGS="$CXXFLAGS -Wno-ignored-pragmas" -+ # clang-cl's Intrin.h marks things like _ReadWriteBarrier -+ # as __attribute((__deprecated__)). This is nice to know, -+ # but since we don't get the equivalent warning from MSVC, -+ # let's just ignore it. -+ CFLAGS="$CFLAGS -Wno-deprecated-declarations" -+ CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations" -+ # We use a function like: -+ # __declspec(noreturn) __inline void f() {} -+ # which -Winvalid-noreturn complains about. Again, MSVC seems -+ # OK with it, so let's silence the warning. -+ CFLAGS="$CFLAGS -Wno-invalid-noreturn" -+ CXXFLAGS="$CXXFLAGS -Wno-invalid-noreturn" -+ # Missing |override| on virtual function declarations isn't -+ # something that MSVC currently warns about. -+ CXXFLAGS="$CXXFLAGS -Wno-inconsistent-missing-override" -+ # We use -DHAS_EXCEPTIONS=0, which removes the |throw()| -+ # declaration on |operator delete(void*)|. However, clang-cl -+ # must internally declare |operator delete(void*)| differently, -+ # which causes this warning for virtually every file in the -+ # tree. clang-cl doesn't support -fno-exceptions or equivalent, -+ # so there doesn't seem to be any way to convince clang-cl to -+ # declare |delete| differently. Therefore, suppress this -+ # warning. -+ CXXFLAGS="$CXXFLAGS -Wno-implicit-exception-spec-mismatch" -+ # At least one MSVC header and several headers in-tree have -+ # unused typedefs, so turn this on. -+ CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef" -+ # jemalloc uses __declspec(allocator) as a profiler hint, -+ # which clang-cl doesn't understand. -+ CXXFLAGS="$CXXFLAGS -Wno-ignored-attributes" -+ # __attribute__((unused)) really means "might be unused" and -+ # we use it to avoid warnings about things that are unused -+ # in some compilation units, but used in many others. This -+ # warning insists on complaining about the latter case, which -+ # is annoying, and rather noisy. -+ CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused" -+ fi -+ LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib" -+ MOZ_DEBUG_LDFLAGS='-DEBUG' -+ WARNINGS_AS_ERRORS='-WX' -+ MOZ_OPTIMIZE_FLAGS="-O2" -+ MOZ_FIX_LINK_PATHS= -+ LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE" -+ if test -z "$DEVELOPER_OPTIONS"; then -+ LDFLAGS="$LDFLAGS -RELEASE" -+ fi -+ RCFLAGS="-nologo" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE__MSIZE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE__MSIZE 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' WIN32_LEAN_AND_MEAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define WIN32_LEAN_AND_MEAN 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' NOMINMAX ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define NOMINMAX 1 -+EOF -+ -+ BIN_SUFFIX='.exe' -+ MOZ_USER_DIR="Mozilla" -+ -+ case "$host_os" in -+ cygwin*|msvc*|mks*) -+ { echo "configure: error: Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites." 1>&2; echo "configure: error: Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites." 1>&5; exit 1; } -+ ;; -+ esac -+ -+ if test -n "$GNU_CC" -a -z "$CLANG_CC"; then -+ CFLAGS="$CFLAGS -fno-keep-inline-dllexport" -+ CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport" -+ fi -+ -+ case "$target" in -+ i*86-*) -+ if test -n "$GNU_CC"; then -+ CFLAGS="$CFLAGS -mstackrealign" -+ CXXFLAGS="$CXXFLAGS -mstackrealign" -+ LDFLAGS="$LDFLAGS -Wl,--large-address-aware" -+ else -+ DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" -+ LDFLAGS="$LDFLAGS -SAFESEH" -+ fi -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _X86_ ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _X86_ 1 -+EOF -+ -+ ;; -+ x86_64-*) -+ if test -n "$_WIN32_MSVC"; then -+ DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X64" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' _AMD64_ ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _AMD64_ 1 -+EOF -+ -+ ;; -+ aarch64-*) -+ if test -n "$_WIN32_MSVC"; then -+ DSO_LDOPTS="$DSO_LDOPTS -MACHINE:ARM64" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' _ARM64_ ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _ARM64_ 1 -+EOF -+ -+ ;; -+ *) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _CPU_ARCH_NOT_DEFINED ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _CPU_ARCH_NOT_DEFINED 1 -+EOF -+ -+ ;; -+ esac -+ ;; -+ -+*-netbsd*) -+ DSO_CFLAGS='' -+ CFLAGS="$CFLAGS -Dunix" -+ CXXFLAGS="$CXXFLAGS -Dunix" -+ if $CC -E - -dM /dev/null; then -+ DSO_PIC_CFLAGS='-fPIC -DPIC' -+ DSO_LDOPTS='-shared' -+ MOZ_PROGRAM_LDFLAGS="$MOZ_PROGRAM_LDFLAGS -Wl,--export-dynamic" -+ else -+ DSO_PIC_CFLAGS='-fPIC -DPIC' -+ DSO_LDOPTS='-shared' -+ fi -+ # This will fail on a.out systems prior to 1.5.1_ALPHA. -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi -+ ;; -+ -+*-openbsd*) -+ DSO_CFLAGS='' -+ DSO_PIC_CFLAGS='-fPIC' -+ DSO_LDOPTS='-shared -fPIC' -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" -+ fi -+ ;; -+ -+*-solaris*) -+ MOZ_FIX_LINK_PATHS="-L${DIST}/bin" -+ ;; -+ -+esac -+ -+if test -z "$MOZ_OPTIMIZE_FLAGS"; then -+ MOZ_OPTIMIZE_FLAGS="-O" -+fi -+ -+if test -z "$COMPILE_ENVIRONMENT"; then -+ SKIP_COMPILER_CHECKS=1 -+ SKIP_LIBRARY_CHECKS=1 -+fi -+ -+if test -n "$COMPILE_ENVIRONMENT"; then -+ -+ -+ -+if test -z "$MOZ_DEBUG" -o -n "$MOZ_ASAN"; then -+ MOZ_NO_DEBUG_RTL=1 -+fi -+ -+ -+ -+MOZ_DEBUG_ENABLE_DEFS="DEBUG" -+# Check whether --with-debug-label or --without-debug-label was given. -+if test "${with_debug_label+set}" = set; then -+ withval="$with_debug_label" -+ for option in `echo $withval | sed 's/,/ /g'`; do -+ MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS DEBUG_${option}" -+done -+fi -+ -+ -+if test -n "$MOZ_DEBUG"; then -+ if test -n "$COMPILE_ENVIRONMENT"; then -+ echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -+echo "configure:4707: checking for valid debug flags" >&5 -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" -+ cat > conftest.$ac_ext < -+int main() { -+printf("Hello World\n"); -+; return 0; } -+EOF -+if { (eval echo configure:4718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ _results=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _results=no -+fi -+rm -f conftest* -+ echo "$ac_t""$_results" 1>&6 -+ if test "$_results" = "no"; then -+ { echo "configure: error: These compiler flags are invalid: $MOZ_DEBUG_FLAGS" 1>&2; echo "configure: error: These compiler flags are invalid: $MOZ_DEBUG_FLAGS" 1>&5; exit 1; } -+ fi -+ CFLAGS=$_SAVE_CFLAGS -+ fi -+ -+ MOZ_DEBUG_DEFINES="$MOZ_DEBUG_ENABLE_DEFS" -+else -+ MOZ_DEBUG_DEFINES="NDEBUG TRIMMED" -+fi -+ -+ -+ -+ -+ -+# Check whether --enable-cpp-rtti or --disable-cpp-rtti was given. -+if test "${enable_cpp_rtti+set}" = set; then -+ enableval="$enable_cpp_rtti" -+ if test "$enableval" = "yes"; then -+ _MOZ_USE_RTTI=1 -+ elif test "$enableval" = "no"; then -+ _MOZ_USE_RTTI= -+ else -+ { echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test -z "$_MOZ_USE_RTTI"; then -+ if test "$GNU_CC"; then -+ CXXFLAGS="$CXXFLAGS -fno-rtti" -+ else -+ case "$target" in -+ *-mingw*) -+ CXXFLAGS="$CXXFLAGS -GR-" -+ esac -+ fi -+fi -+ -+if test "$CLANG_CXX"; then -+ ## We disable return-type-c-linkage because jsval is defined as a C++ type but is -+ ## returned by C functions. This is possible because we use knowledge about the ABI -+ ## to typedef it to a C type with the same layout when the headers are included -+ ## from C. -+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-unknown-warning-option -Wno-return-type-c-linkage" -+fi -+ -+if test "$GNU_CC"; then -+ if test -z "$DEVELOPER_OPTIONS"; then -+ CFLAGS="$CFLAGS -ffunction-sections -fdata-sections" -+ CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections" -+ fi -+ -+ # For MinGW, we need big-obj otherwise we create too many sections in Unified builds -+ if test "${OS_ARCH}" = "WINNT"; then -+ CFLAGS="$CFLAGS -Wa,-mbig-obj" -+ CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj" -+ fi -+ -+ CFLAGS="$CFLAGS -fno-math-errno" -+ CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno" -+fi -+ -+ -+# Check whether --enable-icf or --disable-icf was given. -+if test "${enable_icf+set}" = set; then -+ enableval="$enable_icf" -+ if test "$enableval" = "no"; then -+ MOZ_DISABLE_ICF=1 -+ elif test "$enableval" = "yes"; then -+ MOZ_DISABLE_ICF= -+ else -+ { echo "configure: error: Option, icf, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, icf, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF" -a -z "$DEVELOPER_OPTIONS"; then -+ echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 -+echo "configure:4808: 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 -+ echo 'int foo() {return 42;}' \ -+ 'int bar() {return 42;}' \ -+ '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:4817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ test -s conftest${ac_exeext} && -+ $LLVM_OBJDUMP -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then -+ LD_SUPPORTS_ICF=yes -+ else -+ LD_SUPPORTS_ICF=no -+ fi -+ rm -rf conftest* -+fi -+ -+echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6 -+ if test "$LD_SUPPORTS_ICF" = yes; then -+ _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe" -+ LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ LD_PRINT_ICF_SECTIONS= -+fi -+rm -f conftest* -+ -+ LDFLAGS="$_SAVE_LDFLAGS" -+ fi -+fi -+ -+ -+if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS"; then -+ if test -n "$MOZ_DEBUG_FLAGS"; then -+ echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 -+echo "configure:4858: 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:4865: \"$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:4866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then -+ if test "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest.${ac_objext} conftest.${ac_ext}`" = \ -+ "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest${ac_exeext} conftest.${ac_ext}`"; then -+ GC_SECTIONS_BREAKS_DEBUG_RANGES=no -+ else -+ GC_SECTIONS_BREAKS_DEBUG_RANGES=yes -+ fi -+ else -+ GC_SECTIONS_BREAKS_DEBUG_RANGES="no, but it's broken in some other way" -+ fi -+ rm -rf conftest* -+fi -+ -+echo "$ac_t""$GC_SECTIONS_BREAKS_DEBUG_RANGES" 1>&6 -+ if test "$GC_SECTIONS_BREAKS_DEBUG_RANGES" = no; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections" -+ fi -+ else -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections" -+ fi -+fi -+ -+if test "$GNU_CC$CLANG_CC"; then -+ MOZ_PROGRAM_LDFLAGS="$MOZ_PROGRAM_LDFLAGS -pie" -+fi -+ -+ -+ -+if test -n "$GCC_USE_GNU_LD"; then -+ case "$LDFLAGS" in -+ *-fsanitize=address*) -+ LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" -+ ;; -+ esac -+fi -+ -+ -+fi -+ -+if test -z "$SKIP_COMPILER_CHECKS"; then -+echo $ac_n "checking for working const""... $ac_c" 1>&6 -+echo "configure:4908: 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 <j = 5; -+} -+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+} -+ -+; return 0; } -+EOF -+if { (eval echo configure:4962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_c_const=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_const=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_c_const" 1>&6 -+if test $ac_cv_c_const = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' const ''', r''' ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define const -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -+echo "configure:4988: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_mode_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_mode_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -+if test $ac_cv_type_mode_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' mode_t ''', r''' int ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define mode_t int -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for off_t""... $ac_c" 1>&6 -+echo "configure:5026: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_off_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_off_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_off_t" 1>&6 -+if test $ac_cv_type_off_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' off_t ''', r''' long ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define off_t long -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -+echo "configure:5064: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_pid_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_pid_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -+if test $ac_cv_type_pid_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' pid_t ''', r''' int ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define pid_t int -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for size_t""... $ac_c" 1>&6 -+echo "configure:5102: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_size_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_size_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_size_t" 1>&6 -+if test $ac_cv_type_size_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' size_t ''', r''' unsigned ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define size_t unsigned -+EOF -+ -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -+echo "configure:5160: 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 < -+ #include -+int main() { -+ssize_t foo = 0; -+; return 0; } -+EOF -+if { (eval echo configure:5173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_type_ssize_t=true -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_type_ssize_t=false -+fi -+rm -f conftest* -+fi -+ -+if test "$ac_cv_type_ssize_t" = true ; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_SSIZE_T ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_SSIZE_T 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if test "$GNU_CXX"; then -+ echo $ac_n "checking whether 64-bits std::atomic requires -latomic""... $ac_c" 1>&6 -+echo "configure:5224: checking whether 64-bits std::atomic requires -latomic" >&5 -+if eval "test \"`echo '$''{'ac_cv_needs_atomic'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$CC_TYPE" = "clang" -a "$CPU_ARCH" = "x86" -a "$OS_ARCH" = "Linux"; then -+ ac_cv_needs_atomic=yes -+ else -+ cat > conftest.$ac_ext < -+ #include -+int main() { -+ std::atomic foo; foo = 1; -+; return 0; } -+EOF -+if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_needs_atomic=no -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _SAVE_LIBS="$LIBS" -+ LIBS="$LIBS -latomic" -+ cat > conftest.$ac_ext < -+ #include -+int main() { -+ std::atomic foo; foo = 1; -+; return 0; } -+EOF -+if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_needs_atomic=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_needs_atomic="do not know; assuming no" -+fi -+rm -f conftest* -+ LIBS="$_SAVE_LIBS" -+ -+fi -+rm -f conftest* -+ fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_needs_atomic" 1>&6 -+ if test "$ac_cv_needs_atomic" = yes; then -+ MOZ_NEEDS_LIBATOMIC=1 -+ else -+ MOZ_NEEDS_LIBATOMIC= -+ fi -+ -+fi -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+case "${OS_TARGET}" in -+WINNT|Darwin|Android) -+ ;; -+*) -+ STL_FLAGS="-I${DIST}/stl_wrappers" -+ WRAP_STL_INCLUDES=1 -+ ;; -+esac -+ -+ac_header_dirent=no -+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:5311: 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 < -+#include <$ac_hdr> -+int main() { -+DIR *dirp = 0; -+; return 0; } -+EOF -+if { (eval echo configure:5324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_dirent_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_dirent_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+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:5352: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldir $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LIBS="$LIBS -ldir" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+else -+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -+echo "configure:5393: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lx $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LIBS="$LIBS -lx" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+fi -+ -+case "$target_os" in -+freebsd*) -+# for stuff like -lXshm -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; -+esac -+ -+# Check whether --enable-dtrace or --disable-dtrace was given. -+if test "${enable_dtrace+set}" = set; then -+ enableval="$enable_dtrace" -+ if test "$enableval" = "yes"; then -+ enable_dtrace="yes" -+ elif test "$enableval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+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:5456: 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 < -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:5469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+ -+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ HAVE_DTRACE=1 -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ if test -n "$HAVE_DTRACE"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' INCLUDE_MOZILLA_DTRACE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define INCLUDE_MOZILLA_DTRACE 1 -+EOF -+ -+ else -+ { echo "configure: error: dtrace enabled but sys/sdt.h not found" 1>&2; echo "configure: error: dtrace enabled but sys/sdt.h not found" 1>&5; exit 1; }; -+ fi -+fi -+ -+ -+echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -+echo "configure:5504: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc_r $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+ -+case $target in -+*-darwin*) -+ ;; -+*) -+ -+echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -+echo "configure:5560: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_search_dlopen="none required" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_search_dlopen="-l$i" -+break -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+rm -f conftest* -+done -+LIBS="$ac_func_search_save_LIBS" -+fi -+ -+echo "$ac_t""$ac_cv_search_dlopen" 1>&6 -+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:5618: 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 < -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:5631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+ -+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_DLOPEN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_DLOPEN 1 -+EOF -+ -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+else : -+ -+fi -+ ;; -+esac -+ -+if test ! "$GNU_CXX"; then -+ echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -+echo "configure:5665: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lC $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo C | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+fi -+ -+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -+echo "configure:5717: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+ -+case "$target_os" in -+darwin*) -+ USE_PTHREADS=1 -+ ;; -+*) -+ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -+echo "configure:5773: checking for pthread_create in -lpthreads" >&5 -+ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lpthreads $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads" -+else -+ echo "$ac_t""no" 1>&6 -+echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -+echo "configure:5811: checking for pthread_create in -lpthread" >&5 -+ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lpthread $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" -+else -+ echo "$ac_t""no" 1>&6 -+echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -+echo "configure:5849: checking for pthread_create in -lc_r" >&5 -+ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc_r $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r" -+else -+ echo "$ac_t""no" 1>&6 -+echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -+echo "configure:5887: checking for pthread_create in -lc" >&5 -+ac_lib_var=`echo c'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ ;; -+esac -+ -+if test "$USE_PTHREADS"x != x -+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:5944: 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 -+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then -+ ac_cv_have_dash_pthread=yes -+ case "$target_os" in -+ freebsd*) -+# Freebsd doesn't use -pthread for compiles, it uses them for linking -+ ;; -+ *) -+ CFLAGS="$CFLAGS -pthread" -+ CXXFLAGS="$CXXFLAGS -pthread" -+ ;; -+ esac -+ fi -+ fi -+ rm -f conftest* -+ echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6 -+ -+ 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:5967: 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 -+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then -+ ac_cv_have_dash_pthreads=yes -+ CFLAGS="$CFLAGS -pthreads" -+ CXXFLAGS="$CXXFLAGS -pthreads" -+ fi -+ fi -+ rm -f conftest* -+ echo "$ac_t""$ac_cv_have_dash_pthreads" 1>&6 -+ fi -+ -+ case "$target" in -+ *-*-freebsd*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _REENTRANT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _REENTRANT 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _THREAD_SAFE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _THREAD_SAFE 1 -+EOF -+ -+ if test "$ac_cv_have_dash_pthread" = "yes"; then -+ _PTHREAD_LDFLAGS="-pthread" -+ fi -+ ;; -+ -+ *-*-openbsd*|*-*-bsdi*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _REENTRANT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _REENTRANT 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _THREAD_SAFE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _THREAD_SAFE 1 -+EOF -+ -+ if test "$ac_cv_have_dash_pthread" = "yes"; then -+ _PTHREAD_LDFLAGS="-pthread" -+ fi -+ ;; -+ -+ *-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _REENTRANT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _REENTRANT 1 -+EOF -+ -+ ;; -+ -+ esac -+ LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}" -+fi -+ -+ -+for ac_func in getc_unlocked _getc_nolock gmtime_r localtime_r pthread_getname_np pthread_get_name_np -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:6040: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:6072: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+ -+echo $ac_n "checking for clock_gettime(CLOCK_MONOTONIC)""... $ac_c" 1>&6 -+echo "configure:6101: checking for clock_gettime(CLOCK_MONOTONIC)" >&5 -+if eval "test \"`echo '$''{'ac_cv_clock_monotonic'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ for libs in "" -lrt; do -+ _SAVE_LIBS="$LIBS" -+ _SAVE_CFLAGS="$CFLAGS" -+ LIBS="$LIBS $libs" -+ CFLAGS="$CFLAGS $DSO_PIC_CFLAGS" -+ cat > conftest.$ac_ext < -+int main() { -+ struct timespec ts; -+ clock_gettime(CLOCK_MONOTONIC, &ts); -+; return 0; } -+EOF -+if { (eval echo configure:6120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_clock_monotonic=$libs -+ LIBS="$_SAVE_LIBS" -+ break -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_clock_monotonic=no -+fi -+rm -f conftest* -+ LIBS="$_SAVE_LIBS" -+ CFLAGS="$_SAVE_CFLAGS" -+ done -+fi -+ -+echo "$ac_t""$ac_cv_clock_monotonic" 1>&6 -+if test "$ac_cv_clock_monotonic" != "no"; then -+ HAVE_CLOCK_MONOTONIC=1 -+ REALTIME_LIBS=$ac_cv_clock_monotonic -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_CLOCK_MONOTONIC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_CLOCK_MONOTONIC 1 -+EOF -+ -+ -+ -+fi -+ -+echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -+echo "configure:6153: checking for sin in -lm" >&5 -+ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lm $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+echo $ac_n "checking for sincos in -lm""... $ac_c" 1>&6 -+echo "configure:6203: checking for sincos in -lm" >&5 -+ac_lib_var=`echo m'_'sincos | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lm $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_SINCOS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_SINCOS 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+echo $ac_n "checking for __sincos in -lm""... $ac_c" 1>&6 -+echo "configure:6249: checking for __sincos in -lm" >&5 -+ac_lib_var=`echo m'_'__sincos | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lm $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE___SINCOS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE___SINCOS 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -+echo "configure:6296: 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 -+ if test "$OS_TARGET" = NetBSD -o "$OS_TARGET" = OpenBSD; then -+ ac_cv_func_res_ninit=no -+ else -+ cat > conftest.$ac_ext < -+ #include -+ #include -+ #include -+ -+int main() { -+int foo = res_ninit(&_res); -+; return 0; } -+EOF -+if { (eval echo configure:6319: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_func_res_ninit=no -+fi -+rm -f conftest* -+ fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_func_res_ninit" 1>&6 -+ -+if test "$ac_cv_func_res_ninit" = "yes"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_RES_NINIT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_RES_NINIT 1 -+EOF -+ -+fi -+ -+ -+ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -+echo "configure:6347: checking for nl_langinfo and CODESET" >&5 -+if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+int main() { -+char* cs = nl_langinfo(CODESET); -+; return 0; } -+EOF -+if { (eval echo configure:6359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ am_cv_langinfo_codeset=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ am_cv_langinfo_codeset=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 -+ if test $am_cv_langinfo_codeset = yes; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_LANGINFO_CODESET ''', r''' 1 ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_LANGINFO_CODESET 1 -+EOF -+ -+ HAVE_LANGINFO_CODESET=1 -+ fi -+ -+ -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -+echo "configure:6399: 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 -+ cat > conftest.$ac_ext < -+ #include -+ void f (int i, ...) { -+ va_list args1, args2; -+ va_start (args1, i); -+ va_copy (args2, args1); -+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) -+ exit (1); -+ va_end (args1); va_end (args2); -+ } -+int main() { -+f(0, 42); return 0 -+; return 0; } -+EOF -+if { (eval echo configure:6420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_va_copy=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_va_copy=no -+ -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_va_copy" 1>&6 -+echo $ac_n "checking whether va_list can be copied by value""... $ac_c" 1>&6 -+echo "configure:6436: checking whether va_list 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 -+ cat > conftest.$ac_ext < -+ #include -+ void f (int i, ...) { -+ va_list args1, args2; -+ va_start (args1, i); -+ args2 = args1; -+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) -+ exit (1); -+ va_end (args1); va_end (args2); -+ } -+int main() { -+f(0, 42); return 0 -+; return 0; } -+EOF -+if { (eval echo configure:6457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_va_val_copy=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_va_val_copy=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_va_val_copy" 1>&6 -+if test "x$ac_cv_va_copy" = "xyes"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' VA_COPY ''', r''' va_copy ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define VA_COPY va_copy -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VA_COPY ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VA_COPY 1 -+EOF -+ -+fi -+ -+if test "x$ac_cv_va_val_copy" = "xno"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VA_LIST_AS_ARRAY ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VA_LIST_AS_ARRAY 1 -+EOF -+ -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+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:6514: 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 <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_gcc_arm_eabi="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_gcc_arm_eabi="no" -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 -+ if test "$ac_cv_gcc_arm_eabi" = "yes"; then -+ HAVE_ARM_EABI=1 -+ ARM_ABI_PREFIX=eabi- -+ else -+ ARM_ABI_PREFIX=oabi- -+ fi -+ fi -+ -+ TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-${ARM_ABI_PREFIX}gcc3}" -+fi -+ -+# try harder, when checking for __thread support, see bug 521750 comment #33 and below -+# We pass MOZ_OPTIMIZE_LDFLAGS to the linker because if dead_strip is -+# enabled, the linker in xcode 4.1 will crash. Without this it would crash when -+# linking XUL. -+_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:6563: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_thread_keyword=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_thread_keyword=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_thread_keyword" 1>&6 -+LDFLAGS=$_SAVE_LDFLAGS -+if test "$ac_cv_thread_keyword" = yes; then -+ # mips builds fail with TLS variables because of a binutils bug. -+ # See bug 528687 -+ case "${target}" in -+ mips*-*) -+ : -+ ;; -+ *-android*|*-linuxandroid*) -+ : -+ ;; -+ *) -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_THREAD_TLS_KEYWORD ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_THREAD_TLS_KEYWORD 1 -+EOF -+ -+ ;; -+ esac -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+for ac_func in localeconv -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:6627: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:6659: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+fi # ! SKIP_COMPILER_CHECKS -+ -+TARGET_XPCOM_ABI= -+if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then -+ TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}" -+fi -+ -+ -+if test -n "$SKIP_COMPILER_CHECKS"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' MALLOC_H ''', r''' ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define MALLOC_H -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_FORCEINLINE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_FORCEINLINE 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_LOCALECONV ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_LOCALECONV 1 -+EOF -+ -+fi # SKIP_COMPILER_CHECKS -+ -+ -+# External Packages -+ -+ -+ -+ -+ -+ -+# Check whether --with-nspr-cflags or --without-nspr-cflags was given. -+if test "${with_nspr_cflags+set}" = set; then -+ withval="$with_nspr_cflags" -+ NSPR_CFLAGS=$withval -+fi -+ -+# Check whether --with-nspr-libs or --without-nspr-libs was given. -+if test "${with_nspr_libs+set}" = set; then -+ withval="$with_nspr_libs" -+ NSPR_LIBS=$withval -+fi -+ -+ -+ -+ # Check whether --enable-nspr-build or --disable-nspr-build was given. -+if test "${enable_nspr_build+set}" = set; then -+ enableval="$enable_nspr_build" -+ if test "$enableval" = "yes"; then -+ MOZ_BUILD_NSPR=1 -+ elif test "$enableval" = "no"; then -+ MOZ_BUILD_NSPR= -+ else -+ { echo "configure: error: Option, nspr-build, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, nspr-build, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+ -+if test "$MOZ_BUILD_APP" != js || test -n "$JS_STANDALONE"; then -+ _IS_OUTER_CONFIGURE=1 -+fi -+ -+# Check whether --with-system-nspr or --without-system-nspr was given. -+if test "${with_system_nspr+set}" = set; then -+ withval="$with_system_nspr" -+ if test "$withval" = "yes"; then -+ _USE_SYSTEM_NSPR=1 -+ elif test "$withval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+JS_POSIX_NSPR=unset -+ -+ if test -n "$JS_STANDALONE"; then -+ case "$target" in -+ *linux*|*darwin*|*dragonfly*|*freebsd*|*netbsd*|*openbsd*) -+ if test -z "$_HAS_NSPR"; then -+ JS_POSIX_NSPR_DEFAULT=1 -+ fi -+ ;; -+ esac -+ fi -+ -+ # Check whether --enable-posix-nspr-emulation or --disable-posix-nspr-emulation was given. -+if test "${enable_posix_nspr_emulation+set}" = set; then -+ enableval="$enable_posix_nspr_emulation" -+ if test "$enableval" = "yes"; then -+ JS_POSIX_NSPR=1 -+ elif test "$enableval" = "no"; then -+ JS_POSIX_NSPR= -+ else -+ { echo "configure: error: Option, posix-nspr-emulation, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, posix-nspr-emulation, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+ -+ -+echo $ac_n "checking NSPR selection""... $ac_c" 1>&6 -+echo "configure:6799: checking NSPR selection" >&5 -+nspr_opts= -+which_nspr=default -+if test -n "$_USE_SYSTEM_NSPR"; then -+ nspr_opts="x$nspr_opts" -+ which_nspr="system" -+fi -+if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then -+ nspr_opts="x$nspr_opts" -+ which_nspr="command-line" -+fi -+if test -n "$MOZ_BUILD_NSPR"; then -+ nspr_opts="x$nspr_opts" -+ which_nspr="source-tree" -+fi -+if test "$JS_POSIX_NSPR" = unset; then -+ JS_POSIX_NSPR= -+else -+ nspr_opts="x$nspr_opts" -+ which_nspr="posix-wrapper" -+fi -+ -+if test -z "$nspr_opts"; then -+ if test "$MOZ_BUILD_APP" != js; then -+ MOZ_BUILD_NSPR=1 -+ which_nspr="source-tree" -+ else -+ JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT" -+ if test -z "$JS_POSIX_NSPR"; then -+ MOZ_BUILD_NSPR=1 -+ which_nspr="source-tree" -+ else -+ which_nspr="posix-wrapper" -+ fi -+ fi -+fi -+ -+if test -z "$nspr_opts" || test "$nspr_opts" = x; then -+ echo "$ac_t""$which_nspr" 1>&6 -+else -+ { echo "configure: error: only one way of using NSPR may be selected. See 'configure --help'." 1>&2; echo "configure: error: only one way of using NSPR may be selected. See 'configure --help'." 1>&5; exit 1; } -+fi -+ -+ -+ -+if test "$MOZ_BUILD_APP" = js; then -+ if test "$JS_POSIX_NSPR" = 1; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' JS_POSIX_NSPR ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define JS_POSIX_NSPR 1 -+EOF -+ -+ fi -+ -+fi -+ -+# A (sub)configure invoked by the toplevel configure will always receive -+# --with-nspr-libs on the command line. It will never need to figure out -+# anything itself. -+if test -n "$_IS_OUTER_CONFIGURE"; then -+ -+if test -n "$_USE_SYSTEM_NSPR"; then -+ -+# Check whether --with-nspr-prefix or --without-nspr-prefix was given. -+if test "${with_nspr_prefix+set}" = set; then -+ withval="$with_nspr_prefix" -+ nspr_config_prefix="$withval" -+else -+ nspr_config_prefix="" -+fi -+ -+ -+# Check whether --with-nspr-exec-prefix or --without-nspr-exec-prefix was given. -+if test "${with_nspr_exec_prefix+set}" = set; then -+ withval="$with_nspr_exec_prefix" -+ nspr_config_exec_prefix="$withval" -+else -+ nspr_config_exec_prefix="" -+fi -+ -+ -+ if test -n "$nspr_config_exec_prefix"; then -+ nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix" -+ if test -z "$NSPR_CONFIG"; then -+ NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config -+ fi -+ fi -+ if test -n "$nspr_config_prefix"; then -+ nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix" -+ if test -z "$NSPR_CONFIG"; then -+ NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config -+ fi -+ fi -+ -+ unset ac_cv_path_NSPR_CONFIG -+ # 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:6899: 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 -+ case "$NSPR_CONFIG" in -+ /*) -+ ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_NSPR_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_NSPR_CONFIG" && ac_cv_path_NSPR_CONFIG="no" -+ ;; -+esac -+fi -+NSPR_CONFIG="$ac_cv_path_NSPR_CONFIG" -+if test -n "$NSPR_CONFIG"; then -+ echo "$ac_t""$NSPR_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ min_nspr_version=$NSPR_MINVER -+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 -+echo "configure:6934: checking for NSPR - version >= $min_nspr_version" >&5 -+ -+ no_nspr="" -+ if test "$NSPR_CONFIG" != "no"; then -+ NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` -+ NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` -+ NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version` -+ elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then -+ NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}" -+ NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}" -+ NSPR_VERSION_STRING="$NO_NSPR_CONFIG_SYSTEM_VERSION" -+ else -+ no_nspr="yes" -+ fi -+ -+ if test -z "$no_nspr"; then -+ nspr_config_major_version=`echo $NSPR_VERSION_STRING | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'` -+ nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'` -+ nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'` -+ if test -z "$nspr_config_micro_version"; then -+ nspr_config_micro_version="0" -+ fi -+ -+ min_nspr_major_version=`echo $min_nspr_version | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'` -+ min_nspr_minor_version=`echo $min_nspr_version | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'` -+ min_nspr_micro_version=`echo $min_nspr_version | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'` -+ if test -z "$min_nspr_micro_version"; then -+ min_nspr_micro_version="0" -+ fi -+ -+ if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then -+ no_nspr="yes" -+ elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" && -+ test "$nspr_config_minor_version" -lt "$min_nspr_minor_version"; then -+ no_nspr="yes" -+ elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" && -+ test "$nspr_config_minor_version" -eq "$min_nspr_minor_version" && -+ test "$nspr_config_micro_version" -lt "$min_nspr_micro_version"; then -+ no_nspr="yes" -+ fi -+ fi -+ -+ if test -z "$no_nspr"; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_SYSTEM_NSPR=1 -+ else -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: you do not have NSPR installed or your version is older than $NSPR_MINVER." 1>&2; echo "configure: error: you do not have NSPR installed or your version is older than $NSPR_MINVER." 1>&5; exit 1; } -+ fi -+ -+ -+ -+ -+ -+ -+fi -+ -+if test -n "$MOZ_SYSTEM_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $NSPR_CFLAGS" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it" 1>&2; echo "configure: error: system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: system NSPR does not support PR_UINT64 or including prtypes.h does not provide it" 1>&2; echo "configure: error: system NSPR does not support PR_UINT64 or including prtypes.h does not provide it" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ CFLAGS=$_SAVE_CFLAGS -+ NSPR_INCLUDE_DIR=`echo ${NSPR_CFLAGS} | sed -e 's/.*-I\([^ ]*\).*/\1/'` -+ NSPR_LIB_DIR=`echo ${NSPR_LIBS} | sed -e 's/.*-L\([^ ]*\).*/\1/'` -+elif test -z "$JS_POSIX_NSPR"; then -+ NSPR_INCLUDE_DIR="${DIST}/include/nspr" -+ NSPR_CFLAGS="-I${NSPR_INCLUDE_DIR}" -+ if test -n "$GNU_CC"; then -+ if test -n "$MOZ_FOLD_LIBS"; then -+ NSPR_LIB_DIR=${DIST}/lib -+ else -+ NSPR_LIB_DIR=${DIST}/bin -+ fi -+ NSPR_LIBS="-L${NSPR_LIB_DIR} -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}" -+ else -+ # NSS needs actual static libs to link to, and this is where they are. -+ NSPR_LIBS="${DIST}/lib/nspr${NSPR_VERSION}.lib ${DIST}/lib/plc${NSPR_VERSION}.lib ${DIST}/lib/plds${NSPR_VERSION}.lib " -+ NSPR_LIB_DIR="${DIST}/lib" -+ fi -+fi -+ -+ -+ -+ -+ -+PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr" -+if test -n "$MOZ_SYSTEM_NSPR"; then -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $NSPR_CFLAGS" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: system NSPR does not support PR_STATIC_ASSERT" 1>&2; echo "configure: error: system NSPR does not support PR_STATIC_ASSERT" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ CFLAGS=$_SAVE_CFLAGS -+ # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc -+ PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr >= $NSPR_MINVER" -+elif test -n "$JS_POSIX_NSPR"; then -+ PKGCONF_REQUIRES_PRIVATE= -+fi -+ -+ -+fi # _IS_OUTER_CONFIGURE -+ -+ -+ -+if test -n "$JS_STANDALONE"; then -+ ZLIB_DIR=yes -+fi -+ -+ -+ -+MOZZLIB=1.2.3 -+ -+# Check whether --with-system-zlib or --without-system-zlib was given. -+if test "${with_system_zlib+set}" = set; then -+ withval="$with_system_zlib" -+ ZLIB_DIR=$withval -+fi -+ -+ -+if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then -+ _SAVE_CFLAGS=$CFLAGS -+ _SAVE_LDFLAGS=$LDFLAGS -+ _SAVE_LIBS=$LIBS -+ -+ if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then -+ MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" -+ MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib" -+ CFLAGS="$MOZ_ZLIB_CFLAGS $CFLAGS" -+ LDFLAGS="$MOZ_ZLIB_LIBS $LDFLAGS" -+ fi -+ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then -+ MOZ_SYSTEM_ZLIB= -+ else -+ echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -+echo "configure:7127: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lz $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_SYSTEM_ZLIB=1 MOZ_ZLIB_LIBS="$MOZ_ZLIB_LIBS -lz" -+else -+ echo "$ac_t""no" 1>&6 -+MOZ_SYSTEM_ZLIB= -+fi -+ -+ if test "$MOZ_SYSTEM_ZLIB" = 1; then -+ MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` -+ cat > conftest.$ac_ext < -+ #include -+ #include -+int main() { -+ #if ZLIB_VERNUM < $MOZZLIBNUM -+ #error "Insufficient zlib version ($MOZZLIBNUM required)." -+ #endif -+; return 0; } -+EOF -+if { (eval echo configure:7181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ MOZ_SYSTEM_ZLIB=1 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&2; echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ fi -+ fi -+ CFLAGS=$_SAVE_CFLAGS -+ LDFLAGS=$_SAVE_LDFLAGS -+ LIBS=$_SAVE_LIBS -+fi -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ZLIB_IN_MOZGLUE"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' ZLIB_IN_MOZGLUE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define ZLIB_IN_MOZGLUE 1 -+EOF -+ -+fi -+ -+ -+ -+# Application -+ -+# Components and Features -+ -+# Individual module options -+ -+# Debugging and Optimizations -+ -+ -+# Use value from moz.configure if one is defined. Else use our computed -+# value. -+if test -n "${MOZ_CONFIGURE_OPTIMIZE_FLAGS}"; then -+ MOZ_OPTIMIZE_FLAGS=${MOZ_CONFIGURE_OPTIMIZE_FLAGS} -+fi -+ -+ -+ if test "$GNU_CC"; then -+ MOZ_ENABLE_FRAME_PTR="-fno-omit-frame-pointer -funwind-tables" -+ MOZ_DISABLE_FRAME_PTR="-fomit-frame-pointer -funwind-tables" -+ else -+ case "$target" in -+ aarch64-windows*) -+ if test "$CC_TYPE" = "clang-cl"; then -+ MOZ_ENABLE_FRAME_PTR="-Xclang -mdisable-fp-elim" -+ MOZ_DISABLE_FRAME_PTR="-Xclang -mdisable-fp-elim" -+ else -+ MOZ_ENABLE_FRAME_PTR="-Oy-" -+ MOZ_DISABLE_FRAME_PTR="-Oy" -+ fi -+ ;; -+ *-mingw32*) -+ MOZ_ENABLE_FRAME_PTR="-Oy-" -+ MOZ_DISABLE_FRAME_PTR="-Oy" -+ ;; -+ esac -+ fi -+ -+ # If we are debugging, profiling, using sanitizers, or on win32 we want a -+ # frame pointer. It is not required to enable frame pointers on AArch64 -+ # Windows, but we enable it for compatibility with ETW. -+ if test -z "$MOZ_OPTIMIZE" -o \ -+ -n "$MOZ_PROFILING" -o \ -+ -n "$MOZ_DEBUG" -o \ -+ -n "$MOZ_MSAN" -o \ -+ -n "$MOZ_ASAN" -o \ -+ -n "$MOZ_UBSAN" -o \ -+ "$OS_ARCH:$CPU_ARCH" = "WINNT:x86" -o \ -+ "$OS_ARCH:$CPU_ARCH" = "WINNT:aarch64"; then -+ MOZ_FRAMEPTR_FLAGS="$MOZ_ENABLE_FRAME_PTR" -+ else -+ MOZ_FRAMEPTR_FLAGS="$MOZ_DISABLE_FRAME_PTR" -+ 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:7273: checking for valid optimization flags" >&5 -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" -+ cat > conftest.$ac_ext < -+int main() { -+printf("Hello World\n"); -+; return 0; } -+EOF -+if { (eval echo configure:7284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ _results=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _results=no -+fi -+rm -f conftest* -+ echo "$ac_t""$_results" 1>&6 -+ if test "$_results" = "no"; then -+ { echo "configure: error: These compiler flags are invalid: $MOZ_OPTIMIZE_FLAGS" 1>&2; echo "configure: error: These compiler flags are invalid: $MOZ_OPTIMIZE_FLAGS" 1>&5; exit 1; } -+ fi -+ CFLAGS=$_SAVE_CFLAGS -+ if test -n "$MOZ_LTO" -a -n "$CLANG_CC"; then -+ # When using llvm-based LTO, non numeric optimization levels are -+ # not supported by the linker, so force the linker to use -O2 ( -+ # which doesn't influence the level compilation units are actually -+ # compiled at). -+ case " $MOZ_OPTIMIZE_FLAGS " in -+ *\ -Os\ *|*\ -Oz\ *) -+ MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -O2" -+ ;; -+ esac -+ fi -+fi -+fi # COMPILE_ENVIRONMENT -+ -+ -+ -+ -+ -+ -+if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then -+ WARNINGS_AS_ERRORS='' -+fi -+ -+ -+if test "$JS_STANDALONE" -a -z "$MOZ_MEMORY"; then -+ MOZ_GLUE_IN_PROGRAM= -+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 -+fi -+ -+if test "$MOZ_MEMORY"; then -+ case "${target}" in -+ *-mingw*) -+ export MOZ_NO_DEBUG_RTL=1 -+ ;; -+ esac -+fi -+ -+ -+if test -n "$MOZ_INSTRUMENTS"; then -+ LIBS="$LIBS -framework CoreFoundation" -+fi -+ -+if test -n "$MOZ_DEBUG"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' JS_DEBUG ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define JS_DEBUG 1 -+EOF -+ -+fi -+ -+ -+if test -n "$COMPILE_ENVIRONMENT"; then -+ -+ -+if test -n "$ENABLE_CLANG_PLUGIN"; then -+ if test -z "${CLANG_CC}${CLANG_CL}"; then -+ { echo "configure: error: Can't use clang plugin without clang." 1>&2; echo "configure: error: Can't use clang plugin without clang." 1>&5; exit 1; } -+ fi -+ -+ echo $ac_n "checking for llvm-config""... $ac_c" 1>&6 -+echo "configure:7376: checking for llvm-config" >&5 -+ if test -z "$LLVMCONFIG"; then -+ if test -n "$CLANG_CL"; then -+ CXX_COMPILER="$(dirname "$CXX")/clang" -+ else -+ CXX_COMPILER="${CXX}" -+ fi -+ LLVMCONFIG=`$CXX_COMPILER -print-prog-name=llvm-config` -+ fi -+ -+ if test -z "$LLVMCONFIG"; then -+ LLVMCONFIG=`which llvm-config` -+ fi -+ -+ if test ! -x "$LLVMCONFIG"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&2; echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&5; exit 1; } -+ fi -+ -+ echo "$ac_t""$LLVMCONFIG" 1>&6 -+ -+ if test -z "$LLVMCONFIG"; then -+ { echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&2; echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&5; exit 1; } -+ fi -+ LLVM_CXXFLAGS=`$LLVMCONFIG --cxxflags | sed -e 's/-isysroot [^ ]*//' -e 's/-gcc-toolchain [^ ]*//'` -+ -+ LLVM_LDFLAGS=`$LLVMCONFIG --ldflags | tr '\n' ' '` -+ -+ if test "${HOST_OS_ARCH}" = "Darwin"; then -+ CLANG_LDFLAGS="-Wl,-flat_namespace -Wl,-undefined,suppress" -+ CLANG_LDFLAGS="$CLANG_LDFLAGS `$LLVMCONFIG --prefix`/lib/libclangASTMatchers.a" -+ LLVM_LDFLAGS=`echo "$LLVM_LDFLAGS" | sed -E 's/-L[^ ]+\/clang\/lib//'` -+ elif test "${HOST_OS_ARCH}" = "WINNT"; then -+ CLANG_LDFLAGS="clangASTMatchers.lib clang.lib" -+ else -+ CLANG_LDFLAGS="-lclangASTMatchers" -+ fi -+ -+ if test -n "$CLANG_CL"; then -+ LLVM_REPLACE_CXXFLAGS='' -+ for arg in $LLVM_CXXFLAGS; do -+ arg=`echo "$arg"|sed -e 's/^\//-/' -e 's/\\\\/\//g'` -+ LLVM_REPLACE_CXXFLAGS="$LLVM_REPLACE_CXXFLAGS $arg" -+ done -+ LLVM_CXXFLAGS="$LLVM_REPLACE_CXXFLAGS" -+ -+ LLVM_REPLACE_LDFLAGS='' -+ for arg in $LLVM_LDFLAGS; do -+ arg=`echo "$arg"|sed -e 's/^\//-/' -e 's/\\\\/\//g'` -+ LLVM_REPLACE_LDFLAGS="$LLVM_REPLACE_LDFLAGS $arg" -+ done -+ LLVM_LDFLAGS="$LLVM_REPLACE_LDFLAGS" -+ -+ CLANG_REPLACE_LDFLAGS='' -+ for arg in $CLANG_LDFLAGS; do -+ arg=`echo "$arg"|sed -e 's/^\//-/' -e 's/\\\\/\//g'` -+ CLANG_REPLACE_LDFLAGS="$CLANG_REPLACE_LDFLAGS $arg" -+ done -+ CLANG_LDFLAGS="$CLANG_REPLACE_LDFLAGS" -+ fi -+ -+ echo $ac_n "checking for new ASTMatcher API""... $ac_c" 1>&6 -+echo "configure:7438: checking for new ASTMatcher API" >&5 -+if eval "test \"`echo '$''{'ac_cv_have_new_ASTMatcher_names'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ _SAVE_CXXFLAGS="$CXXFLAGS" -+ _SAVE_CPPFLAGS="$CPPFLAGS" -+ _SAVE_CXX="$CXX" -+ _SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -+ unset MACOSX_DEPLOYMENT_TARGET -+ CXXFLAGS="${LLVM_CXXFLAGS}" -+ CPPFLAGS="" -+ CXX="${HOST_CXX}" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_have_new_ASTMatcher_names="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_have_new_ASTMatcher_names="no" -+fi -+rm -f conftest* -+ CXX="$_SAVE_CXX" -+ CPPFLAGS="$_SAVE_CPPFLAGS" -+ CXXFLAGS="$_SAVE_CXXFLAGS" -+ export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET" -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+fi -+ -+echo "$ac_t""$ac_cv_have_new_ASTMatcher_names" 1>&6 -+ if test "$ac_cv_have_new_ASTMatcher_names" = "yes"; then -+ LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAVE_NEW_ASTMATCHER_NAMES" -+ fi -+ -+ echo $ac_n "checking for has with ignoringParenImpCasts""... $ac_c" 1>&6 -+echo "configure:7505: checking for has with ignoringParenImpCasts" >&5 -+if eval "test \"`echo '$''{'ac_cv_has_accepts_ignoringParenImpCasts'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ _SAVE_CXXFLAGS="$CXXFLAGS" -+ _SAVE_CPPFLAGS="$CPPFLAGS" -+ _SAVE_CXX="$CXX" -+ _SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -+ unset MACOSX_DEPLOYMENT_TARGET -+ CXXFLAGS="${LLVM_CXXFLAGS}" -+ CPPFLAGS="" -+ CXX="${HOST_CXX}" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_has_accepts_ignoringParenImpCasts="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_has_accepts_ignoringParenImpCasts="no" -+fi -+rm -f conftest* -+ CXX="$_SAVE_CXX" -+ CPPFLAGS="$_SAVE_CPPFLAGS" -+ CXXFLAGS="$_SAVE_CXXFLAGS" -+ export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET" -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+fi -+ -+echo "$ac_t""$ac_cv_has_accepts_ignoringParenImpCasts" 1>&6 -+ if test "$ac_cv_has_accepts_ignoringParenImpCasts" = "yes"; then -+ LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAS_ACCEPTS_IGNORINGPARENIMPCASTS" -+ fi -+ -+ CLANG_PLUGIN_FLAGS="-Xclang -load -Xclang $CLANG_PLUGIN -Xclang -add-plugin -Xclang moz-check" -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_CLANG_PLUGIN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_CLANG_PLUGIN 1 -+EOF -+ -+fi -+ -+if test -n "$ENABLE_MOZSEARCH_PLUGIN"; then -+ if test -z "${ENABLE_CLANG_PLUGIN}"; then -+ { echo "configure: error: Can't use mozsearch plugin without --enable-clang-plugin." 1>&2; echo "configure: error: Can't use mozsearch plugin without --enable-clang-plugin." 1>&5; exit 1; } -+ fi -+ -+ OBJDIR="$(dirname $(dirname $(dirname $CLANG_PLUGIN)))" -+ -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -add-plugin -Xclang mozsearch-index" -+ -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -plugin-arg-mozsearch-index -Xclang $_topsrcdir" -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -plugin-arg-mozsearch-index -Xclang $OBJDIR/mozsearch_index" -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -plugin-arg-mozsearch-index -Xclang $OBJDIR" -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_MOZSEARCH_PLUGIN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_MOZSEARCH_PLUGIN 1 -+EOF -+ -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+fi # COMPILE_ENVIRONMENT -+ -+ -+# Check whether --with-sixgill or --without-sixgill was given. -+if test "${with_sixgill+set}" = set; then -+ withval="$with_sixgill" -+ SIXGILL_PATH=$withval -+else -+ SIXGILL_PATH= -+fi -+ -+ -+if test -n "$SIXGILL_PATH"; then -+ if test ! -x "$SIXGILL_PATH/bin/xdbfind" || test ! -f "$SIXGILL_PATH/gcc/xgill.so" || test ! -x "$SIXGILL_PATH/scripts/wrap_gcc/g++"; then -+ { echo "configure: error: The sixgill plugin and binaries are not at the specified path." 1>&2; echo "configure: error: The sixgill plugin and binaries are not at the specified path." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+# Check whether --enable-strip or --disable-strip was given. -+if test "${enable_strip+set}" = set; then -+ enableval="$enable_strip" -+ if test "$enableval" = "yes"; then -+ ENABLE_STRIP=1 -+ elif test "$enableval" = "no"; then -+ ENABLE_STRIP= -+ else -+ { echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+# Check whether --enable-install-strip or --disable-install-strip was given. -+if test "${enable_install_strip+set}" = set; then -+ enableval="$enable_install_strip" -+ if test "$enableval" = "yes"; then -+ PKG_SKIP_STRIP= -+ elif test "$enableval" = "no"; then -+ PKG_SKIP_STRIP=1 -+ else -+ { echo "configure: error: Option, install-strip, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, install-strip, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+# Profiling and Instrumenting -+ -+if test -z "$SKIP_LIBRARY_CHECKS"; then -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ for ac_func in __cxa_demangle -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:7678: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:7713: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+HAVE_DEMANGLE= -+fi -+done -+ -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+fi -+ -+ -+# Check whether --with-jitreport-granularity or --without-jitreport-granularity was given. -+if test "${with_jitreport_granularity+set}" = set; then -+ withval="$with_jitreport_granularity" -+ JITREPORT_GRANULARITY=$withval -+else -+ JITREPORT_GRANULARITY=3 -+fi -+ -+ -+cat >> confdefs.pytmp <> confdefs.h <&6 -+echo "configure:7779: checking for -pipe support" >&5 -+if test -n "$GNU_CC" -a -n "$GNU_CXX"; then -+ CFLAGS="$CFLAGS -pipe" -+ CXXFLAGS="$CXXFLAGS -pipe" -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6 -+echo "configure:7801: 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 < -+int main() { -+struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1; -+; return 0; } -+EOF -+if { (eval echo configure:7813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_struct_tm_zone_tm_gmtoff="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_struct_tm_zone_tm_gmtoff="no" -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_struct_tm_zone_tm_gmtoff" 1>&6 -+if test "$ac_cv_struct_tm_zone_tm_gmtoff" = "yes" ; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_TM_ZONE_TM_GMTOFF ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_TM_ZONE_TM_GMTOFF 1 -+EOF -+ -+fi -+fi # ! SKIP_COMPILER_CHECKS -+ -+cat >> confdefs.pytmp <<\EOF -+ (''' CPP_THROW_NEW ''', r''' throw() ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define CPP_THROW_NEW throw() -+EOF -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+ -+echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 -+echo "configure:7859: 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 $MOZ_LTO_CFLAGS $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:7864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then -+ echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list -+ if test "$CC_TYPE" = "clang-cl"; then -+ link="$LINKER -OUT:conftest${ac_exeext}" -+ else -+ link="${CC-cc} -o conftest${ac_exeext}" -+ fi -+ if { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:7871: \"$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='$link $MOZ_LTO_LDFLAGS $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:7875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ EXPAND_LIBS_LIST_STYLE=filelist -+ elif { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:7877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ EXPAND_LIBS_LIST_STYLE=list -+ else -+ { echo "configure: error: Couldn't find one that works" 1>&2; echo "configure: error: Couldn't find one that works" 1>&5; exit 1; } -+ fi -+ fi -+ else -+ { echo "configure: error: couldn't compile a simple C file" 1>&2; echo "configure: error: couldn't compile a simple C file" 1>&5; exit 1; } -+ fi -+ rm -rf conftest* -+fi -+ -+echo "$ac_t""$EXPAND_LIBS_LIST_STYLE" 1>&6 -+ -+ -+ -+ -+ -+# Check whether --enable-readline or --disable-readline was given. -+if test "${enable_readline+set}" = set; then -+ enableval="$enable_readline" -+ if test "$enableval" = "yes"; then -+ JS_WANT_READLINE=1 -+ elif test "$enableval" = "no"; then -+ JS_WANT_READLINE= -+ else -+ { echo "configure: error: Option, readline, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, readline, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+JS_BUNDLED_EDITLINE= -+EDITLINE_LIBS= -+ -+case "$target" in -+*-mingw*) -+ NO_EDITLINE=1 -+ ;; -+*) -+ ;; -+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:7922: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lreadline $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ EDITLINE_LIBS="-lreadline" -+else -+ echo "$ac_t""no" 1>&6 -+{ echo "configure: error: No system readline library found." 1>&2; echo "configure: error: No system readline library found." 1>&5; exit 1; } -+fi -+ -+ else -+ JS_BUNDLED_EDITLINE=1 -+ fi -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' EDITLINE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define EDITLINE 1 -+EOF -+ -+fi -+ -+ -+ -+# Standalone module options (Not for building Mozilla) -+ -+ -+# Check whether --with-qemu-exe or --without-qemu-exe was given. -+if test "${with_qemu_exe+set}" = set; then -+ withval="$with_qemu_exe" -+ QEMU_EXE=$withval -+fi -+ -+ -+# Check whether --with-cross-lib or --without-cross-lib was given. -+if test "${with_cross_lib+set}" = set; then -+ withval="$with_cross_lib" -+ CROSS_LIB=$withval -+else -+ CROSS_LIB=/usr/$target -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+_INTL_API=yes -+ -+ -+ -+MOZ_SYSTEM_ICU= -+# Check whether --with-system-icu or --without-system-icu was given. -+if test "${with_system_icu+set}" = set; then -+ withval="$with_system_icu" -+ if test "$withval" = "yes"; then -+ MOZ_SYSTEM_ICU=1 -+ elif test "$withval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test -n "$MOZ_SYSTEM_ICU"; then -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo $ac_n "checking for icu-i18n >= 63.1""... $ac_c" 1>&6 -+echo "configure:8052: checking for icu-i18n >= 63.1" >&5 -+ -+ if $PKG_CONFIG --exists "icu-i18n >= 63.1" ; then -+ echo "$ac_t""yes" 1>&6 -+ succeeded=yes -+ -+ echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6 -+echo "configure:8059: checking MOZ_ICU_CFLAGS" >&5 -+ MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 63.1"` -+ echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6 -+ -+ echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6 -+echo "configure:8064: checking MOZ_ICU_LIBS" >&5 -+ ## Remove evil flags like -Wl,--export-dynamic -+ MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 63.1\" |sed s/-Wl,--export-dynamic//g`" -+ echo "$ac_t""$MOZ_ICU_LIBS" 1>&6 -+ else -+ MOZ_ICU_CFLAGS="" -+ MOZ_ICU_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 63.1"` -+ echo $MOZ_ICU_PKG_ERRORS -+ fi -+ -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ : -+ else -+ if test "$COMPILE_ENVIRONMENT"; then -+ { echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; } -+ fi -+ fi -+ -+ CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS" -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_SYSTEM_ICU ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_SYSTEM_ICU 1 -+EOF -+ -+fi -+ -+ -+ -+# Check whether --with-intl-api or --without-intl-api was given. -+if test "${with_intl_api+set}" = set; then -+ withval="$with_intl_api" -+ _INTL_API=$withval -+fi -+ -+ -+ENABLE_INTL_API= -+EXPOSE_INTL_API= -+case "$_INTL_API" in -+no) -+ ;; -+build) -+ ENABLE_INTL_API=1 -+ ;; -+yes) -+ ENABLE_INTL_API=1 -+ EXPOSE_INTL_API=1 -+ ;; -+*) -+ { echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&2; echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&5; exit 1; } -+ ;; -+esac -+ -+if test -n "$ENABLE_INTL_API"; then -+ USE_ICU=1 -+fi -+ -+if test -n "$EXPOSE_INTL_API"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' EXPOSE_INTL_API ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define EXPOSE_INTL_API 1 -+EOF -+ -+fi -+ -+if test -n "$ENABLE_INTL_API"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' ENABLE_INTL_API ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define ENABLE_INTL_API 1 -+EOF -+ -+fi -+ -+if test -n "$USE_ICU"; then -+ icudir="$_topsrcdir/intl/icu/source" -+ if test ! -d "$icudir"; then -+ icudir="$_topsrcdir/../../intl/icu/source" -+ if test ! -d "$icudir"; then -+ { echo "configure: error: Cannot find the ICU directory" 1>&2; echo "configure: error: Cannot find the ICU directory" 1>&5; exit 1; } -+ fi -+ fi -+ -+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ if test x"$version" = x; then -+ { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } -+ fi -+ MOZ_ICU_VERSION="$version" -+ -+ # TODO: the l is actually endian-dependent -+ # We could make this set as 'l' or 'b' for little or big, respectively, -+ # but we'd need to check in a big-endian version of the file. -+ if test -z "$ICU_DATA_FILE"; then -+ ICU_DATA_FILE="icudt${version}l.dat" -+ fi -+fi -+ -+ -+ -+ -+ -+ -+if test -n "$USE_ICU"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' U_USING_ICU_NAMESPACE ''', r''' 0 ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define U_USING_ICU_NAMESPACE 0 -+EOF -+ -+ -+ if test -z "$MOZ_SYSTEM_ICU"; then -+ case "$OS_TARGET:$CPU_ARCH" in -+ WINNT:aarch64) -+ ;; -+ *) -+ if test -z "$YASM" -a -z "$GNU_AS" -a "$COMPILE_ENVIRONMENT"; then -+ { echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&2; echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&5; exit 1; } -+ fi -+ ;; -+ esac -+ cat >> confdefs.pytmp <<\EOF -+ (''' U_STATIC_IMPLEMENTATION ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define U_STATIC_IMPLEMENTATION 1 -+EOF -+ -+ fi -+fi -+ -+ -+CFLAGS=`echo \ -+ $_COMPILATION_CFLAGS \ -+ $CFLAGS` -+ -+CXXFLAGS=`echo \ -+ $_WARNINGS_CXXFLAGS \ -+ $_COMPILATION_CXXFLAGS \ -+ $CXXFLAGS` -+ -+COMPILE_CFLAGS=`echo \ -+ $_DEFINES_CFLAGS \ -+ $COMPILE_CFLAGS` -+ -+COMPILE_CXXFLAGS=`echo \ -+ $_DEFINES_CXXFLAGS \ -+ $COMPILE_CXXFLAGS` -+ -+HOST_CFLAGS=`echo \ -+ $_WARNINGS_HOST_CFLAGS \ -+ $_COMPILATION_HOST_CFLAGS \ -+ $HOST_CFLAGS` -+ -+HOST_CXXFLAGS=`echo \ -+ $_WARNINGS_HOST_CXXFLAGS \ -+ $_COMPILATION_HOST_CXXFLAGS \ -+ $HOST_CXXFLAGS` -+ -+ -+ -+OS_CFLAGS="$CFLAGS" -+OS_CXXFLAGS="$CXXFLAGS" -+OS_CPPFLAGS="$CPPFLAGS" -+OS_COMPILE_CFLAGS="$COMPILE_CFLAGS" -+OS_COMPILE_CXXFLAGS="$COMPILE_CXXFLAGS" -+OS_LDFLAGS="$LDFLAGS" -+OS_LIBS="$LIBS" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_func in posix_fadvise posix_fallocate -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:8279: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:8311: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+ -+ -+ -+if test -n "$MOZ_DEV_EDITION"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_DEV_EDITION ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_DEV_EDITION 1 -+EOF -+ -+fi -+ -+# Allow influencing configure with a defines.sh script. -+. "${srcdir}/build/defines.sh" -+ -+# If we're not building a release build, define EARLY_BETA_OR_EARLIER if it is -+# set in defines.sh -+if test "$BUILDING_RELEASE"; then -+ # Override value in defines.sh, if any -+ EARLY_BETA_OR_EARLIER= -+elif test "$EARLY_BETA_OR_EARLIER"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' EARLY_BETA_OR_EARLIER ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define EARLY_BETA_OR_EARLIER 1 -+EOF -+ -+fi -+ -+ -+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS" -+ -+ -+ -+ -+ -+ -+ -+ -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" -+MALLOC_H= -+ -+for file in $MALLOC_HEADERS; do -+ ac_safe=`echo "$file" | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for $file""... $ac_c" 1>&6 -+echo "configure:8385: checking for $file" >&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 < -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:8398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+ -+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ MALLOC_H=$file -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ if test "$MALLOC_H" != ""; then -+ cat >> confdefs.pytmp < ''') -+EOF -+cat >> confdefs.h < -+EOF -+ -+ break -+ fi -+done -+ -+for ac_func in strndup posix_memalign memalign -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:8433: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:8465: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+ -+for ac_func in malloc_usable_size -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:8496: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:8528: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+MALLOC_USABLE_SIZE_CONST_PTR=const -+if test -n "$HAVE_MALLOC_H"; then -+ echo $ac_n "checking whether malloc_usable_size definition can use const argument""... $ac_c" 1>&6 -+echo "configure:8558: checking whether malloc_usable_size definition can use const argument" >&5 -+ cat > conftest.$ac_ext < -+ #include -+ size_t malloc_usable_size(const void *ptr); -+int main() { -+return malloc_usable_size(0); -+; return 0; } -+EOF -+if { (eval echo configure:8569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ MALLOC_USABLE_SIZE_CONST_PTR= -+fi -+rm -f conftest* -+fi -+cat >> confdefs.pytmp <> confdefs.h <&6 -+echo "configure:8591: checking for valloc in malloc.h" >&5 -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "valloc" >/dev/null 2>&1; then -+ rm -rf conftest* -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VALLOC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VALLOC 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+echo $ac_n "checking for valloc in unistd.h""... $ac_c" 1>&6 -+echo "configure:8616: checking for valloc in unistd.h" >&5 -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "valloc" >/dev/null 2>&1; then -+ rm -rf conftest* -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VALLOC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VALLOC 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+echo $ac_n "checking for _aligned_malloc in malloc.h""... $ac_c" 1>&6 -+echo "configure:8641: checking for _aligned_malloc in malloc.h" >&5 -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "_aligned_malloc" >/dev/null 2>&1; then -+ rm -rf conftest* -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_ALIGNED_MALLOC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_ALIGNED_MALLOC 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+ -+ -+ -+ -+ -+if test -n "$JS_STANDALONE"; then -+MOZ_APP_NAME="mozjs" -+JS_LIBRARY_NAME="mozjs-$MOZILLA_SYMBOLVERSION" -+else -+JS_LIBRARY_NAME="mozjs" -+fi -+JS_CONFIG_LIBS="$NSPR_LIBS $LIBS" -+if test -n "$GNU_CC"; then -+JS_CONFIG_MOZ_JS_LIBS='-L${libdir} -l${JS_LIBRARY_NAME}' -+else -+JS_CONFIG_MOZ_JS_LIBS='${libdir}/${JS_LIBRARY_NAME}.lib' -+fi -+ -+ -+ -+ -+# Avoid using obsolete NSPR features -+cat >> confdefs.pytmp <<\EOF -+ (''' NO_NSPR_10_SUPPORT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define NO_NSPR_10_SUPPORT 1 -+EOF -+ -+ -+top_srcdir=$srcdir -+ -+ -+trap '' 1 2 15 -+cat > confcache <<\EOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs. It is not useful on other systems. -+# If it contains results you don't want to keep, you may remove or edit it. -+# -+# By default, configure uses ./config.cache as the cache file, -+# creating it if it does not exist already. You can give configure -+# the --cache-file=FILE option to use a different cache file; that is -+# what configure does when it calls configure scripts in -+# subdirectories, so they share the cache. -+# Giving --cache-file=/dev/null disables caching, for debugging configure. -+# config.status only pays attention to the cache file if you give it the -+# --recheck option to rerun configure. -+# -+EOF -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, don't put newlines in cache variables' values. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+(set) 2>&1 | -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache -+if cmp -s $cache_file confcache; then -+ : -+else -+ if test -w $cache_file; then -+ echo "updating cache $cache_file" -+ cat confcache > $cache_file -+ else -+ echo "not updating unwritable cache $cache_file" -+ fi -+fi -+rm -f confcache -+ -+ -+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -+: ${CONFIG_STATUS=./config.data} -+ -+echo creating $CONFIG_STATUS -+ -+cat > $CONFIG_STATUS <> $CONFIG_STATUS -+rm confdefs.pytmp confdefs.h -+ -+cat >> $CONFIG_STATUS <<\EOF -+] -+ -+substs = [ -+EOF -+ -+sed 's/$/,/' >> $CONFIG_STATUS <> $CONFIG_STATUS -+done -+ -+cat >> $CONFIG_STATUS <<\EOF -+] -+ -+non_global_defines = [ -+EOF -+ -+if test -n "$_NON_GLOBAL_ACDEFINES"; then -+ for var in $_NON_GLOBAL_ACDEFINES; do -+ echo " '$var'," >> $CONFIG_STATUS -+ done -+fi -+ -+cat >> $CONFIG_STATUS <&6 --echo "configure:12466: checking for $ac_func" >&5 -+echo "configure:12468: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12500: \"$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 -@@ -12526,7 +12528,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext < -@@ -12545,7 +12547,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:12549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 diff --git a/meta-gnome/recipes-support/mozjs/mozjs_60.2.3.bb b/meta-gnome/recipes-support/mozjs/mozjs_60.2.3.bb deleted file mode 100644 index a7cb210..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs_60.2.3.bb +++ /dev/null @@ -1,101 +0,0 @@ -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=dc9b6ecd19a14a54a628edaaf23733bf" - -SRC_URI = "http://ftp.debian.org/debian/pool/main/m/mozjs60/mozjs60_60.2.3.orig.tar.xz \ - file://0001-do-not-create-python-environment-new.patch \ - file://0002-do-not-include-requireddefines.patch \ - file://0003-fix-coredump-caused-by-getenv.patch \ - file://0004-new-fix-cannot-find-link.patch \ - file://0005-do-not-use-autoconf-213-to-refresh-old-configure.patch \ - " -SRC_URI[md5sum] = "ef7c243c2ef474c7b055c0b7f91ea2f2" -SRC_URI[sha256sum] = "4163add2c4c25499fb45d7cca7cab9ecbede0cb054b9bcfc9abaee84733c4d04" - -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 \ - --disable-jemalloc \ - --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},--x-includes=no --x-libraries=no,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 third_party/python; 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 third_party/python; 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" -RPROVIDES_lib${BPN} += "libmozjs-52" - -# 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-gnome/recipes-support/mozjs68/mozjs68/0001-Yocto-build-fixes.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/0001-Yocto-build-fixes.patch deleted file mode 100644 index 49e996e..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/0001-Yocto-build-fixes.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 2dc4bb1511f98ba495d2d279886e495a8f38b79a Mon Sep 17 00:00:00 2001 -From: David McKinney -Date: Thu, 2 Jul 2020 17:07:39 +0000 -Subject: [PATCH] Yocto build fixes - ---- - build/moz.configure/init.configure | 18 ----------- - build/moz.configure/rust.configure | 49 +++++++++++++++++++++++------- - configure.py | 10 +++++- - js/src/build/js.pc.in | 2 +- - 4 files changed, 48 insertions(+), 31 deletions(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index c77260403..6113f620f 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -256,24 +256,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 not normsep(sys.executable).startswith(normsep(virtualenvs_root)): -- 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 - - -diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index 9647cbc40..1d68639af 100644 ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -46,15 +46,15 @@ def unwrap_rustup(prog, name): - @imports('os') - def unwrap(prog, name): - def from_rustup_which(): -- out = check_cmd_output('rustup', 'which', name, -- executable=prog).rstrip() -+ # out = check_cmd_output(name, "-V", -+ # executable=prog).rstrip() - # If for some reason the above failed to return something, keep the - # PROG we found originally. -- if out: -- log.info('Actually using \'%s\'', out) -- return out -+ # if out: -+ # log.info('Actually using \'%s\'', out) -+ # return out - -- log.info('No `rustup which` output, using \'%s\'', prog) -+ # log.info('No `rustup which` output, using \'%s\'', prog) - return prog - - (retcode, stdout, stderr) = get_cmd_output(prog, '+stable') -@@ -217,6 +217,27 @@ def rust_supported_targets(rustc): - per_os[key] = t - return namespace(per_os=per_os, per_raw_os=per_raw_os) - -+option(env='RUST_HOST', -+ nargs=1, -+ help='Define the system type for Rust performing the build') -+ -+@depends('RUST_HOST') -+@checking('rust host', lambda host: host) -+def rust_host_env(value): -+ if value: -+ return value[0] -+ -+ -+option(env='RUST_TARGET', -+ nargs=1, -+ help='Define the system type for Rust where the resulting executables will be used') -+ -+@depends('RUST_TARGET') -+@checking('rust target', lambda target: target) -+def rust_target_env(value): -+ if value: -+ return value[0] -+ - - @template - def rust_triple_alias(host_or_target): -@@ -227,9 +248,9 @@ def rust_triple_alias(host_or_target): - assert host_or_target in {host, target} - - host_or_target_str = {host: 'host', target: 'target'}[host_or_target] -- -- @depends(rustc, host_or_target, c_compiler, rust_supported_targets, -- arm_target, when=rust_compiler) -+ @depends(rustc, host_or_target, rust_host_env, rust_target_env, -+ c_compiler, rust_supported_targets, arm_target, -+ when=rust_compiler) - @checking('for rust %s triplet' % host_or_target_str) - @imports('os') - @imports('subprocess') -@@ -237,8 +258,14 @@ def rust_triple_alias(host_or_target): - @imports(_from='mozbuild.shellutil', _import='quote') - @imports(_from='tempfile', _import='mkstemp') - @imports(_from='textwrap', _import='dedent') -- def rust_target(rustc, host_or_target, compiler_info, -- rust_supported_targets, arm_target): -+ def rust_target(rustc, host_or_target, rust_host_env, rust_target_env, -+ compiler_info, rust_supported_targets, arm_target): -+ -+ specified_targets = {"host": rust_host_env, "target": rust_target_env} -+ specified_target = specified_targets[host_or_target_str] -+ if (specified_target): -+ return specified_target -+ - # Rust's --target options are similar to, but not exactly the same - # as, the autoconf-derived targets we use. An example would be that - # Rust uses distinct target triples for targetting the GNU C++ ABI -diff --git a/configure.py b/configure.py -index 913dd35f9..51cda0cef 100644 ---- a/configure.py -+++ b/configure.py -@@ -13,7 +13,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", "third_party/python"]: -+ 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, - TRACE, -diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in -index d40deb174..e2044c20a 100644 ---- a/js/src/build/js.pc.in -+++ b/js/src/build/js.pc.in -@@ -11,4 +11,4 @@ Libs: -L${libdir} -l@JS_LIBRARY_NAME@ - # Use -isystem for includes rather than -I, to mark them as "system headers" - # that don't generate warning diagnostics. For justification, see - # https://bugzilla.mozilla.org/show_bug.cgi?id=1539036 --Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@ -+Cflags: -I${includedir}/@JS_LIBRARY_NAME@ diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/0001-do-not-create-python-environment-new.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/0001-do-not-create-python-environment-new.patch deleted file mode 100644 index b42aff3..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/0001-do-not-create-python-environment-new.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9b32dd063116186d679578cff24366b19874699d Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:30:20 -0400 -Subject: [PATCH] do not create python environment new - ---- - build/moz.configure/init.configure | 18 ------------------ - configure.py | 10 +++++++++- - js/src/old-configure | 2 +- - 3 files changed, 10 insertions(+), 20 deletions(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 83b8d705..79d04b60 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -257,24 +257,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 - - -diff --git a/configure.py b/configure.py -index 9b2bae9a..771e34e3 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", "third_party/python"]: -+ 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.makeutil import Makefile - from mozbuild.pythonutil import iter_modules_in_path -diff --git a/js/src/old-configure b/js/src/old-configure -index 2c579b77..830b6361 100644 ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -9974,7 +9974,7 @@ if test "$JS_STANDALONE"; then - - if test "$no_recursion" != yes; then - trap '' EXIT -- if ! $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then -+ if ! PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --list subconfigures --skip skip_subconfigures; then - exit 1 - fi - fi diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/0002-do-not-include-requireddefines.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/0002-do-not-include-requireddefines.patch deleted file mode 100644 index f4e4b2b..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/0002-do-not-include-requireddefines.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 39df72a4abd14d65f888bda6045d4255bd5ce2fc Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:31:45 -0400 -Subject: [PATCH] do not include requireddefines - ---- - js/src/build/js.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in -index 2eae393a..c2dea62d 100644 ---- a/js/src/build/js.pc.in -+++ b/js/src/build/js.pc.in -@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript - Version: @MOZILLA_VERSION@ - @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@ diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/0003-fix-coredump-caused-by-getenv.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/0003-fix-coredump-caused-by-getenv.patch deleted file mode 100644 index b3ff38e..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/0003-fix-coredump-caused-by-getenv.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5d3bd1a8d7cdbbf193079ed6500070276b7c8c70 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:33:10 -0400 -Subject: [PATCH] fix coredump caused by getenv - ---- - mozglue/misc/TimeStamp.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mozglue/misc/TimeStamp.cpp b/mozglue/misc/TimeStamp.cpp -index c123bd71..b849254b 100644 ---- a/mozglue/misc/TimeStamp.cpp -+++ b/mozglue/misc/TimeStamp.cpp -@@ -11,6 +11,7 @@ - #include "mozilla/TimeStamp.h" - #include - #include -+#include - - namespace mozilla { - diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/0004-new-fix-cannot-find-link.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/0004-new-fix-cannot-find-link.patch deleted file mode 100644 index b2e4de4..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/0004-new-fix-cannot-find-link.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2f0d0585ffc7640e3e10a7260991b33a0783bbd4 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:34:56 -0400 -Subject: [PATCH] new fix cannot find link - ---- - 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 dc140a42..516652da 100644 ---- a/build/moz.configure/checks.configure -+++ b/build/moz.configure/checks.configure -@@ -133,7 +133,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 - diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch deleted file mode 100644 index 3a0709f..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/0005-do-not-use-autoconf-213-to-refresh-old-configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8d26c3717dfb677d8c7a739e26352c1c5ef7838a Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Thu, 4 Apr 2019 15:39:26 -0400 -Subject: [PATCH] do not use autoconf 213 to refresh old configure - ---- - build/moz.configure/old.configure | 4 ++-- - js/src/old-configure | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure -index 17d0c5bf..436fcc5e 100644 ---- a/build/moz.configure/old.configure -+++ b/build/moz.configure/old.configure -@@ -33,7 +33,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: -@@ -87,7 +87,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 830b6361..129b131f 100644 ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -587,7 +587,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 diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/avoid-running-autoconf2.13.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/avoid-running-autoconf2.13.patch deleted file mode 100644 index 46d9a40..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/avoid-running-autoconf2.13.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 88652e61a4cfaf20130b73713468c8dc1dcf224a -Author: Takuro Ashie -Date: Sun Jul 14 20:59:21 2019 +0900 - - Avoid running autoconf2.13 - - Use pre-generated old-configure instead. - - Upstream-Status: Inappropriate [OE-specific] - -diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure -index 7286b23ce86a..87702b520806 100644 ---- a/build/moz.configure/old.configure -+++ b/build/moz.configure/old.configure -@@ -20,6 +20,7 @@ option(env='AUTOCONF', nargs=1, help='Path to autoconf 2.13') - @imports(_from='os.path', _import='exists') - @imports('re') - def autoconf(mozconfig, autoconf): -+ return "autoconf2.13" - mozconfig_autoconf = None - if mozconfig['path']: - make_extra = mozconfig['make_extra'] -@@ -115,6 +116,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, - break - else: - refresh = False -+ refresh = False - - if refresh: - log.info('Refreshing %s with %s', old_configure, autoconf) diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68/pre-generated-old-configure.patch b/meta-gnome/recipes-support/mozjs68/mozjs68/pre-generated-old-configure.patch deleted file mode 100644 index e5a5d5f..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68/pre-generated-old-configure.patch +++ /dev/null @@ -1,9047 +0,0 @@ -diff -Nur '--exclude=mozconfig' '--exclude=firefox-build-dir' '--exclude=*.pyc' firefox-68.0-bak/js/src/old-configure firefox-68.0/js/src/old-configure ---- firefox-68.0-bak/js/src/old-configure 1970-01-01 09:00:00.000000000 +0900 -+++ firefox-68.0/js/src/old-configure 2019-07-14 20:32:27.318145584 +0900 -@@ -0,0 +1,8987 @@ -+#! /bin/sh -+ -+if test `uname -s | grep -c MINGW 2>/dev/null` != "0"; then -+ msyshost=1 -+fi -+ -+. ./old-configure.vars -+ -+# Guess values for system-dependent variables and create Makefiles. -+# Generated automatically using autoconf version 2.13 -+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -+# -+# This configure script is free software; the Free Software Foundation -+# gives unlimited permission to copy, distribute and modify it. -+ -+# Defaults: -+ac_help= -+ac_default_prefix=/usr/local -+# Any additions from configure.in: -+ac_help="$ac_help -+ --with-ios-sdk=TYPE -+ Type of iOS SDK to use (iphonesimulator, iphoneos) -+ and optionally version (like iphoneos8.2)" -+ac_help="$ac_help -+ --enable-ios-target=VER (default=8.0) -+ Set the minimum iOS version needed at runtime" -+ac_help="$ac_help -+ --with-x use the X Window System" -+ac_help="$ac_help -+ --enable-memory-sanitizer Enable Memory Sanitizer (default=no)" -+ac_help="$ac_help -+ --enable-thread-sanitizer Enable Thread Sanitizer (default=no)" -+ac_help="$ac_help -+ --enable-signed-overflow-sanitizer Enable UndefinedBehavior Sanitizer (Signed Integer Overflow Parts, default=no)" -+ac_help="$ac_help -+ --enable-unsigned-overflow-sanitizer Enable UndefinedBehavior Sanitizer (Unsigned Integer Overflow Parts, default=no)" -+ac_help="$ac_help -+ --with-debug-label=LABELS -+ Define DEBUG_ for each comma-separated -+ value given." -+ac_help="$ac_help -+ --enable-cpp-rtti Enable C++ RTTI " -+ac_help="$ac_help -+ --disable-icf Disable Identical Code Folding" -+ac_help="$ac_help -+ --enable-dtrace build with dtrace support if available (default=no)" -+ac_help="$ac_help -+ --with-nspr-cflags=FLAGS -+ Pass FLAGS to CC when building code that uses NSPR. -+ Use this when there's no accurate nspr-config -+ script available. This is the case when building -+ SpiderMonkey as part of the Mozilla tree: the -+ top-level configure script computes NSPR flags -+ that accomodate the quirks of that environment." -+ac_help="$ac_help -+ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR. -+ See --with-nspr-cflags for more details." -+ac_help="$ac_help -+ --enable-nspr-build Build NSPR from source tree" -+ac_help="$ac_help -+ --with-system-nspr Use an NSPR that is already built and installed. -+ Use the 'nspr-config' script in the current path, -+ or look for the script in the directories given with -+ --with-nspr-exec-prefix or --with-nspr-prefix. -+ (Those flags are only checked if you specify -+ --with-system-nspr.)" -+ac_help="$ac_help -+ --enable-posix-nspr-emulation -+ Enable emulation of NSPR for POSIX systems" -+ac_help="$ac_help -+ --with-nspr-prefix=PFX Prefix where NSPR is installed" -+ac_help="$ac_help -+ --with-nspr-exec-prefix=PFX -+ Exec prefix where NSPR is installed" -+ac_help="$ac_help -+ --with-system-zlib[=PFX] -+ Use system libz [installed at prefix PFX]" -+ac_help="$ac_help -+ --with-sixgill=path/to/sixgill -+ Enable static checking of code using sixgill" -+ac_help="$ac_help -+ --enable-strip Enable stripping of libs & executables " -+ac_help="$ac_help -+ --enable-install-strip Enable stripping of libs & executables when packaging " -+ac_help="$ac_help -+ --jitreport-granularity=N -+ Default granularity at which to report JIT code -+ to external tools -+ 0 - no info -+ 1 - code ranges for whole functions only -+ 2 - per-line information -+ 3 - per-op information" -+ac_help="$ac_help -+ --enable-readline Link js shell to system readline library" -+ac_help="$ac_help -+ --with-qemu-exe=path Use path as an arm emulator on host platforms" -+ac_help="$ac_help -+ --with-cross-lib=dir Use dir as the location for arm libraries" -+ac_help="$ac_help -+ --with-system-icu -+ Use system ICU (located with pkgconfig)" -+ac_help="$ac_help -+ --with-intl-api, --with-intl-api=build, --without-intl-api -+ Determine the status of the ECMAScript Internationalization API. The first -+ (or lack of any of these) builds and exposes the API. The second builds it -+ but doesn't use ICU or expose the API to script. The third doesn't build -+ ICU at all." -+ -+# Initialize some variables set by options. -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+build=NONE -+cache_file=./config.cache -+exec_prefix=NONE -+host=NONE -+no_create= -+nonopt=NONE -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+target=NONE -+verbose= -+x_includes=NONE -+x_libraries=NONE -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datadir='${prefix}/share' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+libdir='${exec_prefix}/lib' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+infodir='${prefix}/info' -+mandir='${prefix}/man' -+ -+# Initialize some other variables. -+subdirs= -+MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+# Maximum number of lines to put in a shell here document. -+ac_max_here_lines=12 -+ -+ac_prev= -+for ac_option -+do -+ -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval "$ac_prev=\$ac_option" -+ ac_prev= -+ continue -+ fi -+ -+ case "$ac_option" in -+ -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) ac_optarg= ;; -+ esac -+ -+ # Accept the important Cygnus configure options, so we can diagnose typos. -+ -+ case "$ac_option" in -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir="$ac_optarg" ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build="$ac_optarg" ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file="$ac_optarg" ;; -+ -+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -+ | --da=*) -+ datadir="$ac_optarg" ;; -+ -+ -disable-* | --disable-*) -+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; echo "configure: error: $ac_feature: invalid feature name" 1>&5; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ eval "enable_${ac_feature}=no" ;; -+ -+ -enable-* | --enable-*) -+ ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; echo "configure: error: $ac_feature: invalid feature name" 1>&5; exit 1; } -+ fi -+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; -+ *) ac_optarg=yes ;; -+ esac -+ eval "enable_${ac_feature}='$ac_optarg'" ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix="$ac_optarg" ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he) -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat << EOF -+Usage: configure [options] [host] -+Options: [defaults in brackets after descriptions] -+Configuration: -+ --cache-file=FILE cache test results in FILE -+ --help print this message -+ --no-create do not create output files -+ --quiet, --silent do not print \`checking...' messages -+ --version print the version of autoconf that created configure -+Directory and file names: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [same as prefix] -+ --bindir=DIR user executables in DIR [EPREFIX/bin] -+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] -+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data in DIR -+ [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data in DIR -+ [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] -+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] -+ --includedir=DIR C header files in DIR [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] -+ --infodir=DIR info documentation in DIR [PREFIX/info] -+ --mandir=DIR man documentation in DIR [PREFIX/man] -+ --srcdir=DIR find the sources in DIR [configure dir or ..] -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM -+ run sed PROGRAM on installed program names -+EOF -+ cat << EOF -+Host type: -+ --build=BUILD configure for building on BUILD [BUILD=HOST] -+ --host=HOST configure for HOST [guessed] -+ --target=TARGET configure for TARGET [TARGET=HOST] -+Features and packages: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+EOF -+ if test -n "$ac_help"; then -+ echo "--enable and --with options recognized:$ac_help" -+ fi -+ exit 0 ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host="$ac_optarg" ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir="$ac_optarg" ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir="$ac_optarg" ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir="$ac_optarg" ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir="$ac_optarg" ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst \ -+ | --locals | --local | --loca | --loc | --lo) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ localstatedir="$ac_optarg" ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir="$ac_optarg" ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir="$ac_optarg" ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix="$ac_optarg" ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix="$ac_optarg" ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix="$ac_optarg" ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name="$ac_optarg" ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir="$ac_optarg" ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir="$ac_optarg" ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site="$ac_optarg" ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir="$ac_optarg" ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir="$ac_optarg" ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target="$ac_optarg" ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers) -+ echo "configure generated by autoconf version 2.13" -+ exit 0 ;; -+ -+ -with-* | --with-*) -+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; echo "configure: error: $ac_package: invalid package name" 1>&5; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ case "$ac_option" in -+ *=*) ;; -+ *) ac_optarg=yes ;; -+ esac -+ eval "with_${ac_package}='$ac_optarg'" ;; -+ -+ -without-* | --without-*) -+ ac_package=`echo $ac_option|sed -e 's/-*without-//'` -+ # Reject names that are not valid shell variable names. -+ if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then -+ { echo "configure: error: $ac_package: invalid package name" 1>&2; echo "configure: error: $ac_package: invalid package name" 1>&5; exit 1; } -+ fi -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ eval "with_${ac_package}=no" ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes="$ac_optarg" ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries="$ac_optarg" ;; -+ -+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&5; exit 1; } -+ ;; -+ -+ *) -+ if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then -+ echo "configure: warning: $ac_option: invalid host type" 1>&2 -+ fi -+ if test "x$nonopt" != xNONE; then -+ { echo "configure: error: can only configure for one host and one target at a time" 1>&2; echo "configure: error: can only configure for one host and one target at a time" 1>&5; exit 1; } -+ fi -+ nonopt="$ac_option" -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&5; exit 1; } -+fi -+ -+if test -z "$srcdir"; then -+ srcdir=`dirname "$0"` -+fi -+srcdir="$srcdir/../.." -+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 -+ -+# File descriptor usage: -+# 0 standard input -+# 1 file creation -+# 2 errors and warnings -+# 3 some systems may open it to /dev/tty -+# 4 used on the Kubota Titan -+# 6 checking for... messages and results -+# 5 compiler messages saved in config.log -+if test "$silent" = yes; then -+ exec 6>/dev/null -+else -+ exec 6>&1 -+fi -+exec 5>>${CONFIG_LOG=./config.log} -+ -+echo "\ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+" 1>&5 -+ -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Also quote any args containing shell metacharacters. -+ac_configure_args= -+for ac_arg -+do -+ case "$ac_arg" in -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c) ;; -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) -+ ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) ac_configure_args="$ac_configure_args $ac_arg" ;; -+ esac -+done -+ -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -rf conftest* confdefs.h -+# AIX cpp loses on an empty file, so make sure it contains at least a newline. -+echo > confdefs.h -+ -+# A filename unique to this package, relative to the directory that -+# configure is in, which we can look for to find out if srcdir is correct. -+ac_unique_file=js/src/jsapi.h -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then its parent. -+ ac_prog=$0 -+ ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` -+ test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. -+ srcdir=$ac_confdir -+ if test ! -r $srcdir/$ac_unique_file; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r $srcdir/$ac_unique_file; then -+ if test "$ac_srcdir_defaulted" = yes; then -+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; echo "configure: error: can not find sources in $ac_confdir or .." 1>&5; exit 1; } -+ else -+ { echo "configure: error: can not find sources in $srcdir" 1>&2; echo "configure: error: can not find sources in $srcdir" 1>&5; exit 1; } -+ fi -+fi -+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -+ -+# Prefer explicitly selected file to automatically selected ones. -+if test -z "$CONFIG_SITE"; then -+ if test "x$prefix" != xNONE; then -+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -+ else -+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+ fi -+fi -+for ac_site_file in $CONFIG_SITE; do -+ if test -r "$ac_site_file"; then -+ echo "loading site script $ac_site_file" -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ echo "loading cache $cache_file" -+ . $cache_file -+else -+ echo "creating cache $cache_file" -+ > $cache_file -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ac_exeext= -+ac_objext=o -+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then -+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -+ ac_n= ac_c=' -+' ac_t=' ' -+ else -+ ac_n=-n ac_c= ac_t= -+ fi -+else -+ ac_n= ac_c='\c' ac_t= -+fi -+ -+ -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+ -+ac_aux_dir= -+for ac_dir in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf; do -+ if test -f $ac_dir/install-sh; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f $ac_dir/install.sh; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then -+ { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf" 1>&2; echo "configure: error: can not find install-sh or install.sh in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf" 1>&5; exit 1; } -+fi -+ac_config_guess=$ac_aux_dir/config.guess -+ac_config_sub=$ac_aux_dir/config.sub -+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -+ -+ -+# Do some error checking and defaulting for the host and target type. -+# The inputs are: -+# configure --host=HOST --target=TARGET --build=BUILD NONOPT -+# -+# The rules are: -+# 1. You are not allowed to specify --host, --target, and nonopt at the -+# same time. -+# 2. Host defaults to nonopt. -+# 3. If nonopt is not specified, then host defaults to the current host, -+# as determined by config.guess. -+# 4. Target and build default to nonopt. -+# 5. If nonopt is not specified, then target and build default to host. -+ -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+case $host---$target---$nonopt in -+NONE---*---* | *---NONE---* | *---*---NONE) ;; -+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; echo "configure: error: can only configure for one host and one target at a time" 1>&5; exit 1; } ;; -+esac -+ -+ -+# Make sure we can run config.sub. -+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -+else { echo "configure: error: can not run $ac_config_sub" 1>&2; echo "configure: error: can not run $ac_config_sub" 1>&5; exit 1; } -+fi -+ -+echo $ac_n "checking host system type""... $ac_c" 1>&6 -+echo "configure:680: checking host system type" >&5 -+ -+host_alias=$host -+case "$host_alias" in -+NONE) -+ case $nonopt in -+ NONE) -+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : -+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; echo "configure: error: can not guess host type; you must specify one" 1>&5; exit 1; } -+ fi ;; -+ *) host_alias=$nonopt ;; -+ esac ;; -+esac -+ -+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$host" 1>&6 -+ -+echo $ac_n "checking target system type""... $ac_c" 1>&6 -+echo "configure:701: checking target system type" >&5 -+ -+target_alias=$target -+case "$target_alias" in -+NONE) -+ case $nonopt in -+ NONE) target_alias=$host_alias ;; -+ *) target_alias=$nonopt ;; -+ esac ;; -+esac -+ -+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$target" 1>&6 -+ -+echo $ac_n "checking build system type""... $ac_c" 1>&6 -+echo "configure:719: checking build system type" >&5 -+ -+build_alias=$build -+case "$build_alias" in -+NONE) -+ case $nonopt in -+ NONE) build_alias=$host_alias ;; -+ *) build_alias=$nonopt ;; -+ esac ;; -+esac -+ -+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+echo "$ac_t""$build" 1>&6 -+ -+test "$host_alias" != "$target_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && -+ program_prefix=${target_alias}- -+ -+ -+CFLAGS="${CFLAGS=}" -+CPPFLAGS="${CPPFLAGS=}" -+CXXFLAGS="${CXXFLAGS=}" -+LDFLAGS="${LDFLAGS=}" -+HOST_CFLAGS="${HOST_CFLAGS=}" -+HOST_CXXFLAGS="${HOST_CXXFLAGS=}" -+HOST_LDFLAGS="${HOST_LDFLAGS=}" -+ -+_SUBDIR_CC="$CC" -+_SUBDIR_CXX="$CXX" -+_SUBDIR_CFLAGS="$CFLAGS" -+_SUBDIR_CPPFLAGS="$CPPFLAGS" -+_SUBDIR_CXXFLAGS="$CXXFLAGS" -+_SUBDIR_LDFLAGS="$LDFLAGS" -+_SUBDIR_HOST_CC="$HOST_CC" -+_SUBDIR_HOST_CFLAGS="$HOST_CFLAGS" -+_SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS" -+_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS" -+_SUBDIR_CONFIG_ARGS="$ac_configure_args" -+ -+NSPR_VERSION=4 -+NSPR_MINVER=4.9.2 -+ -+W32API_VERSION=3.14 -+ -+MISSING_X= -+ -+USE_PTHREADS= -+_PTHREAD_LDFLAGS="" -+ -+LDFLAGS="$LDFLAGS $LINKER_LDFLAGS" -+ -+if test -z "$JS_STANDALONE"; then -+ autoconfmk=autoconf-js.mk -+fi -+ -+ -+if test -n "$JS_STANDALONE"; then -+ jsconfdefs=$_objdir/js/src/js-confdefs.h -+else -+ jsconfdefs=$_objdir/js-confdefs.h -+fi -+ -+ -+ -+case "$target" in -+*-android*|*-linuxandroid*) -+ directory_include_args="-isystem $android_system -isystem $android_sysroot/usr/include" -+ -+ # clang will do any number of interesting things with host tools unless we tell -+ # it to use the NDK tools. -+ extra_opts="-gcc-toolchain $(dirname $(dirname $TOOLCHAIN_PREFIX))" -+ CPPFLAGS="$extra_opts -D__ANDROID_API__=$android_version $CPPFLAGS" -+ ASFLAGS="$extra_opts $ASFLAGS" -+ LDFLAGS="$extra_opts $LDFLAGS" -+ -+ CPPFLAGS="$directory_include_args $CPPFLAGS" -+ CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS" -+ CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS $stlport_cppflags" -+ ASFLAGS="$directory_include_args -DANDROID $ASFLAGS" -+ -+ LDFLAGS="-L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS" -+ ANDROID_PLATFORM="${android_platform}" -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' ANDROID ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define ANDROID 1 -+EOF -+ -+ -+ -+ ;; -+esac -+ -+ -+ -+case "$target" in -+*-apple-darwin*) -+ -+ -+# Check whether --with-ios-sdk or --without-ios-sdk was given. -+if test "${with_ios_sdk+set}" = set; then -+ withval="$with_ios_sdk" -+ ios_sdk=$withval -+fi -+ -+ -+# Check whether --enable-ios-target or --disable-ios-target was given. -+if test "${enable_ios_target+set}" = set; then -+ enableval="$enable_ios_target" -+ _IOS_TARGET=$enableval -+fi -+ -+_IOS_TARGET_DEFAULT=8.0 -+ -+case "$target" in -+arm*-apple-darwin*) -+ if test -z "$ios_sdk" -o "$ios_sdk" = "yes"; then -+ ios_sdk=iphoneos -+ fi -+ case "$ios_sdk" in -+ iphoneos*) -+ ios_target_arg="-miphoneos-version-min" -+ ;; -+ *) -+ { echo "configure: error: Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'." 1>&2; echo "configure: error: Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'." 1>&5; exit 1; } -+ ;; -+ esac -+ ;; -+*-apple-darwin*) -+ ios_target_arg="-mios-simulator-version-min" -+ case "$ios_sdk" in -+ # Empty SDK is okay, this might be an OS X desktop build. -+ ""|iphonesimulator*) -+ ;; -+ # Default to iphonesimulator -+ yes) -+ ios_sdk=iphonesimulator -+ ;; -+ *) -+ { echo "configure: error: Only 'iphonesimulator' SDKs are valid when targeting iOS simulator." 1>&2; echo "configure: error: Only 'iphonesimulator' SDKs are valid when targeting iOS simulator." 1>&5; exit 1; } -+ ;; -+ esac -+ ;; -+esac -+ -+ -+if test -n "$ios_sdk"; then -+ if test -z "$_IOS_TARGET"; then -+ _IOS_TARGET=$_IOS_TARGET_DEFAULT -+ ios_target_arg="${ios_target_arg}=${_IOS_TARGET}" -+ fi -+ # Ensure that xcrun knows where this SDK is. -+ ios_sdk_path=`xcrun --sdk $ios_sdk --show-sdk-path 2>/dev/null` -+ _ret=$? -+ if test $_ret -ne 0; then -+ { echo "configure: error: iOS SDK '$ios_sdk' could not be found." 1>&2; echo "configure: error: iOS SDK '$ios_sdk' could not be found." 1>&5; exit 1; } -+ fi -+ MOZ_IOS=1 -+ export HOST_CC=clang -+ export HOST_CXX=clang++ -+ # Add isysroot, arch, and ios target arguments -+ case "$target_cpu" in -+ arm*) -+ ARGS="-arch armv7" -+ ;; -+ *) -+ # Unfortunately simulator builds need this. -+ export CROSS_COMPILE=1 -+ ;; -+ esac -+ ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg" -+ # Now find our tools -+ -+ -+_prog_name=clang -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:902: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_CC=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_CC" 1>&6 -+CC="${ac_cv_ios_path_CC}$ARGS" -+ -+ -+ -+_prog_name=clang++ -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:924: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_CXX'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_CXX=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_CXX" 1>&6 -+CXX="${ac_cv_ios_path_CXX}$ARGS" -+ -+ export CPP="$CC -E" -+ -+ -+_prog_name=`echo AR | tr "[:upper:]" "[:lower:]"` -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:947: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_AR'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_AR=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_AR" 1>&6 -+AR="${ac_cv_ios_path_AR}" -+ -+ -+ -+_prog_name=as -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:969: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_AS'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_AS=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_AS" 1>&6 -+AS="${ac_cv_ios_path_AS}$ARGS" -+ -+ -+ -+_prog_name=`echo OTOOL | tr "[:upper:]" "[:lower:]"` -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:991: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_OTOOL'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_OTOOL=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_OTOOL" 1>&6 -+OTOOL="${ac_cv_ios_path_OTOOL}" -+ -+ -+ -+_prog_name=`echo STRIP | tr "[:upper:]" "[:lower:]"` -+ -+echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6 -+echo "configure:1013: checking for $_prog_name in iOS SDK" >&5 -+if eval "test \"`echo '$''{'ac_cv_ios_path_STRIP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null` -+_res=$? -+if test $_res -ne 0; then -+ { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; } -+fi -+ac_cv_ios_path_STRIP=$_path -+ -+fi -+ -+echo "$ac_t""$ac_cv_ios_path_STRIP" 1>&6 -+STRIP="${ac_cv_ios_path_STRIP}" -+ -+ export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/ -+fi -+ -+ -+ -+ ;; -+esac -+ -+ -+if test "$COMPILE_ENVIRONMENT"; then -+ -+# Note: -+# In Mozilla, we use the names $target, $host and $build incorrectly, but are -+# too far gone to back out now. See Bug 475488: -+# - When we say $target, we mean $host, that is, the system on which -+# Mozilla will be run. -+# - When we say $host, we mean $build, that is, the system on which Mozilla -+# is built. -+# - $target (in its correct usage) is for compilers who generate code for a -+# different platform than $host, so it would not be used by Mozilla. -+if test "$target" != "$host"; then -+ -+echo "cross compiling from $host to $target" -+ -+_SAVE_PATH=$PATH -+case "${TOOLCHAIN_PREFIX}" in -+/*) -+ PATH="/:$PATH" -+ ;; -+esac -+# Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1063: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1093: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_prog_rejected=no -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# -gt 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" -+ fi -+fi -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1144: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; echo "configure: error: no acceptable cc found in \$PATH" 1>&5; exit 1; } -+fi -+ -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1176: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cc_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1194 "configure" -+#include "confdefs.h" -+ -+main(){return(0);} -+EOF -+if { (eval echo configure:1199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no -+ else -+ ac_cv_prog_cc_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1231: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:1236: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gcc=yes -+else -+ ac_cv_prog_gcc=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+ -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes -+else -+ GCC= -+fi -+ -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:1264: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -+ ac_cv_prog_cc_g=yes -+else -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+ -+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -+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:1300: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CXX="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CXX="$ac_cv_prog_CXX" -+if test -n "$CXX"; then -+ echo "$ac_t""$CXX" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$CXX" && break -+done -+test -n "$CXX" || CXX="gcc" -+ -+ -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1332: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1350 "configure" -+#include "confdefs.h" -+ -+int main(){return(0);} -+EOF -+if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cxx_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cxx_cross=no -+ else -+ ac_cv_prog_cxx_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cxx_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -+if test $ac_cv_prog_cxx_works = no; then -+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1387: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -+echo "configure:1392: checking whether we are using GNU C++" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gxx=yes -+else -+ ac_cv_prog_gxx=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -+ -+if test $ac_cv_prog_gxx = yes; then -+ GXX=yes -+else -+ GXX= -+fi -+ -+ac_test_CXXFLAGS="${CXXFLAGS+set}" -+ac_save_CXXFLAGS="$CXXFLAGS" -+CXXFLAGS= -+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -+echo "configure:1420: checking whether ${CXX-g++} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.cc -+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then -+ ac_cv_prog_cxx_g=yes -+else -+ ac_cv_prog_cxx_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS="$ac_save_CXXFLAGS" -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi -+ -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}ranlib" -+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:1457: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+RANLIB="$ac_cv_prog_RANLIB" -+if test -n "$RANLIB"; then -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$RANLIB" && break -+done -+test -n "$RANLIB" || RANLIB=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}as" -+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:1492: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$AS"; then -+ ac_cv_prog_AS="$AS" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_AS="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+AS="$ac_cv_prog_AS" -+if test -n "$AS"; then -+ echo "$ac_t""$AS" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$AS" && break -+done -+test -n "$AS" || AS=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}lipo" -+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:1527: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$LIPO"; then -+ ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_LIPO="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+LIPO="$ac_cv_prog_LIPO" -+if test -n "$LIPO"; then -+ echo "$ac_t""$LIPO" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$LIPO" && break -+done -+test -n "$LIPO" || LIPO=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}strip" -+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:1562: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_STRIP="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+STRIP="$ac_cv_prog_STRIP" -+if test -n "$STRIP"; then -+ echo "$ac_t""$STRIP" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$STRIP" && break -+done -+test -n "$STRIP" || STRIP=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}otool" -+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:1597: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_OTOOL'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$OTOOL"; then -+ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_OTOOL="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+OTOOL="$ac_cv_prog_OTOOL" -+if test -n "$OTOOL"; then -+ echo "$ac_t""$OTOOL" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$OTOOL" && break -+done -+test -n "$OTOOL" || OTOOL=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}install_name_tool" -+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:1632: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_INSTALL_NAME_TOOL'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$INSTALL_NAME_TOOL"; then -+ ac_cv_prog_INSTALL_NAME_TOOL="$INSTALL_NAME_TOOL" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_INSTALL_NAME_TOOL="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+INSTALL_NAME_TOOL="$ac_cv_prog_INSTALL_NAME_TOOL" -+if test -n "$INSTALL_NAME_TOOL"; then -+ echo "$ac_t""$INSTALL_NAME_TOOL" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$INSTALL_NAME_TOOL" && break -+done -+test -n "$INSTALL_NAME_TOOL" || INSTALL_NAME_TOOL=":" -+ -+for ac_prog in "${TOOLCHAIN_PREFIX}objcopy" -+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:1667: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$OBJCOPY"; then -+ ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_OBJCOPY="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+OBJCOPY="$ac_cv_prog_OBJCOPY" -+if test -n "$OBJCOPY"; then -+ echo "$ac_t""$OBJCOPY" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$OBJCOPY" && break -+done -+test -n "$OBJCOPY" || OBJCOPY=":" -+ -+PATH=$_SAVE_PATH -+ -+else -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1703: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="gcc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1733: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_prog_rejected=no -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# -gt 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ set dummy "$ac_dir/$ac_word" "$@" -+ shift -+ ac_cv_prog_CC="$@" -+ fi -+fi -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1784: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi -+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; echo "configure: error: no acceptable cc found in \$PATH" 1>&5; exit 1; } -+fi -+ -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1816: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cc_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1834 "configure" -+#include "confdefs.h" -+ -+main(){return(0);} -+EOF -+if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cc_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cc_cross=no -+ else -+ ac_cv_prog_cc_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cc_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -+if test $ac_cv_prog_cc_works = no; then -+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1871: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -+echo "configure:1876: checking whether we are using GNU C" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gcc=yes -+else -+ ac_cv_prog_gcc=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -+ -+if test $ac_cv_prog_gcc = yes; then -+ GCC=yes -+else -+ GCC= -+fi -+ -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:1904: checking whether ${CC-cc} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then -+ ac_cv_prog_cc_g=yes -+else -+ ac_cv_prog_cc_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+ -+ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -+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:1940: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CXX="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CXX="$ac_cv_prog_CXX" -+if test -n "$CXX"; then -+ echo "$ac_t""$CXX" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$CXX" && break -+done -+test -n "$CXX" || CXX="gcc" -+ -+ -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1972: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext << EOF -+ -+#line 1990 "configure" -+#include "confdefs.h" -+ -+int main(){return(0);} -+EOF -+if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_cxx_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_cxx_cross=no -+ else -+ ac_cv_prog_cxx_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_cxx_works=no -+fi -+rm -fr conftest* -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 -+if test $ac_cv_prog_cxx_works = no; then -+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; } -+fi -+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:2027: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -+echo "configure:2032: checking whether we are using GNU C++" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_gxx=yes -+else -+ ac_cv_prog_gxx=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -+ -+if test $ac_cv_prog_gxx = yes; then -+ GXX=yes -+else -+ GXX= -+fi -+ -+ac_test_CXXFLAGS="${CXXFLAGS+set}" -+ac_save_CXXFLAGS="$CXXFLAGS" -+CXXFLAGS= -+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -+echo "configure:2060: checking whether ${CXX-g++} accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo 'void f(){}' > conftest.cc -+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then -+ ac_cv_prog_cxx_g=yes -+else -+ ac_cv_prog_cxx_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS="$ac_save_CXXFLAGS" -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi -+ -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:2094: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -+fi -+fi -+RANLIB="$ac_cv_prog_RANLIB" -+if test -n "$RANLIB"; then -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ for ac_prog in $AS as -+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:2126: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$AS" in -+ /*) -+ ac_cv_path_AS="$AS" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_AS="$AS" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_AS="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+AS="$ac_cv_path_AS" -+if test -n "$AS"; then -+ echo "$ac_t""$AS" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$AS" && break -+done -+test -n "$AS" || AS="$CC" -+ -+ if test "$msyshost"; then -+ case "$AS" in -+ /*) -+ tmp_DIRNAME=`dirname "$AS"` -+ tmp_BASENAME=`basename "$AS"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ AS="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$AS.exe"; then -+ AS="$AS.exe" -+ fi -+ esac -+ fi -+ -+ for ac_prog in strip -+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:2180: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_STRIP="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+STRIP="$ac_cv_prog_STRIP" -+if test -n "$STRIP"; then -+ echo "$ac_t""$STRIP" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$STRIP" && break -+done -+test -n "$STRIP" || STRIP=":" -+ -+ if test -z "$HOST_CC"; then -+ HOST_CC='$(CC)' -+ fi -+ if test -z "$HOST_CXX"; then -+ HOST_CXX='$(CXX)' -+ fi -+fi -+ -+ -+GNU_CC= -+GNU_CXX= -+if test "$CC_TYPE" = "gcc"; then -+ GNU_CC=1 -+ GNU_CXX=1 -+fi -+ -+CLANG_CC= -+CLANG_CXX= -+CLANG_CL= -+if test "$CC_TYPE" = "clang"; then -+ GNU_CC=1 -+ GNU_CXX=1 -+ CLANG_CC=1 -+ CLANG_CXX=1 -+fi -+if test "$CC_TYPE" = "clang-cl"; then -+ CLANG_CL=1 -+fi -+ -+ -+ -+ -+ -+ -+# Target the Windows 8.1 SDK by default -+WINVER=601 -+ -+case "$target" in -+*-mingw*) -+ if test "$GCC" != "yes"; then -+ # Check to see if we are really running in a msvc environemnt -+ _WIN32_MSVC=1 -+ -+ # Make sure compilers are valid -+ CFLAGS="$CFLAGS -nologo" -+ CXXFLAGS="$CXXFLAGS -TP -nologo" -+ if test -z "$CLANG_CL"; then -+ CPPFLAGS="$CPPFLAGS -utf-8" -+ fi -+ # _CRT_SECURE_NO_WARNINGS disables warnings about using MSVC-specific -+ # secure CRT functions. -+ CXXFLAGS="$CXXFLAGS -D_CRT_SECURE_NO_WARNINGS" -+ -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ cat > conftest.$ac_ext < -+int main() { -+ printf("Hello World\n"); -+; return 0; } -+EOF -+if { (eval echo configure:2282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: \$(CC) test failed. You must have MS VC++ in your path to build." 1>&2; echo "configure: error: \$(CC) test failed. You must have MS VC++ in your path to build." 1>&5; exit 1; } -+fi -+rm -f conftest* -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ cat > conftest.$ac_ext < -+int main() { -+ unsigned *test = new unsigned(42); -+; return 0; } -+EOF -+if { (eval echo configure:2311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: \$(CXX) test failed. You must have MS VC++ in your path to build." 1>&2; echo "configure: error: \$(CXX) test failed. You must have MS VC++ in your path to build." 1>&5; exit 1; } -+fi -+rm -f conftest* -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+ _MSVC_VER_FILTER='s|.*[^!-~]([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p' -+ -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _CRT_SECURE_NO_WARNINGS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _CRT_SECURE_NO_WARNINGS 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _CRT_NONSTDC_NO_WARNINGS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _CRT_NONSTDC_NO_WARNINGS 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _USE_MATH_DEFINES ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _USE_MATH_DEFINES 1 -+EOF -+ # Otherwise MSVC's math.h doesn't #define M_PI. -+ -+ _CC_SUITE=14 -+ MSVC_C_RUNTIME_DLL=vcruntime140.dll -+ MSVC_CXX_RUNTIME_DLL=msvcp140.dll -+ -+ # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146) -+ CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-" -+ -+ -+ -+ -+ # Check linker version, except in lld builds -+ case "$LINKER" in -+ *lld*) -+ ;; -+ *) -+ _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` -+ _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` -+ if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then -+ { echo "configure: error: The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE." 1>&2; echo "configure: error: The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE." 1>&5; exit 1; } -+ fi -+ ;; -+ esac -+ -+ INCREMENTAL_LINKER=1 -+ -+ unset _MSVC_VER_FILTER -+ -+ CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0" -+ CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0" -+ else -+ # Check w32api version -+ _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` -+ _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` -+ echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 -+echo "configure:2392: checking for w32api version >= $W32API_VERSION" >&5 -+ cat > conftest.$ac_ext < -+int main() { -+#if (__W32API_MAJOR_VERSION < $_W32API_MAJOR_VERSION) || \ -+ (__W32API_MAJOR_VERSION == $_W32API_MAJOR_VERSION && \ -+ __W32API_MINOR_VERSION < $_W32API_MINOR_VERSION) -+ #error "test failed." -+ #endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ res=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ res=no -+fi -+rm -f conftest* -+ echo "$ac_t""$res" 1>&6 -+ if test "$res" != "yes"; then -+ { echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&2; echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&5; exit 1; } -+ fi -+ fi # !GNU_CC -+ -+ cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <<\EOF -+ (''' HAVE_LOCALECONV ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_LOCALECONV 1 -+EOF -+ -+ for ac_func in _getc_nolock -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:2468: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:2500: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+fi -+ -+fi # COMPILE_ENVIRONMENT -+ -+# Check to see if we are running in a broken QEMU scratchbox. -+# We know that anything below 1.0.16 is broken. -+for ac_prog in sb-conf ve -+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:2538: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_SBCONF'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$SBCONF"; then -+ ac_cv_prog_SBCONF="$SBCONF" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_SBCONF="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+SBCONF="$ac_cv_prog_SBCONF" -+if test -n "$SBCONF"; then -+ echo "$ac_t""$SBCONF" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$SBCONF" && break -+done -+test -n "$SBCONF" || SBCONF="""" -+ -+if test -n "$SBCONF"; then -+ _sb_version=`$SBCONF ve` -+ _sb_version_major=`echo $_sb_version | cut -f1 -d.` -+ _sb_version_minor=`echo $_sb_version | cut -f2 -d.` -+ _sb_version_point=`echo $_sb_version | cut -f3 -d.` -+ if test $_sb_version_major -eq 1 -a $_sb_version_minor -eq 0 -a $_sb_version_point -le 16; then -+ QEMU_CANT_RUN_JS_SHELL=1 -+ fi -+fi -+ -+ -+ -+ -+ -+if test "$COMPILE_ENVIRONMENT"; then -+ -+ -+ -+# If we find X, set shell vars x_includes and x_libraries to the -+# paths, otherwise set no_x=yes. -+# Uses ac_ vars as temps to allow command line to override cache and checks. -+# --without-x overrides everything else, but does not touch the cache. -+echo $ac_n "checking for X""... $ac_c" 1>&6 -+echo "configure:2591: checking for X" >&5 -+ -+# Check whether --with-x or --without-x was given. -+if test "${with_x+set}" = set; then -+ withval="$with_x" -+ : -+fi -+ -+# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -+if test "x$with_x" = xno; then -+ # The user explicitly disabled X. -+ have_x=disabled -+else -+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then -+ # Both variables are already set. -+ have_x=yes -+ else -+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=NO ac_x_libraries=NO -+rm -fr conftestdir -+if mkdir conftestdir; then -+ cd conftestdir -+ # Make sure to not put "make" in the Imakefile rules, since we grep it out. -+ cat > Imakefile <<'EOF' -+acfindx: -+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -+EOF -+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -+ for ac_extension in a so sl; do -+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -+ test -f $ac_im_libdir/libX11.$ac_extension; then -+ ac_im_usrlibdir=$ac_im_libdir; break -+ fi -+ done -+ # Screen out bogus values from the imake configuration. They are -+ # bogus both because they are the default anyway, and because -+ # using them would break gcc on systems where it needs fixed includes. -+ case "$ac_im_incroot" in -+ /usr/include) ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; -+ esac -+ case "$ac_im_usrlibdir" in -+ /usr/lib | /lib) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; -+ esac -+ fi -+ cd .. -+ rm -fr conftestdir -+fi -+ -+if test "$ac_x_includes" = NO; then -+ # Guess where to find include files, by looking for this one X11 .h file. -+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -+ -+ # First, try using that file with no special directory specified. -+cat > conftest.$ac_ext < -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:2658: \"$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* -+ # We can compile using X headers with no special include directory. -+ac_x_includes= -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ # Look for the header file in a standard set of common directories. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ for ac_dir in \ -+ /usr/X11/include \ -+ /usr/X11R6/include \ -+ /usr/X11R5/include \ -+ /usr/X11R4/include \ -+ \ -+ /usr/include/X11 \ -+ /usr/include/X11R6 \ -+ /usr/include/X11R5 \ -+ /usr/include/X11R4 \ -+ \ -+ /usr/local/X11/include \ -+ /usr/local/X11R6/include \ -+ /usr/local/X11R5/include \ -+ /usr/local/X11R4/include \ -+ \ -+ /usr/local/include/X11 \ -+ /usr/local/include/X11R6 \ -+ /usr/local/include/X11R5 \ -+ /usr/local/include/X11R4 \ -+ \ -+ /usr/X386/include \ -+ /usr/x386/include \ -+ /usr/XFree86/include/X11 \ -+ \ -+ /usr/include \ -+ /usr/local/include \ -+ /usr/unsupported/include \ -+ /usr/athena/include \ -+ /usr/local/x11r5/include \ -+ /usr/lpp/Xamples/include \ -+ \ -+ /usr/openwin/include \ -+ /usr/openwin/share/include \ -+ ; \ -+ do -+ if test -r "$ac_dir/$x_direct_test_include"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+ done -+fi -+rm -f conftest* -+fi # $ac_x_includes = NO -+ -+if test "$ac_x_libraries" = NO; then -+ # Check for the libraries. -+ -+ test -z "$x_direct_test_library" && x_direct_test_library=Xt -+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc -+ -+ # See if we find them without any special options. -+ # Don't add to $LIBS permanently. -+ ac_save_LIBS="$LIBS" -+ LIBS="-l$x_direct_test_library $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ LIBS="$ac_save_LIBS" -+# We can link X programs with no special library path. -+ac_x_libraries= -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ LIBS="$ac_save_LIBS" -+# First see if replacing the include by lib works. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -+ /usr/X11/lib \ -+ /usr/X11R6/lib \ -+ /usr/X11R5/lib \ -+ /usr/X11R4/lib \ -+ \ -+ /usr/lib/X11 \ -+ /usr/lib/X11R6 \ -+ /usr/lib/X11R5 \ -+ /usr/lib/X11R4 \ -+ \ -+ /usr/local/X11/lib \ -+ /usr/local/X11R6/lib \ -+ /usr/local/X11R5/lib \ -+ /usr/local/X11R4/lib \ -+ \ -+ /usr/local/lib/X11 \ -+ /usr/local/lib/X11R6 \ -+ /usr/local/lib/X11R5 \ -+ /usr/local/lib/X11R4 \ -+ \ -+ /usr/X386/lib \ -+ /usr/x386/lib \ -+ /usr/XFree86/lib/X11 \ -+ \ -+ /usr/lib \ -+ /usr/local/lib \ -+ /usr/unsupported/lib \ -+ /usr/athena/lib \ -+ /usr/local/x11r5/lib \ -+ /usr/lpp/Xamples/lib \ -+ /lib/usr/lib/X11 \ -+ \ -+ /usr/openwin/lib \ -+ /usr/openwin/share/lib \ -+ ; \ -+do -+ for ac_extension in a so sl; do -+ if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then -+ ac_x_libraries=$ac_dir -+ break 2 -+ fi -+ done -+done -+fi -+rm -f conftest* -+fi # $ac_x_libraries = NO -+ -+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then -+ # Didn't find X anywhere. Cache the known absence of X. -+ ac_cv_have_x="have_x=no" -+else -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes \ -+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -+fi -+fi -+ fi -+ eval "$ac_cv_have_x" -+fi # $with_x != no -+ -+if test "$have_x" != yes; then -+ echo "$ac_t""$have_x" 1>&6 -+ no_x=yes -+else -+ # If each of the values was on the command line, it overrides each guess. -+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes -+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -+ # Update the cache value to reflect the command line values. -+ ac_cv_have_x="have_x=yes \ -+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 -+fi -+ -+if test "$no_x" = yes; then -+ # Not all programs may use this symbol, but it does not hurt to define it. -+ cat >> confdefs.pytmp <<\EOF -+ (''' X_DISPLAY_MISSING ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define X_DISPLAY_MISSING 1 -+EOF -+ -+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+else -+ if test -n "$x_includes"; then -+ X_CFLAGS="$X_CFLAGS -I$x_includes" -+ fi -+ -+ # It would also be nice to do this for all -L options, not just this one. -+ if test -n "$x_libraries"; then -+ X_LIBS="$X_LIBS -L$x_libraries" -+ # For Solaris; some versions of Sun CC require a space after -R and -+ # others require no space. Words are not sufficient . . . . -+ case "`(uname -sr) 2>/dev/null`" in -+ "SunOS 5"*) -+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -+echo "configure:2843: checking whether -R must be followed by a space" >&5 -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_R_nospace=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_R_nospace=no -+fi -+rm -f conftest* -+ if test $ac_R_nospace = yes; then -+ echo "$ac_t""no" 1>&6 -+ X_LIBS="$X_LIBS -R$x_libraries" -+ else -+ LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_R_space=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_R_space=no -+fi -+rm -f conftest* -+ if test $ac_R_space = yes; then -+ echo "$ac_t""yes" 1>&6 -+ X_LIBS="$X_LIBS -R $x_libraries" -+ else -+ echo "$ac_t""neither works" 1>&6 -+ fi -+ fi -+ LIBS="$ac_xsave_LIBS" -+ esac -+ fi -+ -+ # Check for system-dependent libraries X programs must link with. -+ # Do this before checking for the system-independent R6 libraries -+ # (-lICE), since we may need -lsocket or whatever for X linking. -+ -+ if test "$ISC" = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -+ else -+ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And karl@cs.umb.edu says -+ # the Alpha needs dnet_stub (dnet does not exist). -+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -+echo "configure:2908: checking for dnet_ntoa in -ldnet" >&5 -+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldnet $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -+echo "configure:2949: checking for dnet_ntoa in -ldnet_stub" >&5 -+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldnet_stub $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -+ # to get the SysV transport functions. -+ # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # needs -lnsl. -+ # The nsl library prevents programs from opening the X display -+ # on Irix 5.2, according to dickey@clark.net. -+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -+echo "configure:2997: checking for gethostbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef gethostbyname -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char gethostbyname(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -+choke me -+#else -+gethostbyname(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_gethostbyname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_gethostbyname=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_gethostbyname = no; then -+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:3050: checking for gethostbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lnsl $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # lieder@skyler.mavd.honeywell.com says without -lsocket, -+ # socket/setsockopt and other routines are undefined under SCO ODT -+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -+ # on later versions), says simon@lia.di.epfl.ch: it contains -+ # gethostby* variants that don't use the nameserver (or something). -+ # -lsocket must be given before -lnsl if both are needed. -+ # We assume that if connect needs -lnsl, so does gethostbyname. -+ echo $ac_n "checking for connect""... $ac_c" 1>&6 -+echo "configure:3099: checking for connect" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef connect -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char connect(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_connect) || defined (__stub___connect) -+choke me -+#else -+connect(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_connect=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_connect=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_connect = no; then -+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -+echo "configure:3152: checking for connect in -lsocket" >&5 -+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. -+ echo $ac_n "checking for remove""... $ac_c" 1>&6 -+echo "configure:3195: checking for remove" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef remove -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char remove(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_remove) || defined (__stub___remove) -+choke me -+#else -+remove(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_remove=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_remove=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_remove = no; then -+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -+echo "configure:3248: checking for remove in -lposix" >&5 -+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lposix $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ -+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ echo $ac_n "checking for shmat""... $ac_c" 1>&6 -+echo "configure:3291: checking for shmat" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+#undef shmat -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char shmat(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_shmat) || defined (__stub___shmat) -+choke me -+#else -+shmat(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_shmat=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_shmat=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ : -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test $ac_cv_func_shmat = no; then -+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -+echo "configure:3344: checking for shmat in -lipc" >&5 -+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lipc $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ fi -+ fi -+ -+ # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS="$LDFLAGS" -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -+ # check for ICE first), but we must link in the order -lSM -lICE or -+ # we get undefined symbols. So assume we have SM if we have ICE. -+ # These have to be linked with before -lX11, unlike the other -+ # libraries we check for below, so use a different variable. -+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -+echo "configure:3396: checking for IceConnectionNumber in -lICE" >&5 -+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ LDFLAGS="$ac_save_LDFLAGS" -+ -+fi -+ -+ -+XCFLAGS="$X_CFLAGS" -+ -+fi # COMPILE_ENVIRONMENT -+ -+# Separate version into components for use in shared object naming etc -+ -+MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"` -+MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"` -+MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` -+IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` -+ -+JS_SHELL_NAME=js -+JS_CONFIG_NAME=js-config -+ -+ -+if test -n "$IS_ALPHA"; then -+ -+ MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"` -+ -+fi -+cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <&2; echo "configure: error: Couldn't find path to llvm-libc++ in the android ndk" 1>&5; exit 1; } -+ fi -+ -+ STLPORT_LIBS="-L$cxx_libs -lc++_static" -+ # NDK r12 split the libc++ runtime libraries into pieces. -+ for lib in c++abi unwind android_support; do -+ if test -e "$cxx_libs/lib${lib}.a"; then -+ STLPORT_LIBS="$STLPORT_LIBS -l${lib}" -+ fi -+ done -+ fi -+fi -+ -+ -+ -+ -+WARNINGS_CFLAGS="$_WARNINGS_CFLAGS" -+if test -n "${CLANG_CC}${CLANG_CL}"; then -+ WARNINGS_CFLAGS="-Qunused-arguments $WARNINGS_CFLAGS" -+ CPPFLAGS="-Qunused-arguments ${CPPFLAGS}" -+fi -+if test -n "${CLANG_CXX}${CLANG_CL}"; then -+ _WARNINGS_CXXFLAGS="-Qunused-arguments ${_WARNINGS_CXXFLAGS}" -+fi -+ -+ -+ -+if test -n "$MOZ_ASAN"; then -+ if test -n "$CLANG_CL"; then -+ # Look for the ASan runtime binary -+ if test "$CPU_ARCH" = "x86_64"; then -+ MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-x86_64.dll -+ else -+ MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-i386.dll -+ fi -+ # We use MOZ_PATH_PROG in order to get a Windows style path. -+ # Extract the first word of "$MOZ_CLANG_RT_ASAN_LIB", so it can be a program name with args. -+set dummy $MOZ_CLANG_RT_ASAN_LIB; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3571: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$MOZ_CLANG_RT_ASAN_LIB_PATH" in -+ /*) -+ ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH="$MOZ_CLANG_RT_ASAN_LIB_PATH" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH="$MOZ_CLANG_RT_ASAN_LIB_PATH" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+MOZ_CLANG_RT_ASAN_LIB_PATH="$ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH" -+if test -n "$MOZ_CLANG_RT_ASAN_LIB_PATH"; then -+ echo "$ac_t""$MOZ_CLANG_RT_ASAN_LIB_PATH" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$MOZ_CLANG_RT_ASAN_LIB_PATH" in -+ /*) -+ tmp_DIRNAME=`dirname "$MOZ_CLANG_RT_ASAN_LIB_PATH"` -+ tmp_BASENAME=`basename "$MOZ_CLANG_RT_ASAN_LIB_PATH"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ MOZ_CLANG_RT_ASAN_LIB_PATH="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$MOZ_CLANG_RT_ASAN_LIB_PATH.exe"; then -+ MOZ_CLANG_RT_ASAN_LIB_PATH="$MOZ_CLANG_RT_ASAN_LIB_PATH.exe" -+ fi -+ esac -+ fi -+ -+ if test -z "$MOZ_CLANG_RT_ASAN_LIB_PATH"; then -+ { echo "configure: error: Couldn't find $MOZ_CLANG_RT_ASAN_LIB. It should be available in the same location as clang-cl." 1>&2; echo "configure: error: Couldn't find $MOZ_CLANG_RT_ASAN_LIB. It should be available in the same location as clang-cl." 1>&5; exit 1; } -+ fi -+ -+ # Suppressing errors in recompiled code. -+ if test "$OS_ARCH" = "WINNT"; then -+ CFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CFLAGS" -+ CXXFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CXXFLAGS" -+ fi -+ fi -+ CFLAGS="-fsanitize=address $CFLAGS" -+ CXXFLAGS="-fsanitize=address $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=address -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_ASAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_ASAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3641: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+# Check whether --enable-memory-sanitizer or --disable-memory-sanitizer was given. -+if test "${enable_memory_sanitizer+set}" = set; then -+ enableval="$enable_memory_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_MSAN=1 -+ elif test "$enableval" = "no"; then -+ MOZ_MSAN= -+ else -+ { echo "configure: error: Option, memory-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, memory-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+if test -n "$MOZ_MSAN"; then -+ CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins $CFLAGS" -+ CXXFLAGS="-fsanitize=memory -fsanitize-memory-track-origins $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_MSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_MSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3717: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+# Check whether --enable-thread-sanitizer or --disable-thread-sanitizer was given. -+if test "${enable_thread_sanitizer+set}" = set; then -+ enableval="$enable_thread_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_TSAN=1 -+ elif test "$enableval" = "no"; then -+ MOZ_TSAN= -+ else -+ { echo "configure: error: Option, thread-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, thread-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+if test -n "$MOZ_TSAN"; then -+ CFLAGS="-fsanitize=thread $CFLAGS" -+ CXXFLAGS="-fsanitize=thread $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=thread -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_TSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_TSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3793: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+if test -n "$MOZ_UBSAN_CHECKS"; then -+ MOZ_UBSAN=1 -+ UBSAN_TXT="$_objdir/ubsan_blacklist.txt" -+ cat $_topsrcdir/build/sanitizers/ubsan_*_blacklist.txt > $UBSAN_TXT -+ UBSAN_FLAGS="-fsanitize=$MOZ_UBSAN_CHECKS -fno-sanitize-recover=$MOZ_UBSAN_CHECKS -fsanitize-blacklist=$UBSAN_TXT" -+ CFLAGS="$UBSAN_FLAGS $CFLAGS" -+ CXXFLAGS="$UBSAN_FLAGS $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=undefined -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_UBSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_UBSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3861: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+ -+# Check whether --enable-signed-overflow-sanitizer or --disable-signed-overflow-sanitizer was given. -+if test "${enable_signed_overflow_sanitizer+set}" = set; then -+ enableval="$enable_signed_overflow_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_SIGNED_OVERFLOW_SANITIZE=1 -+ elif test "$enableval" = "no"; then -+ MOZ_SIGNED_OVERFLOW_SANITIZE= -+ else -+ { echo "configure: error: Option, signed-overflow-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, signed-overflow-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+# Check whether --enable-unsigned-overflow-sanitizer or --disable-unsigned-overflow-sanitizer was given. -+if test "${enable_unsigned_overflow_sanitizer+set}" = set; then -+ enableval="$enable_unsigned_overflow_sanitizer" -+ if test "$enableval" = "yes"; then -+ MOZ_UNSIGNED_OVERFLOW_SANITIZE=1 -+ elif test "$enableval" = "no"; then -+ MOZ_UNSIGNED_OVERFLOW_SANITIZE= -+ else -+ { echo "configure: error: Option, unsigned-overflow-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, unsigned-overflow-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test -n "$MOZ_SIGNED_OVERFLOW_SANITIZE$MOZ_UNSIGNED_OVERFLOW_SANITIZE"; then -+ MOZ_UBSAN=1 -+ SANITIZER_BLACKLISTS="" -+ if test -n "$MOZ_SIGNED_OVERFLOW_SANITIZE"; then -+ SANITIZER_BLACKLISTS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/ubsan_signed_overflow_blacklist.txt $SANITIZER_BLACKLISTS" -+ CFLAGS="-fsanitize=signed-integer-overflow $CFLAGS" -+ CXXFLAGS="-fsanitize=signed-integer-overflow $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=signed-integer-overflow -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_SIGNED_OVERFLOW_SANITIZE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_SIGNED_OVERFLOW_SANITIZE 1 -+EOF -+ -+ fi -+ if test -n "$MOZ_UNSIGNED_OVERFLOW_SANITIZE"; then -+ SANITIZER_BLACKLISTS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/ubsan_unsigned_overflow_blacklist.txt $SANITIZER_BLACKLISTS" -+ CFLAGS="-fsanitize=unsigned-integer-overflow $CFLAGS" -+ CXXFLAGS="-fsanitize=unsigned-integer-overflow $CXXFLAGS" -+ if test -z "$CLANG_CL"; then -+ LDFLAGS="-fsanitize=unsigned-integer-overflow -rdynamic $LDFLAGS" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_UNSIGNED_OVERFLOW_SANITIZE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_UNSIGNED_OVERFLOW_SANITIZE 1 -+EOF -+ -+ fi -+ CFLAGS="$SANITIZER_BLACKLISTS $CFLAGS" -+ CXXFLAGS="$SANITIZER_BLACKLISTS $CXXFLAGS" -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_UBSAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_UBSAN 1 -+EOF -+ -+ # Extract the first word of "llvm-symbolizer", so it can be a program name with args. -+set dummy llvm-symbolizer; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:3980: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_LLVM_SYMBOLIZER="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+LLVM_SYMBOLIZER="$ac_cv_path_LLVM_SYMBOLIZER" -+if test -n "$LLVM_SYMBOLIZER"; then -+ echo "$ac_t""$LLVM_SYMBOLIZER" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$msyshost"; then -+ case "$LLVM_SYMBOLIZER" in -+ /*) -+ tmp_DIRNAME=`dirname "$LLVM_SYMBOLIZER"` -+ tmp_BASENAME=`basename "$LLVM_SYMBOLIZER"` -+ tmp_PWD=`cd "$tmp_DIRNAME" && pwd -W` -+ LLVM_SYMBOLIZER="$tmp_PWD/$tmp_BASENAME" -+ if test -e "$LLVM_SYMBOLIZER.exe"; then -+ LLVM_SYMBOLIZER="$LLVM_SYMBOLIZER.exe" -+ fi -+ esac -+ fi -+ -+fi -+ -+ -+ -+ -+if test -n "$LIBFUZZER"; then -+ LDFLAGS="$LIBFUZZER_FLAGS -rdynamic $LDFLAGS" -+fi -+ -+# The LLVM symbolizer is used by all sanitizers -+ -+ -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: compiler is incompatible with sanitize options" 1>&2; echo "configure: error: compiler is incompatible with sanitize options" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ -+ -+ -+if test "$GNU_CC"; then -+ DSO_LDOPTS='-shared' -+ if test "$GCC_USE_GNU_LD"; then -+ # Some tools like ASan use a runtime library that is only -+ # linked against executables, so we must allow undefined -+ # symbols for shared objects in some cases. -+ if test -z "$MOZ_ASAN$MOZ_MSAN$MOZ_UBSAN$MOZ_TSAN$FUZZING_INTERFACES"; then -+ # Don't allow undefined symbols in libraries -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" -+ fi -+ fi -+ WARNINGS_AS_ERRORS='-Werror' -+ DSO_CFLAGS='' -+ -+ if test "$OS_ARCH" != "WINNT"; then -+ DSO_PIC_CFLAGS='-fPIC' -+ ASFLAGS="$ASFLAGS -fPIC" -+ fi -+ -+ echo $ac_n "checking for --noexecstack option to as""... $ac_c" 1>&6 -+echo "configure:4077: checking for --noexecstack option to as" >&5 -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS -Wa,--noexecstack" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+ ASFLAGS="$ASFLAGS -Wa,--noexecstack" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ CFLAGS=$_SAVE_CFLAGS -+ echo $ac_n "checking for -z noexecstack option to ld""... $ac_c" 1>&6 -+echo "configure:4101: checking for -z noexecstack option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -z text option to ld""... $ac_c" 1>&6 -+echo "configure:4125: checking for -z text option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,text" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -z relro option to ld""... $ac_c" 1>&6 -+echo "configure:4149: checking for -z relro option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,relro" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -z nocopyreloc option to ld""... $ac_c" 1>&6 -+echo "configure:4173: checking for -z nocopyreloc option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-z,nocopyreloc" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for -Bsymbolic-functions option to ld""... $ac_c" 1>&6 -+echo "configure:4197: checking for -Bsymbolic-functions option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ echo $ac_n "checking for --build-id=sha1 option to ld""... $ac_c" 1>&6 -+echo "configure:4221: checking for --build-id=sha1 option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,--build-id=sha1" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ LDFLAGS=$_SAVE_LDFLAGS -+fi -+rm -f conftest* -+ -+ _DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT" -+ _USE_CPP_INCLUDE_FLAG=1 -+fi -+ -+if test "$GNU_CXX"; then -+ _DEFINES_CXXFLAGS="-DMOZILLA_CLIENT -include $jsconfdefs" -+ _USE_CPP_INCLUDE_FLAG=1 -+fi -+ -+case "$host" in -+*mingw*) -+ if test -n "$_WIN32_MSVC"; then -+ HOST_CFLAGS="$HOST_CFLAGS -nologo" -+ else -+ HOST_CFLAGS="$HOST_CFLAGS -mwindows" -+ fi -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN -DWIN32 -D_WIN32 -D_CRT_SECURE_NO_WARNINGS" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" -+ HOST_BIN_SUFFIX=.exe -+ -+ case "${host_cpu}" in -+ i*86) -+ if test -n "$_WIN32_MSVC"; then -+ HOST_LDFLAGS="$HOST_LDFLAGS -MACHINE:X86" -+ fi -+ ;; -+ x86_64) -+ if test -n "$_WIN32_MSVC"; then -+ HOST_LDFLAGS="$HOST_LDFLAGS -MACHINE:X64" -+ fi -+ HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" -+ ;; -+ esac -+ ;; -+ -+*-darwin*) -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ ;; -+ -+*-linux*|*-kfreebsd*-gnu|*-gnu*) -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ ;; -+ -+*) -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" -+ ;; -+esac -+ -+ -+CFLAGS="$CFLAGS $MOZ_HARDENING_CFLAGS_JS" -+CPPFLAGS="$CPPFLAGS $MOZ_HARDENING_CFLAGS_JS" -+CXXFLAGS="$CXXFLAGS $MOZ_HARDENING_CFLAGS_JS" -+LDFLAGS="$LDFLAGS $MOZ_HARDENING_LDFLAGS_JS" -+ -+ -+case "$target" in -+*-darwin*) -+ MOZ_OPTIMIZE_FLAGS="-O3" -+ CFLAGS="$CFLAGS -fno-common" -+ CXXFLAGS="$CXXFLAGS -fno-common -stdlib=libc++" -+ DSO_LDOPTS='' -+ STRIP="$STRIP -x -S" -+ LDFLAGS="$LDFLAGS -lobjc" -+ # The ExceptionHandling framework is needed for Objective-C exception -+ # logging code in nsObjCExceptions.h. Currently we only use that in debug -+ # builds. -+ _SAVE_LDFLAGS=$LDFLAGS -+ echo $ac_n "checking for -framework ExceptionHandling""... $ac_c" 1>&6 -+echo "configure:4315: checking for -framework ExceptionHandling" >&5 -+ LDFLAGS="$LDFLAGS -framework ExceptionHandling" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_have_framework_exceptionhandling="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_have_framework_exceptionhandling="no" -+fi -+rm -f conftest* -+ echo "$ac_t""$ac_cv_have_framework_exceptionhandling" 1>&6 -+ if test "$ac_cv_have_framework_exceptionhandling" = "yes"; then -+ MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"; -+ fi -+ LDFLAGS=$_SAVE_LDFLAGS -+ -+ if test "x$enable_dtrace" = "xyes"; then -+ 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:4345: checking for -dead_strip option to ld" >&5 -+ _SAVE_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -Wl,-dead_strip" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ _HAVE_DEAD_STRIP=1 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _HAVE_DEAD_STRIP= -+fi -+rm -f conftest* -+ if test -n "$_HAVE_DEAD_STRIP" ; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip" -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ LDFLAGS=$_SAVE_LDFLAGS -+ fi -+ MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin" -+ ;; -+ -+*-android*|*-linuxandroid*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' NO_PW_GECOS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define NO_PW_GECOS 1 -+EOF -+ -+ MOZ_GFX_OPTIMIZE_MOBILE=1 -+ MOZ_OPTIMIZE_FLAGS="-O3" -+ if test -z "$CLANG_CC"; then -+ MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS" -+ fi -+ ;; -+ -+*-*linux*) -+ if test "$GNU_CC" -o "$GNU_CXX"; then -+ MOZ_PGO_OPTIMIZE_FLAGS="-O3" -+ MOZ_OPTIMIZE_FLAGS="-O3" -+ if test -z "$CLANG_CC"; then -+ MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS" -+ fi -+ fi -+ -+ case "${target_cpu}" in -+ alpha*) -+ CFLAGS="$CFLAGS -mieee" -+ CXXFLAGS="$CXXFLAGS -mieee" -+ ;; -+ esac -+ ;; -+ -+*-mingw*) -+ DSO_CFLAGS= -+ DSO_PIC_CFLAGS= -+ if test -n "$GNU_CC" -o -n "$CLANG_CC"; then -+ CC="$CC -mwindows" -+ CXX="$CXX -mwindows" -+ CPP="$CPP -mwindows" -+ CFLAGS="$CFLAGS -mms-bitfields" -+ CXXFLAGS="$CXXFLAGS -mms-bitfields" -+ DSO_LDOPTS='-shared' -+ # Use temp file for windres (bug 213281) -+ RCFLAGS='-O coff --use-temp-file' -+ # mingw doesn't require kernel32, user32, and advapi32 explicitly -+ LIBS="$LIBS -lusp10 -lgdi32 -lwinmm -lwsock32" -+ MOZ_FIX_LINK_PATHS= -+ -+ if test -z "$CLANG_CC"; then -+ # Use static libgcc and libstdc++ -+ LDFLAGS="$LDFLAGS -static" -+ else -+ # Silence problematic clang warnings -+ CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct" -+ fi -+ -+ MOZ_OPTIMIZE_FLAGS="-O2" -+ -+ WIN32_CONSOLE_EXE_LDFLAGS=-mconsole -+ WIN32_GUI_EXE_LDFLAGS=-mwindows -+ else -+ TARGET_COMPILER_ABI=msvc -+ HOST_CC='$(CC)' -+ HOST_CXX='$(CXX)' -+ RANLIB='echo not_ranlib' -+ STRIP='echo not_strip' -+ PKG_SKIP_STRIP=1 -+ # aarch64 doesn't support subsystems below 6.02 -+ if test "$CPU_ARCH" = "aarch64"; then -+ WIN32_SUBSYSTEM_VERSION=6.02 -+ else -+ WIN32_SUBSYSTEM_VERSION=6.01 -+ fi -+ WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION -+ WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION -+ DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION -+ _USE_CPP_INCLUDE_FLAG=1 -+ _DEFINES_CFLAGS="-FI $jsconfdefs -DMOZILLA_CLIENT" -+ _DEFINES_CXXFLAGS="-FI $jsconfdefs -DMOZILLA_CLIENT" -+ CFLAGS="$CFLAGS -W3 -Gy -Zc:inline" -+ CXXFLAGS="$CXXFLAGS -W3 -Gy -Zc:inline" -+ if test "$CPU_ARCH" = "x86";then -+ -+ if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then -+ CFLAGS="$CFLAGS -arch:SSE2" -+ fi -+ if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then -+ CXXFLAGS="$CXXFLAGS -arch:SSE2" -+ fi -+ -+ fi -+ if test -z "$MOZ_ASAN"; then -+ CFLAGS="$CFLAGS -Gw" -+ CXXFLAGS="$CXXFLAGS -Gw" -+ else -+ # String tail merging doesn't play nice with ASan's ODR checker. -+ LDFLAGS="$LDFLAGS -opt:nolldtailmerge" -+ fi -+ if test -n "$CLANG_CL"; then -+ # XXX We should combine some of these with our generic GCC-style -+ # warning checks. -+ # -+ # Suppress the clang-cl warning for the inline 'new' and 'delete' in mozalloc -+ CXXFLAGS="$CXXFLAGS -Wno-inline-new-delete" -+ # We use offsetof on non-POD objects all the time. -+ # We also suppress this warning on other platforms. -+ CXXFLAGS="$CXXFLAGS -Wno-invalid-offsetof" -+ # This warns for reasonable things like: -+ # enum { X = 0xffffffffU }; -+ # which is annoying for IDL headers. -+ CXXFLAGS="$CXXFLAGS -Wno-microsoft-enum-value" -+ # This warns for cases that would be reached by the Microsoft -+ # #include rules, but also currently warns on cases that would -+ # *also* be reached by standard C++ include rules. That -+ # behavior doesn't seem useful, so we turn it off. -+ CXXFLAGS="$CXXFLAGS -Wno-microsoft-include" -+ # We normally error out on unknown pragmas, but since clang-cl -+ # claims to be MSVC, it would be difficult to add -+ # #if defined(_MSC_VER) && !defined(__clang__) everywhere we -+ # use such pragmas, so just ignore them. -+ CFLAGS="$CFLAGS -Wno-unknown-pragmas" -+ CXXFLAGS="$CXXFLAGS -Wno-unknown-pragmas" -+ # We get errors about various #pragma intrinsic directives from -+ # clang-cl, and we don't need to hear about those. -+ CFLAGS="$CFLAGS -Wno-ignored-pragmas" -+ CXXFLAGS="$CXXFLAGS -Wno-ignored-pragmas" -+ # clang-cl's Intrin.h marks things like _ReadWriteBarrier -+ # as __attribute((__deprecated__)). This is nice to know, -+ # but since we don't get the equivalent warning from MSVC, -+ # let's just ignore it. -+ CFLAGS="$CFLAGS -Wno-deprecated-declarations" -+ CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations" -+ # We use a function like: -+ # __declspec(noreturn) __inline void f() {} -+ # which -Winvalid-noreturn complains about. Again, MSVC seems -+ # OK with it, so let's silence the warning. -+ CFLAGS="$CFLAGS -Wno-invalid-noreturn" -+ CXXFLAGS="$CXXFLAGS -Wno-invalid-noreturn" -+ # Missing |override| on virtual function declarations isn't -+ # something that MSVC currently warns about. -+ CXXFLAGS="$CXXFLAGS -Wno-inconsistent-missing-override" -+ # We use -DHAS_EXCEPTIONS=0, which removes the |throw()| -+ # declaration on |operator delete(void*)|. However, clang-cl -+ # must internally declare |operator delete(void*)| differently, -+ # which causes this warning for virtually every file in the -+ # tree. clang-cl doesn't support -fno-exceptions or equivalent, -+ # so there doesn't seem to be any way to convince clang-cl to -+ # declare |delete| differently. Therefore, suppress this -+ # warning. -+ CXXFLAGS="$CXXFLAGS -Wno-implicit-exception-spec-mismatch" -+ # At least one MSVC header and several headers in-tree have -+ # unused typedefs, so turn this on. -+ CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef" -+ # jemalloc uses __declspec(allocator) as a profiler hint, -+ # which clang-cl doesn't understand. -+ CXXFLAGS="$CXXFLAGS -Wno-ignored-attributes" -+ # __attribute__((unused)) really means "might be unused" and -+ # we use it to avoid warnings about things that are unused -+ # in some compilation units, but used in many others. This -+ # warning insists on complaining about the latter case, which -+ # is annoying, and rather noisy. -+ CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused" -+ fi -+ LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib" -+ MOZ_DEBUG_LDFLAGS='-DEBUG' -+ WARNINGS_AS_ERRORS='-WX' -+ MOZ_OPTIMIZE_FLAGS="-O2" -+ MOZ_FIX_LINK_PATHS= -+ LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE" -+ if test -z "$DEVELOPER_OPTIONS"; then -+ LDFLAGS="$LDFLAGS -RELEASE" -+ fi -+ RCFLAGS="-nologo" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE__MSIZE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE__MSIZE 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' WIN32_LEAN_AND_MEAN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define WIN32_LEAN_AND_MEAN 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' NOMINMAX ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define NOMINMAX 1 -+EOF -+ -+ BIN_SUFFIX='.exe' -+ MOZ_USER_DIR="Mozilla" -+ -+ case "$host_os" in -+ cygwin*|msvc*|mks*) -+ { echo "configure: error: Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites." 1>&2; echo "configure: error: Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites." 1>&5; exit 1; } -+ ;; -+ esac -+ -+ if test -n "$GNU_CC" -a -z "$CLANG_CC"; then -+ CFLAGS="$CFLAGS -fno-keep-inline-dllexport" -+ CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport" -+ fi -+ -+ case "$target" in -+ i*86-*) -+ if test -n "$GNU_CC"; then -+ CFLAGS="$CFLAGS -mstackrealign" -+ CXXFLAGS="$CXXFLAGS -mstackrealign" -+ LDFLAGS="$LDFLAGS -Wl,--large-address-aware" -+ else -+ DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86" -+ LDFLAGS="$LDFLAGS -SAFESEH" -+ fi -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _X86_ ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _X86_ 1 -+EOF -+ -+ ;; -+ x86_64-*) -+ if test -n "$_WIN32_MSVC"; then -+ DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X64" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' _AMD64_ ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _AMD64_ 1 -+EOF -+ -+ ;; -+ aarch64-*) -+ if test -n "$_WIN32_MSVC"; then -+ DSO_LDOPTS="$DSO_LDOPTS -MACHINE:ARM64" -+ fi -+ cat >> confdefs.pytmp <<\EOF -+ (''' _ARM64_ ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _ARM64_ 1 -+EOF -+ -+ ;; -+ *) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _CPU_ARCH_NOT_DEFINED ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _CPU_ARCH_NOT_DEFINED 1 -+EOF -+ -+ ;; -+ esac -+ ;; -+ -+*-netbsd*) -+ DSO_CFLAGS='' -+ CFLAGS="$CFLAGS -Dunix" -+ CXXFLAGS="$CXXFLAGS -Dunix" -+ if $CC -E - -dM /dev/null; then -+ DSO_PIC_CFLAGS='-fPIC -DPIC' -+ DSO_LDOPTS='-shared' -+ MOZ_PROGRAM_LDFLAGS="$MOZ_PROGRAM_LDFLAGS -Wl,--export-dynamic" -+ else -+ DSO_PIC_CFLAGS='-fPIC -DPIC' -+ DSO_LDOPTS='-shared' -+ fi -+ # This will fail on a.out systems prior to 1.5.1_ALPHA. -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi -+ ;; -+ -+*-openbsd*) -+ DSO_CFLAGS='' -+ DSO_PIC_CFLAGS='-fPIC' -+ DSO_LDOPTS='-shared -fPIC' -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" -+ fi -+ ;; -+ -+*-solaris*) -+ MOZ_FIX_LINK_PATHS="-L${DIST}/bin" -+ ;; -+ -+esac -+ -+if test -z "$MOZ_OPTIMIZE_FLAGS"; then -+ MOZ_OPTIMIZE_FLAGS="-O" -+fi -+ -+if test -z "$COMPILE_ENVIRONMENT"; then -+ SKIP_COMPILER_CHECKS=1 -+ SKIP_LIBRARY_CHECKS=1 -+fi -+ -+if test -n "$COMPILE_ENVIRONMENT"; then -+ -+ -+ -+if test -z "$MOZ_DEBUG" -o -n "$MOZ_ASAN"; then -+ MOZ_NO_DEBUG_RTL=1 -+fi -+ -+ -+ -+MOZ_DEBUG_ENABLE_DEFS="DEBUG" -+# Check whether --with-debug-label or --without-debug-label was given. -+if test "${with_debug_label+set}" = set; then -+ withval="$with_debug_label" -+ for option in `echo $withval | sed 's/,/ /g'`; do -+ MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS DEBUG_${option}" -+done -+fi -+ -+ -+if test -n "$MOZ_DEBUG"; then -+ if test -n "$COMPILE_ENVIRONMENT"; then -+ echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -+echo "configure:4707: checking for valid debug flags" >&5 -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" -+ cat > conftest.$ac_ext < -+int main() { -+printf("Hello World\n"); -+; return 0; } -+EOF -+if { (eval echo configure:4718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ _results=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _results=no -+fi -+rm -f conftest* -+ echo "$ac_t""$_results" 1>&6 -+ if test "$_results" = "no"; then -+ { echo "configure: error: These compiler flags are invalid: $MOZ_DEBUG_FLAGS" 1>&2; echo "configure: error: These compiler flags are invalid: $MOZ_DEBUG_FLAGS" 1>&5; exit 1; } -+ fi -+ CFLAGS=$_SAVE_CFLAGS -+ fi -+ -+ MOZ_DEBUG_DEFINES="$MOZ_DEBUG_ENABLE_DEFS" -+else -+ MOZ_DEBUG_DEFINES="NDEBUG TRIMMED" -+fi -+ -+ -+ -+ -+ -+# Check whether --enable-cpp-rtti or --disable-cpp-rtti was given. -+if test "${enable_cpp_rtti+set}" = set; then -+ enableval="$enable_cpp_rtti" -+ if test "$enableval" = "yes"; then -+ _MOZ_USE_RTTI=1 -+ elif test "$enableval" = "no"; then -+ _MOZ_USE_RTTI= -+ else -+ { echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test -z "$_MOZ_USE_RTTI"; then -+ if test "$GNU_CC"; then -+ CXXFLAGS="$CXXFLAGS -fno-rtti" -+ else -+ case "$target" in -+ *-mingw*) -+ CXXFLAGS="$CXXFLAGS -GR-" -+ esac -+ fi -+fi -+ -+if test "$CLANG_CXX"; then -+ ## We disable return-type-c-linkage because jsval is defined as a C++ type but is -+ ## returned by C functions. This is possible because we use knowledge about the ABI -+ ## to typedef it to a C type with the same layout when the headers are included -+ ## from C. -+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-unknown-warning-option -Wno-return-type-c-linkage" -+fi -+ -+if test "$GNU_CC"; then -+ if test -z "$DEVELOPER_OPTIONS"; then -+ CFLAGS="$CFLAGS -ffunction-sections -fdata-sections" -+ CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections" -+ fi -+ -+ # For MinGW, we need big-obj otherwise we create too many sections in Unified builds -+ if test "${OS_ARCH}" = "WINNT"; then -+ CFLAGS="$CFLAGS -Wa,-mbig-obj" -+ CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj" -+ fi -+ -+ CFLAGS="$CFLAGS -fno-math-errno" -+ CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno" -+fi -+ -+ -+# Check whether --enable-icf or --disable-icf was given. -+if test "${enable_icf+set}" = set; then -+ enableval="$enable_icf" -+ if test "$enableval" = "no"; then -+ MOZ_DISABLE_ICF=1 -+ elif test "$enableval" = "yes"; then -+ MOZ_DISABLE_ICF= -+ else -+ { echo "configure: error: Option, icf, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, icf, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF" -a -z "$DEVELOPER_OPTIONS"; then -+ echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 -+echo "configure:4808: 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 -+ echo 'int foo() {return 42;}' \ -+ 'int bar() {return 42;}' \ -+ '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:4817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ test -s conftest${ac_exeext} && -+ $LLVM_OBJDUMP -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then -+ LD_SUPPORTS_ICF=yes -+ else -+ LD_SUPPORTS_ICF=no -+ fi -+ rm -rf conftest* -+fi -+ -+echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6 -+ if test "$LD_SUPPORTS_ICF" = yes; then -+ _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe" -+ LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ LD_PRINT_ICF_SECTIONS= -+fi -+rm -f conftest* -+ -+ LDFLAGS="$_SAVE_LDFLAGS" -+ fi -+fi -+ -+ -+if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS"; then -+ if test -n "$MOZ_DEBUG_FLAGS"; then -+ echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 -+echo "configure:4858: 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:4865: \"$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:4866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && -+ test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then -+ if test "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest.${ac_objext} conftest.${ac_ext}`" = \ -+ "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest${ac_exeext} conftest.${ac_ext}`"; then -+ GC_SECTIONS_BREAKS_DEBUG_RANGES=no -+ else -+ GC_SECTIONS_BREAKS_DEBUG_RANGES=yes -+ fi -+ else -+ GC_SECTIONS_BREAKS_DEBUG_RANGES="no, but it's broken in some other way" -+ fi -+ rm -rf conftest* -+fi -+ -+echo "$ac_t""$GC_SECTIONS_BREAKS_DEBUG_RANGES" 1>&6 -+ if test "$GC_SECTIONS_BREAKS_DEBUG_RANGES" = no; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections" -+ fi -+ else -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections" -+ fi -+fi -+ -+if test "$GNU_CC$CLANG_CC"; then -+ MOZ_PROGRAM_LDFLAGS="$MOZ_PROGRAM_LDFLAGS -pie" -+fi -+ -+ -+ -+if test -n "$GCC_USE_GNU_LD"; then -+ case "$LDFLAGS" in -+ *-fsanitize=address*) -+ LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" -+ ;; -+ esac -+fi -+ -+ -+fi -+ -+if test -z "$SKIP_COMPILER_CHECKS"; then -+echo $ac_n "checking for working const""... $ac_c" 1>&6 -+echo "configure:4908: 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 <j = 5; -+} -+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+} -+ -+; return 0; } -+EOF -+if { (eval echo configure:4962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_c_const=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_const=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_c_const" 1>&6 -+if test $ac_cv_c_const = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' const ''', r''' ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define const -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -+echo "configure:4988: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_mode_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_mode_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -+if test $ac_cv_type_mode_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' mode_t ''', r''' int ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define mode_t int -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for off_t""... $ac_c" 1>&6 -+echo "configure:5026: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_off_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_off_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_off_t" 1>&6 -+if test $ac_cv_type_off_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' off_t ''', r''' long ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define off_t long -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -+echo "configure:5064: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_pid_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_pid_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -+if test $ac_cv_type_pid_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' pid_t ''', r''' int ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define pid_t int -+EOF -+ -+fi -+ -+ -+ -+echo $ac_n "checking for size_t""... $ac_c" 1>&6 -+echo "configure:5102: 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 < -+#if STDC_HEADERS -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_size_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_size_t=no -+fi -+rm -f conftest* -+ -+fi -+echo "$ac_t""$ac_cv_type_size_t" 1>&6 -+if test $ac_cv_type_size_t = no; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' size_t ''', r''' unsigned ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define size_t unsigned -+EOF -+ -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -+echo "configure:5160: 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 < -+ #include -+int main() { -+ssize_t foo = 0; -+; return 0; } -+EOF -+if { (eval echo configure:5173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_type_ssize_t=true -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_type_ssize_t=false -+fi -+rm -f conftest* -+fi -+ -+if test "$ac_cv_type_ssize_t" = true ; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_SSIZE_T ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_SSIZE_T 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+if test "$GNU_CXX"; then -+ echo $ac_n "checking whether 64-bits std::atomic requires -latomic""... $ac_c" 1>&6 -+echo "configure:5224: checking whether 64-bits std::atomic requires -latomic" >&5 -+if eval "test \"`echo '$''{'ac_cv_needs_atomic'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$CC_TYPE" = "clang" -a "$CPU_ARCH" = "x86" -a "$OS_ARCH" = "Linux"; then -+ ac_cv_needs_atomic=yes -+ else -+ cat > conftest.$ac_ext < -+ #include -+int main() { -+ std::atomic foo; foo = 1; -+; return 0; } -+EOF -+if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_needs_atomic=no -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _SAVE_LIBS="$LIBS" -+ LIBS="$LIBS -latomic" -+ cat > conftest.$ac_ext < -+ #include -+int main() { -+ std::atomic foo; foo = 1; -+; return 0; } -+EOF -+if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_needs_atomic=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_needs_atomic="do not know; assuming no" -+fi -+rm -f conftest* -+ LIBS="$_SAVE_LIBS" -+ -+fi -+rm -f conftest* -+ fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_needs_atomic" 1>&6 -+ if test "$ac_cv_needs_atomic" = yes; then -+ MOZ_NEEDS_LIBATOMIC=1 -+ else -+ MOZ_NEEDS_LIBATOMIC= -+ fi -+ -+fi -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+case "${OS_TARGET}" in -+WINNT|Darwin|Android) -+ ;; -+*) -+ STL_FLAGS="-I${DIST}/stl_wrappers" -+ WRAP_STL_INCLUDES=1 -+ ;; -+esac -+ -+ac_header_dirent=no -+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:5311: 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 < -+#include <$ac_hdr> -+int main() { -+DIR *dirp = 0; -+; return 0; } -+EOF -+if { (eval echo configure:5324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_dirent_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_dirent_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+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:5352: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldir $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LIBS="$LIBS -ldir" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+else -+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -+echo "configure:5393: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lx $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LIBS="$LIBS -lx" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+fi -+ -+case "$target_os" in -+freebsd*) -+# for stuff like -lXshm -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; -+esac -+ -+# Check whether --enable-dtrace or --disable-dtrace was given. -+if test "${enable_dtrace+set}" = set; then -+ enableval="$enable_dtrace" -+ if test "$enableval" = "yes"; then -+ enable_dtrace="yes" -+ elif test "$enableval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+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:5456: 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 < -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:5469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+ -+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ HAVE_DTRACE=1 -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ if test -n "$HAVE_DTRACE"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' INCLUDE_MOZILLA_DTRACE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define INCLUDE_MOZILLA_DTRACE 1 -+EOF -+ -+ else -+ { echo "configure: error: dtrace enabled but sys/sdt.h not found" 1>&2; echo "configure: error: dtrace enabled but sys/sdt.h not found" 1>&5; exit 1; }; -+ fi -+fi -+ -+ -+echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -+echo "configure:5504: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc_r $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+ -+case $target in -+*-darwin*) -+ ;; -+*) -+ -+echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -+echo "configure:5560: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_search_dlopen="none required" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_search_dlopen="-l$i" -+break -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+rm -f conftest* -+done -+LIBS="$ac_func_search_save_LIBS" -+fi -+ -+echo "$ac_t""$ac_cv_search_dlopen" 1>&6 -+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:5618: 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 < -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:5631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+ -+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_DLOPEN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_DLOPEN 1 -+EOF -+ -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+else : -+ -+fi -+ ;; -+esac -+ -+if test ! "$GNU_CXX"; then -+ echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -+echo "configure:5665: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lC $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo C | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+fi -+ -+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -+echo "configure:5717: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+ -+case "$target_os" in -+darwin*) -+ USE_PTHREADS=1 -+ ;; -+*) -+ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -+echo "configure:5773: checking for pthread_create in -lpthreads" >&5 -+ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lpthreads $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads" -+else -+ echo "$ac_t""no" 1>&6 -+echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -+echo "configure:5811: checking for pthread_create in -lpthread" >&5 -+ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lpthread $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" -+else -+ echo "$ac_t""no" 1>&6 -+echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -+echo "configure:5849: checking for pthread_create in -lc_r" >&5 -+ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc_r $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r" -+else -+ echo "$ac_t""no" 1>&6 -+echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -+echo "configure:5887: checking for pthread_create in -lc" >&5 -+ac_lib_var=`echo c'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ USE_PTHREADS=1 -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ ;; -+esac -+ -+if test "$USE_PTHREADS"x != x -+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:5944: 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 -+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then -+ ac_cv_have_dash_pthread=yes -+ case "$target_os" in -+ freebsd*) -+# Freebsd doesn't use -pthread for compiles, it uses them for linking -+ ;; -+ *) -+ CFLAGS="$CFLAGS -pthread" -+ CXXFLAGS="$CXXFLAGS -pthread" -+ ;; -+ esac -+ fi -+ fi -+ rm -f conftest* -+ echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6 -+ -+ 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:5967: 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 -+ if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" -a -z "`egrep -i '(error|incorrect)' conftest.out`" ; then -+ ac_cv_have_dash_pthreads=yes -+ CFLAGS="$CFLAGS -pthreads" -+ CXXFLAGS="$CXXFLAGS -pthreads" -+ fi -+ fi -+ rm -f conftest* -+ echo "$ac_t""$ac_cv_have_dash_pthreads" 1>&6 -+ fi -+ -+ case "$target" in -+ *-*-freebsd*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _REENTRANT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _REENTRANT 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _THREAD_SAFE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _THREAD_SAFE 1 -+EOF -+ -+ if test "$ac_cv_have_dash_pthread" = "yes"; then -+ _PTHREAD_LDFLAGS="-pthread" -+ fi -+ ;; -+ -+ *-*-openbsd*|*-*-bsdi*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _REENTRANT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _REENTRANT 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' _THREAD_SAFE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _THREAD_SAFE 1 -+EOF -+ -+ if test "$ac_cv_have_dash_pthread" = "yes"; then -+ _PTHREAD_LDFLAGS="-pthread" -+ fi -+ ;; -+ -+ *-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*) -+ cat >> confdefs.pytmp <<\EOF -+ (''' _REENTRANT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define _REENTRANT 1 -+EOF -+ -+ ;; -+ -+ esac -+ LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}" -+fi -+ -+ -+for ac_func in getc_unlocked _getc_nolock gmtime_r localtime_r pthread_getname_np pthread_get_name_np -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:6040: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:6072: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+ -+echo $ac_n "checking for clock_gettime(CLOCK_MONOTONIC)""... $ac_c" 1>&6 -+echo "configure:6101: checking for clock_gettime(CLOCK_MONOTONIC)" >&5 -+if eval "test \"`echo '$''{'ac_cv_clock_monotonic'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ for libs in "" -lrt; do -+ _SAVE_LIBS="$LIBS" -+ _SAVE_CFLAGS="$CFLAGS" -+ LIBS="$LIBS $libs" -+ CFLAGS="$CFLAGS $DSO_PIC_CFLAGS" -+ cat > conftest.$ac_ext < -+int main() { -+ struct timespec ts; -+ clock_gettime(CLOCK_MONOTONIC, &ts); -+; return 0; } -+EOF -+if { (eval echo configure:6120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_clock_monotonic=$libs -+ LIBS="$_SAVE_LIBS" -+ break -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_clock_monotonic=no -+fi -+rm -f conftest* -+ LIBS="$_SAVE_LIBS" -+ CFLAGS="$_SAVE_CFLAGS" -+ done -+fi -+ -+echo "$ac_t""$ac_cv_clock_monotonic" 1>&6 -+if test "$ac_cv_clock_monotonic" != "no"; then -+ HAVE_CLOCK_MONOTONIC=1 -+ REALTIME_LIBS=$ac_cv_clock_monotonic -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_CLOCK_MONOTONIC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_CLOCK_MONOTONIC 1 -+EOF -+ -+ -+ -+fi -+ -+echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -+echo "configure:6153: checking for sin in -lm" >&5 -+ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lm $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+ -+echo $ac_n "checking for sincos in -lm""... $ac_c" 1>&6 -+echo "configure:6203: checking for sincos in -lm" >&5 -+ac_lib_var=`echo m'_'sincos | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lm $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_SINCOS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_SINCOS 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+echo $ac_n "checking for __sincos in -lm""... $ac_c" 1>&6 -+echo "configure:6249: checking for __sincos in -lm" >&5 -+ac_lib_var=`echo m'_'__sincos | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lm $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE___SINCOS ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE___SINCOS 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -+echo "configure:6296: 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 -+ if test "$OS_TARGET" = NetBSD -o "$OS_TARGET" = OpenBSD; then -+ ac_cv_func_res_ninit=no -+ else -+ cat > conftest.$ac_ext < -+ #include -+ #include -+ #include -+ -+int main() { -+int foo = res_ninit(&_res); -+; return 0; } -+EOF -+if { (eval echo configure:6319: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_func_res_ninit=no -+fi -+rm -f conftest* -+ fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_func_res_ninit" 1>&6 -+ -+if test "$ac_cv_func_res_ninit" = "yes"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_RES_NINIT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_RES_NINIT 1 -+EOF -+ -+fi -+ -+ -+ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -+echo "configure:6347: checking for nl_langinfo and CODESET" >&5 -+if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+int main() { -+char* cs = nl_langinfo(CODESET); -+; return 0; } -+EOF -+if { (eval echo configure:6359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ am_cv_langinfo_codeset=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ am_cv_langinfo_codeset=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 -+ if test $am_cv_langinfo_codeset = yes; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_LANGINFO_CODESET ''', r''' 1 ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_LANGINFO_CODESET 1 -+EOF -+ -+ HAVE_LANGINFO_CODESET=1 -+ fi -+ -+ -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -+echo "configure:6399: 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 -+ cat > conftest.$ac_ext < -+ #include -+ void f (int i, ...) { -+ va_list args1, args2; -+ va_start (args1, i); -+ va_copy (args2, args1); -+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) -+ exit (1); -+ va_end (args1); va_end (args2); -+ } -+int main() { -+f(0, 42); return 0 -+; return 0; } -+EOF -+if { (eval echo configure:6420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_va_copy=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_va_copy=no -+ -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_va_copy" 1>&6 -+echo $ac_n "checking whether va_list can be copied by value""... $ac_c" 1>&6 -+echo "configure:6436: checking whether va_list 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 -+ cat > conftest.$ac_ext < -+ #include -+ void f (int i, ...) { -+ va_list args1, args2; -+ va_start (args1, i); -+ args2 = args1; -+ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) -+ exit (1); -+ va_end (args1); va_end (args2); -+ } -+int main() { -+f(0, 42); return 0 -+; return 0; } -+EOF -+if { (eval echo configure:6457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_va_val_copy=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_va_val_copy=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_va_val_copy" 1>&6 -+if test "x$ac_cv_va_copy" = "xyes"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' VA_COPY ''', r''' va_copy ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define VA_COPY va_copy -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VA_COPY ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VA_COPY 1 -+EOF -+ -+fi -+ -+if test "x$ac_cv_va_val_copy" = "xno"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VA_LIST_AS_ARRAY ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VA_LIST_AS_ARRAY 1 -+EOF -+ -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+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:6514: 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 <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_gcc_arm_eabi="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_gcc_arm_eabi="no" -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 -+ if test "$ac_cv_gcc_arm_eabi" = "yes"; then -+ HAVE_ARM_EABI=1 -+ ARM_ABI_PREFIX=eabi- -+ else -+ ARM_ABI_PREFIX=oabi- -+ fi -+ fi -+ -+ TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-${ARM_ABI_PREFIX}gcc3}" -+fi -+ -+# try harder, when checking for __thread support, see bug 521750 comment #33 and below -+# We pass MOZ_OPTIMIZE_LDFLAGS to the linker because if dead_strip is -+# enabled, the linker in xcode 4.1 will crash. Without this it would crash when -+# linking XUL. -+_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:6563: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ ac_cv_thread_keyword=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_thread_keyword=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_thread_keyword" 1>&6 -+LDFLAGS=$_SAVE_LDFLAGS -+if test "$ac_cv_thread_keyword" = yes; then -+ # mips builds fail with TLS variables because of a binutils bug. -+ # See bug 528687 -+ case "${target}" in -+ mips*-*) -+ : -+ ;; -+ *-android*|*-linuxandroid*) -+ : -+ ;; -+ *) -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_THREAD_TLS_KEYWORD ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_THREAD_TLS_KEYWORD 1 -+EOF -+ -+ ;; -+ esac -+fi -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+for ac_func in localeconv -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:6627: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:6659: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+fi # ! SKIP_COMPILER_CHECKS -+ -+TARGET_XPCOM_ABI= -+if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then -+ TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}" -+fi -+ -+ -+if test -n "$SKIP_COMPILER_CHECKS"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' MALLOC_H ''', r''' ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define MALLOC_H -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_FORCEINLINE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_FORCEINLINE 1 -+EOF -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_LOCALECONV ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_LOCALECONV 1 -+EOF -+ -+fi # SKIP_COMPILER_CHECKS -+ -+ -+# External Packages -+ -+ -+ -+ -+ -+ -+# Check whether --with-nspr-cflags or --without-nspr-cflags was given. -+if test "${with_nspr_cflags+set}" = set; then -+ withval="$with_nspr_cflags" -+ NSPR_CFLAGS=$withval -+fi -+ -+# Check whether --with-nspr-libs or --without-nspr-libs was given. -+if test "${with_nspr_libs+set}" = set; then -+ withval="$with_nspr_libs" -+ NSPR_LIBS=$withval -+fi -+ -+ -+ -+ # Check whether --enable-nspr-build or --disable-nspr-build was given. -+if test "${enable_nspr_build+set}" = set; then -+ enableval="$enable_nspr_build" -+ if test "$enableval" = "yes"; then -+ MOZ_BUILD_NSPR=1 -+ elif test "$enableval" = "no"; then -+ MOZ_BUILD_NSPR= -+ else -+ { echo "configure: error: Option, nspr-build, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, nspr-build, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+ -+if test "$MOZ_BUILD_APP" != js || test -n "$JS_STANDALONE"; then -+ _IS_OUTER_CONFIGURE=1 -+fi -+ -+# Check whether --with-system-nspr or --without-system-nspr was given. -+if test "${with_system_nspr+set}" = set; then -+ withval="$with_system_nspr" -+ if test "$withval" = "yes"; then -+ _USE_SYSTEM_NSPR=1 -+ elif test "$withval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+JS_POSIX_NSPR=unset -+ -+ if test -n "$JS_STANDALONE"; then -+ case "$target" in -+ *linux*|*darwin*|*dragonfly*|*freebsd*|*netbsd*|*openbsd*) -+ if test -z "$_HAS_NSPR"; then -+ JS_POSIX_NSPR_DEFAULT=1 -+ fi -+ ;; -+ esac -+ fi -+ -+ # Check whether --enable-posix-nspr-emulation or --disable-posix-nspr-emulation was given. -+if test "${enable_posix_nspr_emulation+set}" = set; then -+ enableval="$enable_posix_nspr_emulation" -+ if test "$enableval" = "yes"; then -+ JS_POSIX_NSPR=1 -+ elif test "$enableval" = "no"; then -+ JS_POSIX_NSPR= -+ else -+ { echo "configure: error: Option, posix-nspr-emulation, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, posix-nspr-emulation, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+ -+ -+echo $ac_n "checking NSPR selection""... $ac_c" 1>&6 -+echo "configure:6799: checking NSPR selection" >&5 -+nspr_opts= -+which_nspr=default -+if test -n "$_USE_SYSTEM_NSPR"; then -+ nspr_opts="x$nspr_opts" -+ which_nspr="system" -+fi -+if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then -+ nspr_opts="x$nspr_opts" -+ which_nspr="command-line" -+fi -+if test -n "$MOZ_BUILD_NSPR"; then -+ nspr_opts="x$nspr_opts" -+ which_nspr="source-tree" -+fi -+if test "$JS_POSIX_NSPR" = unset; then -+ JS_POSIX_NSPR= -+else -+ nspr_opts="x$nspr_opts" -+ which_nspr="posix-wrapper" -+fi -+ -+if test -z "$nspr_opts"; then -+ if test "$MOZ_BUILD_APP" != js; then -+ MOZ_BUILD_NSPR=1 -+ which_nspr="source-tree" -+ else -+ JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT" -+ if test -z "$JS_POSIX_NSPR"; then -+ MOZ_BUILD_NSPR=1 -+ which_nspr="source-tree" -+ else -+ which_nspr="posix-wrapper" -+ fi -+ fi -+fi -+ -+if test -z "$nspr_opts" || test "$nspr_opts" = x; then -+ echo "$ac_t""$which_nspr" 1>&6 -+else -+ { echo "configure: error: only one way of using NSPR may be selected. See 'configure --help'." 1>&2; echo "configure: error: only one way of using NSPR may be selected. See 'configure --help'." 1>&5; exit 1; } -+fi -+ -+ -+ -+if test "$MOZ_BUILD_APP" = js; then -+ if test "$JS_POSIX_NSPR" = 1; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' JS_POSIX_NSPR ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define JS_POSIX_NSPR 1 -+EOF -+ -+ fi -+ -+fi -+ -+# A (sub)configure invoked by the toplevel configure will always receive -+# --with-nspr-libs on the command line. It will never need to figure out -+# anything itself. -+if test -n "$_IS_OUTER_CONFIGURE"; then -+ -+if test -n "$_USE_SYSTEM_NSPR"; then -+ -+# Check whether --with-nspr-prefix or --without-nspr-prefix was given. -+if test "${with_nspr_prefix+set}" = set; then -+ withval="$with_nspr_prefix" -+ nspr_config_prefix="$withval" -+else -+ nspr_config_prefix="" -+fi -+ -+ -+# Check whether --with-nspr-exec-prefix or --without-nspr-exec-prefix was given. -+if test "${with_nspr_exec_prefix+set}" = set; then -+ withval="$with_nspr_exec_prefix" -+ nspr_config_exec_prefix="$withval" -+else -+ nspr_config_exec_prefix="" -+fi -+ -+ -+ if test -n "$nspr_config_exec_prefix"; then -+ nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix" -+ if test -z "$NSPR_CONFIG"; then -+ NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config -+ fi -+ fi -+ if test -n "$nspr_config_prefix"; then -+ nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix" -+ if test -z "$NSPR_CONFIG"; then -+ NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config -+ fi -+ fi -+ -+ unset ac_cv_path_NSPR_CONFIG -+ # 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:6899: 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 -+ case "$NSPR_CONFIG" in -+ /*) -+ ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_NSPR_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_NSPR_CONFIG" && ac_cv_path_NSPR_CONFIG="no" -+ ;; -+esac -+fi -+NSPR_CONFIG="$ac_cv_path_NSPR_CONFIG" -+if test -n "$NSPR_CONFIG"; then -+ echo "$ac_t""$NSPR_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ min_nspr_version=$NSPR_MINVER -+ echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 -+echo "configure:6934: checking for NSPR - version >= $min_nspr_version" >&5 -+ -+ no_nspr="" -+ if test "$NSPR_CONFIG" != "no"; then -+ NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` -+ NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` -+ NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version` -+ elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then -+ NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}" -+ NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}" -+ NSPR_VERSION_STRING="$NO_NSPR_CONFIG_SYSTEM_VERSION" -+ else -+ no_nspr="yes" -+ fi -+ -+ if test -z "$no_nspr"; then -+ nspr_config_major_version=`echo $NSPR_VERSION_STRING | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'` -+ nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'` -+ nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'` -+ if test -z "$nspr_config_micro_version"; then -+ nspr_config_micro_version="0" -+ fi -+ -+ min_nspr_major_version=`echo $min_nspr_version | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'` -+ min_nspr_minor_version=`echo $min_nspr_version | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'` -+ min_nspr_micro_version=`echo $min_nspr_version | \ -+ sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'` -+ if test -z "$min_nspr_micro_version"; then -+ min_nspr_micro_version="0" -+ fi -+ -+ if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then -+ no_nspr="yes" -+ elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" && -+ test "$nspr_config_minor_version" -lt "$min_nspr_minor_version"; then -+ no_nspr="yes" -+ elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" && -+ test "$nspr_config_minor_version" -eq "$min_nspr_minor_version" && -+ test "$nspr_config_micro_version" -lt "$min_nspr_micro_version"; then -+ no_nspr="yes" -+ fi -+ fi -+ -+ if test -z "$no_nspr"; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_SYSTEM_NSPR=1 -+ else -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: you do not have NSPR installed or your version is older than $NSPR_MINVER." 1>&2; echo "configure: error: you do not have NSPR installed or your version is older than $NSPR_MINVER." 1>&5; exit 1; } -+ fi -+ -+ -+ -+ -+ -+ -+fi -+ -+if test -n "$MOZ_SYSTEM_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $NSPR_CFLAGS" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it" 1>&2; echo "configure: error: system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: system NSPR does not support PR_UINT64 or including prtypes.h does not provide it" 1>&2; echo "configure: error: system NSPR does not support PR_UINT64 or including prtypes.h does not provide it" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ CFLAGS=$_SAVE_CFLAGS -+ NSPR_INCLUDE_DIR=`echo ${NSPR_CFLAGS} | sed -e 's/.*-I\([^ ]*\).*/\1/'` -+ NSPR_LIB_DIR=`echo ${NSPR_LIBS} | sed -e 's/.*-L\([^ ]*\).*/\1/'` -+elif test -z "$JS_POSIX_NSPR"; then -+ NSPR_INCLUDE_DIR="${DIST}/include/nspr" -+ NSPR_CFLAGS="-I${NSPR_INCLUDE_DIR}" -+ if test -n "$GNU_CC"; then -+ if test -n "$MOZ_FOLD_LIBS"; then -+ NSPR_LIB_DIR=${DIST}/lib -+ else -+ NSPR_LIB_DIR=${DIST}/bin -+ fi -+ NSPR_LIBS="-L${NSPR_LIB_DIR} -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}" -+ else -+ # NSS needs actual static libs to link to, and this is where they are. -+ NSPR_LIBS="${DIST}/lib/nspr${NSPR_VERSION}.lib ${DIST}/lib/plc${NSPR_VERSION}.lib ${DIST}/lib/plds${NSPR_VERSION}.lib " -+ NSPR_LIB_DIR="${DIST}/lib" -+ fi -+fi -+ -+ -+ -+ -+ -+PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr" -+if test -n "$MOZ_SYSTEM_NSPR"; then -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $NSPR_CFLAGS" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: system NSPR does not support PR_STATIC_ASSERT" 1>&2; echo "configure: error: system NSPR does not support PR_STATIC_ASSERT" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ CFLAGS=$_SAVE_CFLAGS -+ # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc -+ PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr >= $NSPR_MINVER" -+elif test -n "$JS_POSIX_NSPR"; then -+ PKGCONF_REQUIRES_PRIVATE= -+fi -+ -+ -+fi # _IS_OUTER_CONFIGURE -+ -+ -+ -+if test -n "$JS_STANDALONE"; then -+ ZLIB_DIR=yes -+fi -+ -+ -+ -+MOZZLIB=1.2.3 -+ -+# Check whether --with-system-zlib or --without-system-zlib was given. -+if test "${with_system_zlib+set}" = set; then -+ withval="$with_system_zlib" -+ ZLIB_DIR=$withval -+fi -+ -+ -+if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then -+ _SAVE_CFLAGS=$CFLAGS -+ _SAVE_LDFLAGS=$LDFLAGS -+ _SAVE_LIBS=$LIBS -+ -+ if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then -+ MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" -+ MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib" -+ CFLAGS="$MOZ_ZLIB_CFLAGS $CFLAGS" -+ LDFLAGS="$MOZ_ZLIB_LIBS $LDFLAGS" -+ fi -+ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then -+ MOZ_SYSTEM_ZLIB= -+ else -+ echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -+echo "configure:7127: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lz $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ MOZ_SYSTEM_ZLIB=1 MOZ_ZLIB_LIBS="$MOZ_ZLIB_LIBS -lz" -+else -+ echo "$ac_t""no" 1>&6 -+MOZ_SYSTEM_ZLIB= -+fi -+ -+ if test "$MOZ_SYSTEM_ZLIB" = 1; then -+ MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` -+ cat > conftest.$ac_ext < -+ #include -+ #include -+int main() { -+ #if ZLIB_VERNUM < $MOZZLIBNUM -+ #error "Insufficient zlib version ($MOZZLIBNUM required)." -+ #endif -+; return 0; } -+EOF -+if { (eval echo configure:7181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ MOZ_SYSTEM_ZLIB=1 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ { echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&2; echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&5; exit 1; } -+fi -+rm -f conftest* -+ fi -+ fi -+ CFLAGS=$_SAVE_CFLAGS -+ LDFLAGS=$_SAVE_LDFLAGS -+ LIBS=$_SAVE_LIBS -+fi -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ZLIB_IN_MOZGLUE"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' ZLIB_IN_MOZGLUE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define ZLIB_IN_MOZGLUE 1 -+EOF -+ -+fi -+ -+ -+ -+# Application -+ -+# Components and Features -+ -+# Individual module options -+ -+# Debugging and Optimizations -+ -+ -+# Use value from moz.configure if one is defined. Else use our computed -+# value. -+if test -n "${MOZ_CONFIGURE_OPTIMIZE_FLAGS}"; then -+ MOZ_OPTIMIZE_FLAGS=${MOZ_CONFIGURE_OPTIMIZE_FLAGS} -+fi -+ -+ -+ if test "$GNU_CC"; then -+ MOZ_ENABLE_FRAME_PTR="-fno-omit-frame-pointer -funwind-tables" -+ MOZ_DISABLE_FRAME_PTR="-fomit-frame-pointer -funwind-tables" -+ else -+ case "$target" in -+ aarch64-windows*) -+ if test "$CC_TYPE" = "clang-cl"; then -+ MOZ_ENABLE_FRAME_PTR="-Xclang -mdisable-fp-elim" -+ MOZ_DISABLE_FRAME_PTR="-Xclang -mdisable-fp-elim" -+ else -+ MOZ_ENABLE_FRAME_PTR="-Oy-" -+ MOZ_DISABLE_FRAME_PTR="-Oy" -+ fi -+ ;; -+ *-mingw32*) -+ MOZ_ENABLE_FRAME_PTR="-Oy-" -+ MOZ_DISABLE_FRAME_PTR="-Oy" -+ ;; -+ esac -+ fi -+ -+ # If we are debugging, profiling, using sanitizers, or on win32 we want a -+ # frame pointer. It is not required to enable frame pointers on AArch64 -+ # Windows, but we enable it for compatibility with ETW. -+ if test -z "$MOZ_OPTIMIZE" -o \ -+ -n "$MOZ_PROFILING" -o \ -+ -n "$MOZ_DEBUG" -o \ -+ -n "$MOZ_MSAN" -o \ -+ -n "$MOZ_ASAN" -o \ -+ -n "$MOZ_UBSAN" -o \ -+ "$OS_ARCH:$CPU_ARCH" = "WINNT:x86" -o \ -+ "$OS_ARCH:$CPU_ARCH" = "WINNT:aarch64"; then -+ MOZ_FRAMEPTR_FLAGS="$MOZ_ENABLE_FRAME_PTR" -+ else -+ MOZ_FRAMEPTR_FLAGS="$MOZ_DISABLE_FRAME_PTR" -+ 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:7273: checking for valid optimization flags" >&5 -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" -+ cat > conftest.$ac_ext < -+int main() { -+printf("Hello World\n"); -+; return 0; } -+EOF -+if { (eval echo configure:7284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ _results=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ _results=no -+fi -+rm -f conftest* -+ echo "$ac_t""$_results" 1>&6 -+ if test "$_results" = "no"; then -+ { echo "configure: error: These compiler flags are invalid: $MOZ_OPTIMIZE_FLAGS" 1>&2; echo "configure: error: These compiler flags are invalid: $MOZ_OPTIMIZE_FLAGS" 1>&5; exit 1; } -+ fi -+ CFLAGS=$_SAVE_CFLAGS -+ if test -n "$MOZ_LTO" -a -n "$CLANG_CC"; then -+ # When using llvm-based LTO, non numeric optimization levels are -+ # not supported by the linker, so force the linker to use -O2 ( -+ # which doesn't influence the level compilation units are actually -+ # compiled at). -+ case " $MOZ_OPTIMIZE_FLAGS " in -+ *\ -Os\ *|*\ -Oz\ *) -+ MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -O2" -+ ;; -+ esac -+ fi -+fi -+fi # COMPILE_ENVIRONMENT -+ -+ -+ -+ -+ -+ -+if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then -+ WARNINGS_AS_ERRORS='' -+fi -+ -+ -+if test "$JS_STANDALONE" -a -z "$MOZ_MEMORY"; then -+ MOZ_GLUE_IN_PROGRAM= -+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 -+fi -+ -+if test "$MOZ_MEMORY"; then -+ case "${target}" in -+ *-mingw*) -+ export MOZ_NO_DEBUG_RTL=1 -+ ;; -+ esac -+fi -+ -+ -+if test -n "$MOZ_INSTRUMENTS"; then -+ LIBS="$LIBS -framework CoreFoundation" -+fi -+ -+if test -n "$MOZ_DEBUG"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' JS_DEBUG ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define JS_DEBUG 1 -+EOF -+ -+fi -+ -+ -+if test -n "$COMPILE_ENVIRONMENT"; then -+ -+ -+if test -n "$ENABLE_CLANG_PLUGIN"; then -+ if test -z "${CLANG_CC}${CLANG_CL}"; then -+ { echo "configure: error: Can't use clang plugin without clang." 1>&2; echo "configure: error: Can't use clang plugin without clang." 1>&5; exit 1; } -+ fi -+ -+ echo $ac_n "checking for llvm-config""... $ac_c" 1>&6 -+echo "configure:7376: checking for llvm-config" >&5 -+ if test -z "$LLVMCONFIG"; then -+ if test -n "$CLANG_CL"; then -+ CXX_COMPILER="$(dirname "$CXX")/clang" -+ else -+ CXX_COMPILER="${CXX}" -+ fi -+ LLVMCONFIG=`$CXX_COMPILER -print-prog-name=llvm-config` -+ fi -+ -+ if test -z "$LLVMCONFIG"; then -+ LLVMCONFIG=`which llvm-config` -+ fi -+ -+ if test ! -x "$LLVMCONFIG"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&2; echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&5; exit 1; } -+ fi -+ -+ echo "$ac_t""$LLVMCONFIG" 1>&6 -+ -+ if test -z "$LLVMCONFIG"; then -+ { echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&2; echo "configure: error: Cannot find an llvm-config binary for building a clang plugin" 1>&5; exit 1; } -+ fi -+ LLVM_CXXFLAGS=`$LLVMCONFIG --cxxflags | sed -e 's/-isysroot [^ ]*//' -e 's/-gcc-toolchain [^ ]*//'` -+ -+ LLVM_LDFLAGS=`$LLVMCONFIG --ldflags | tr '\n' ' '` -+ -+ if test "${HOST_OS_ARCH}" = "Darwin"; then -+ CLANG_LDFLAGS="-Wl,-flat_namespace -Wl,-undefined,suppress" -+ CLANG_LDFLAGS="$CLANG_LDFLAGS `$LLVMCONFIG --prefix`/lib/libclangASTMatchers.a" -+ LLVM_LDFLAGS=`echo "$LLVM_LDFLAGS" | sed -E 's/-L[^ ]+\/clang\/lib//'` -+ elif test "${HOST_OS_ARCH}" = "WINNT"; then -+ CLANG_LDFLAGS="clangASTMatchers.lib clang.lib" -+ else -+ CLANG_LDFLAGS="-lclangASTMatchers" -+ fi -+ -+ if test -n "$CLANG_CL"; then -+ LLVM_REPLACE_CXXFLAGS='' -+ for arg in $LLVM_CXXFLAGS; do -+ arg=`echo "$arg"|sed -e 's/^\//-/' -e 's/\\\\/\//g'` -+ LLVM_REPLACE_CXXFLAGS="$LLVM_REPLACE_CXXFLAGS $arg" -+ done -+ LLVM_CXXFLAGS="$LLVM_REPLACE_CXXFLAGS" -+ -+ LLVM_REPLACE_LDFLAGS='' -+ for arg in $LLVM_LDFLAGS; do -+ arg=`echo "$arg"|sed -e 's/^\//-/' -e 's/\\\\/\//g'` -+ LLVM_REPLACE_LDFLAGS="$LLVM_REPLACE_LDFLAGS $arg" -+ done -+ LLVM_LDFLAGS="$LLVM_REPLACE_LDFLAGS" -+ -+ CLANG_REPLACE_LDFLAGS='' -+ for arg in $CLANG_LDFLAGS; do -+ arg=`echo "$arg"|sed -e 's/^\//-/' -e 's/\\\\/\//g'` -+ CLANG_REPLACE_LDFLAGS="$CLANG_REPLACE_LDFLAGS $arg" -+ done -+ CLANG_LDFLAGS="$CLANG_REPLACE_LDFLAGS" -+ fi -+ -+ echo $ac_n "checking for new ASTMatcher API""... $ac_c" 1>&6 -+echo "configure:7438: checking for new ASTMatcher API" >&5 -+if eval "test \"`echo '$''{'ac_cv_have_new_ASTMatcher_names'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ _SAVE_CXXFLAGS="$CXXFLAGS" -+ _SAVE_CPPFLAGS="$CPPFLAGS" -+ _SAVE_CXX="$CXX" -+ _SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -+ unset MACOSX_DEPLOYMENT_TARGET -+ CXXFLAGS="${LLVM_CXXFLAGS}" -+ CPPFLAGS="" -+ CXX="${HOST_CXX}" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_have_new_ASTMatcher_names="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_have_new_ASTMatcher_names="no" -+fi -+rm -f conftest* -+ CXX="$_SAVE_CXX" -+ CPPFLAGS="$_SAVE_CPPFLAGS" -+ CXXFLAGS="$_SAVE_CXXFLAGS" -+ export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET" -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+fi -+ -+echo "$ac_t""$ac_cv_have_new_ASTMatcher_names" 1>&6 -+ if test "$ac_cv_have_new_ASTMatcher_names" = "yes"; then -+ LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAVE_NEW_ASTMATCHER_NAMES" -+ fi -+ -+ echo $ac_n "checking for has with ignoringParenImpCasts""... $ac_c" 1>&6 -+echo "configure:7505: checking for has with ignoringParenImpCasts" >&5 -+if eval "test \"`echo '$''{'ac_cv_has_accepts_ignoringParenImpCasts'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ _SAVE_CXXFLAGS="$CXXFLAGS" -+ _SAVE_CPPFLAGS="$CPPFLAGS" -+ _SAVE_CXX="$CXX" -+ _SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -+ unset MACOSX_DEPLOYMENT_TARGET -+ CXXFLAGS="${LLVM_CXXFLAGS}" -+ CPPFLAGS="" -+ CXX="${HOST_CXX}" -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_has_accepts_ignoringParenImpCasts="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_has_accepts_ignoringParenImpCasts="no" -+fi -+rm -f conftest* -+ CXX="$_SAVE_CXX" -+ CPPFLAGS="$_SAVE_CPPFLAGS" -+ CXXFLAGS="$_SAVE_CXXFLAGS" -+ export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET" -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+fi -+ -+echo "$ac_t""$ac_cv_has_accepts_ignoringParenImpCasts" 1>&6 -+ if test "$ac_cv_has_accepts_ignoringParenImpCasts" = "yes"; then -+ LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAS_ACCEPTS_IGNORINGPARENIMPCASTS" -+ fi -+ -+ CLANG_PLUGIN_FLAGS="-Xclang -load -Xclang $CLANG_PLUGIN -Xclang -add-plugin -Xclang moz-check" -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_CLANG_PLUGIN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_CLANG_PLUGIN 1 -+EOF -+ -+fi -+ -+if test -n "$ENABLE_MOZSEARCH_PLUGIN"; then -+ if test -z "${ENABLE_CLANG_PLUGIN}"; then -+ { echo "configure: error: Can't use mozsearch plugin without --enable-clang-plugin." 1>&2; echo "configure: error: Can't use mozsearch plugin without --enable-clang-plugin." 1>&5; exit 1; } -+ fi -+ -+ OBJDIR="$(dirname $(dirname $(dirname $CLANG_PLUGIN)))" -+ -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -add-plugin -Xclang mozsearch-index" -+ -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -plugin-arg-mozsearch-index -Xclang $_topsrcdir" -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -plugin-arg-mozsearch-index -Xclang $OBJDIR/mozsearch_index" -+ CLANG_PLUGIN_FLAGS="$CLANG_PLUGIN_FLAGS -Xclang -plugin-arg-mozsearch-index -Xclang $OBJDIR" -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_MOZSEARCH_PLUGIN ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_MOZSEARCH_PLUGIN 1 -+EOF -+ -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+fi # COMPILE_ENVIRONMENT -+ -+ -+# Check whether --with-sixgill or --without-sixgill was given. -+if test "${with_sixgill+set}" = set; then -+ withval="$with_sixgill" -+ SIXGILL_PATH=$withval -+else -+ SIXGILL_PATH= -+fi -+ -+ -+if test -n "$SIXGILL_PATH"; then -+ if test ! -x "$SIXGILL_PATH/bin/xdbfind" || test ! -f "$SIXGILL_PATH/gcc/xgill.so" || test ! -x "$SIXGILL_PATH/scripts/wrap_gcc/g++"; then -+ { echo "configure: error: The sixgill plugin and binaries are not at the specified path." 1>&2; echo "configure: error: The sixgill plugin and binaries are not at the specified path." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+# Check whether --enable-strip or --disable-strip was given. -+if test "${enable_strip+set}" = set; then -+ enableval="$enable_strip" -+ if test "$enableval" = "yes"; then -+ ENABLE_STRIP=1 -+ elif test "$enableval" = "no"; then -+ ENABLE_STRIP= -+ else -+ { echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+# Check whether --enable-install-strip or --disable-install-strip was given. -+if test "${enable_install_strip+set}" = set; then -+ enableval="$enable_install_strip" -+ if test "$enableval" = "yes"; then -+ PKG_SKIP_STRIP= -+ elif test "$enableval" = "no"; then -+ PKG_SKIP_STRIP=1 -+ else -+ { echo "configure: error: Option, install-strip, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, install-strip, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+# Profiling and Instrumenting -+ -+if test -z "$SKIP_LIBRARY_CHECKS"; then -+ -+ ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ for ac_func in __cxa_demangle -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:7678: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:7713: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+HAVE_DEMANGLE= -+fi -+done -+ -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+fi -+ -+ -+# Check whether --with-jitreport-granularity or --without-jitreport-granularity was given. -+if test "${with_jitreport_granularity+set}" = set; then -+ withval="$with_jitreport_granularity" -+ JITREPORT_GRANULARITY=$withval -+else -+ JITREPORT_GRANULARITY=3 -+fi -+ -+ -+cat >> confdefs.pytmp <> confdefs.h <&6 -+echo "configure:7779: checking for -pipe support" >&5 -+if test -n "$GNU_CC" -a -n "$GNU_CXX"; then -+ CFLAGS="$CFLAGS -pipe" -+ CXXFLAGS="$CXXFLAGS -pipe" -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6 -+echo "configure:7801: 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 < -+int main() { -+struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1; -+; return 0; } -+EOF -+if { (eval echo configure:7813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_struct_tm_zone_tm_gmtoff="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_struct_tm_zone_tm_gmtoff="no" -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_struct_tm_zone_tm_gmtoff" 1>&6 -+if test "$ac_cv_struct_tm_zone_tm_gmtoff" = "yes" ; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_TM_ZONE_TM_GMTOFF ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_TM_ZONE_TM_GMTOFF 1 -+EOF -+ -+fi -+fi # ! SKIP_COMPILER_CHECKS -+ -+cat >> confdefs.pytmp <<\EOF -+ (''' CPP_THROW_NEW ''', r''' throw() ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define CPP_THROW_NEW throw() -+EOF -+ -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+if test "$CC_TYPE" = "clang-cl"; then -+ ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5' -+fi -+ -+ -+ -+ -+echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 -+echo "configure:7859: 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 $MOZ_LTO_CFLAGS $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:7864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then -+ echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list -+ if test "$CC_TYPE" = "clang-cl"; then -+ link="$LINKER -OUT:conftest${ac_exeext}" -+ else -+ link="${CC-cc} -o conftest${ac_exeext}" -+ fi -+ if { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:7871: \"$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='$link $MOZ_LTO_LDFLAGS $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:7875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ EXPAND_LIBS_LIST_STYLE=filelist -+ elif { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:7877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then -+ EXPAND_LIBS_LIST_STYLE=list -+ else -+ { echo "configure: error: Couldn't find one that works" 1>&2; echo "configure: error: Couldn't find one that works" 1>&5; exit 1; } -+ fi -+ fi -+ else -+ { echo "configure: error: couldn't compile a simple C file" 1>&2; echo "configure: error: couldn't compile a simple C file" 1>&5; exit 1; } -+ fi -+ rm -rf conftest* -+fi -+ -+echo "$ac_t""$EXPAND_LIBS_LIST_STYLE" 1>&6 -+ -+ -+ -+ -+ -+# Check whether --enable-readline or --disable-readline was given. -+if test "${enable_readline+set}" = set; then -+ enableval="$enable_readline" -+ if test "$enableval" = "yes"; then -+ JS_WANT_READLINE=1 -+ elif test "$enableval" = "no"; then -+ JS_WANT_READLINE= -+ else -+ { echo "configure: error: Option, readline, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, readline, does not take an argument ($enableval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+JS_BUNDLED_EDITLINE= -+EDITLINE_LIBS= -+ -+case "$target" in -+*-mingw*) -+ NO_EDITLINE=1 -+ ;; -+*) -+ ;; -+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:7922: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lreadline $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ EDITLINE_LIBS="-lreadline" -+else -+ echo "$ac_t""no" 1>&6 -+{ echo "configure: error: No system readline library found." 1>&2; echo "configure: error: No system readline library found." 1>&5; exit 1; } -+fi -+ -+ else -+ JS_BUNDLED_EDITLINE=1 -+ fi -+ -+ cat >> confdefs.pytmp <<\EOF -+ (''' EDITLINE ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define EDITLINE 1 -+EOF -+ -+fi -+ -+ -+ -+# Standalone module options (Not for building Mozilla) -+ -+ -+# Check whether --with-qemu-exe or --without-qemu-exe was given. -+if test "${with_qemu_exe+set}" = set; then -+ withval="$with_qemu_exe" -+ QEMU_EXE=$withval -+fi -+ -+ -+# Check whether --with-cross-lib or --without-cross-lib was given. -+if test "${with_cross_lib+set}" = set; then -+ withval="$with_cross_lib" -+ CROSS_LIB=$withval -+else -+ CROSS_LIB=/usr/$target -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+_INTL_API=yes -+ -+ -+ -+MOZ_SYSTEM_ICU= -+# Check whether --with-system-icu or --without-system-icu was given. -+if test "${with_system_icu+set}" = set; then -+ withval="$with_system_icu" -+ if test "$withval" = "yes"; then -+ MOZ_SYSTEM_ICU=1 -+ elif test "$withval" = "no"; then -+ : -+ else -+ { echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&5; exit 1; } -+ fi -+fi -+ -+ -+if test -n "$MOZ_SYSTEM_ICU"; then -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo $ac_n "checking for icu-i18n >= 63.1""... $ac_c" 1>&6 -+echo "configure:8052: checking for icu-i18n >= 63.1" >&5 -+ -+ if $PKG_CONFIG --exists "icu-i18n >= 63.1" ; then -+ echo "$ac_t""yes" 1>&6 -+ succeeded=yes -+ -+ echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6 -+echo "configure:8059: checking MOZ_ICU_CFLAGS" >&5 -+ MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 63.1"` -+ echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6 -+ -+ echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6 -+echo "configure:8064: checking MOZ_ICU_LIBS" >&5 -+ ## Remove evil flags like -Wl,--export-dynamic -+ MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 63.1\" |sed s/-Wl,--export-dynamic//g`" -+ echo "$ac_t""$MOZ_ICU_LIBS" 1>&6 -+ else -+ MOZ_ICU_CFLAGS="" -+ MOZ_ICU_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 63.1"` -+ echo $MOZ_ICU_PKG_ERRORS -+ fi -+ -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ : -+ else -+ if test "$COMPILE_ENVIRONMENT"; then -+ { echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; } -+ fi -+ fi -+ -+ CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS" -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_SYSTEM_ICU ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_SYSTEM_ICU 1 -+EOF -+ -+fi -+ -+ -+ -+# Check whether --with-intl-api or --without-intl-api was given. -+if test "${with_intl_api+set}" = set; then -+ withval="$with_intl_api" -+ _INTL_API=$withval -+fi -+ -+ -+ENABLE_INTL_API= -+EXPOSE_INTL_API= -+case "$_INTL_API" in -+no) -+ ;; -+build) -+ ENABLE_INTL_API=1 -+ ;; -+yes) -+ ENABLE_INTL_API=1 -+ EXPOSE_INTL_API=1 -+ ;; -+*) -+ { echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&2; echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&5; exit 1; } -+ ;; -+esac -+ -+if test -n "$ENABLE_INTL_API"; then -+ USE_ICU=1 -+fi -+ -+if test -n "$EXPOSE_INTL_API"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' EXPOSE_INTL_API ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define EXPOSE_INTL_API 1 -+EOF -+ -+fi -+ -+if test -n "$ENABLE_INTL_API"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' ENABLE_INTL_API ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define ENABLE_INTL_API 1 -+EOF -+ -+fi -+ -+if test -n "$USE_ICU"; then -+ icudir="$_topsrcdir/intl/icu/source" -+ if test ! -d "$icudir"; then -+ icudir="$_topsrcdir/../../intl/icu/source" -+ if test ! -d "$icudir"; then -+ { echo "configure: error: Cannot find the ICU directory" 1>&2; echo "configure: error: Cannot find the ICU directory" 1>&5; exit 1; } -+ fi -+ fi -+ -+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ if test x"$version" = x; then -+ { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } -+ fi -+ MOZ_ICU_VERSION="$version" -+ -+ # TODO: the l is actually endian-dependent -+ # We could make this set as 'l' or 'b' for little or big, respectively, -+ # but we'd need to check in a big-endian version of the file. -+ if test -z "$ICU_DATA_FILE"; then -+ ICU_DATA_FILE="icudt${version}l.dat" -+ fi -+fi -+ -+ -+ -+ -+ -+ -+if test -n "$USE_ICU"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' U_USING_ICU_NAMESPACE ''', r''' 0 ''') -+EOF -+cat >> confdefs.h <<\EOF -+#define U_USING_ICU_NAMESPACE 0 -+EOF -+ -+ -+ if test -z "$MOZ_SYSTEM_ICU"; then -+ case "$OS_TARGET:$CPU_ARCH" in -+ WINNT:aarch64) -+ ;; -+ *) -+ if test -z "$YASM" -a -z "$GNU_AS" -a "$COMPILE_ENVIRONMENT"; then -+ { echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&2; echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&5; exit 1; } -+ fi -+ ;; -+ esac -+ cat >> confdefs.pytmp <<\EOF -+ (''' U_STATIC_IMPLEMENTATION ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define U_STATIC_IMPLEMENTATION 1 -+EOF -+ -+ fi -+fi -+ -+ -+CFLAGS=`echo \ -+ $_COMPILATION_CFLAGS \ -+ $CFLAGS` -+ -+CXXFLAGS=`echo \ -+ $_WARNINGS_CXXFLAGS \ -+ $_COMPILATION_CXXFLAGS \ -+ $CXXFLAGS` -+ -+COMPILE_CFLAGS=`echo \ -+ $_DEFINES_CFLAGS \ -+ $COMPILE_CFLAGS` -+ -+COMPILE_CXXFLAGS=`echo \ -+ $_DEFINES_CXXFLAGS \ -+ $COMPILE_CXXFLAGS` -+ -+HOST_CFLAGS=`echo \ -+ $_WARNINGS_HOST_CFLAGS \ -+ $_COMPILATION_HOST_CFLAGS \ -+ $HOST_CFLAGS` -+ -+HOST_CXXFLAGS=`echo \ -+ $_WARNINGS_HOST_CXXFLAGS \ -+ $_COMPILATION_HOST_CXXFLAGS \ -+ $HOST_CXXFLAGS` -+ -+ -+ -+OS_CFLAGS="$CFLAGS" -+OS_CXXFLAGS="$CXXFLAGS" -+OS_CPPFLAGS="$CPPFLAGS" -+OS_COMPILE_CFLAGS="$COMPILE_CFLAGS" -+OS_COMPILE_CXXFLAGS="$COMPILE_CXXFLAGS" -+OS_LDFLAGS="$LDFLAGS" -+OS_LIBS="$LIBS" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_func in posix_fadvise posix_fallocate -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:8279: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:8311: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+ -+ -+ -+if test -n "$MOZ_DEV_EDITION"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' MOZ_DEV_EDITION ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define MOZ_DEV_EDITION 1 -+EOF -+ -+fi -+ -+# Allow influencing configure with a defines.sh script. -+. "${srcdir}/build/defines.sh" -+ -+# If we're not building a release build, define EARLY_BETA_OR_EARLIER if it is -+# set in defines.sh -+if test "$BUILDING_RELEASE"; then -+ # Override value in defines.sh, if any -+ EARLY_BETA_OR_EARLIER= -+elif test "$EARLY_BETA_OR_EARLIER"; then -+ cat >> confdefs.pytmp <<\EOF -+ (''' EARLY_BETA_OR_EARLIER ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define EARLY_BETA_OR_EARLIER 1 -+EOF -+ -+fi -+ -+ -+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS" -+ -+ -+ -+ -+ -+ -+ -+ -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" -+MALLOC_H= -+ -+for file in $MALLOC_HEADERS; do -+ ac_safe=`echo "$file" | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for $file""... $ac_c" 1>&6 -+echo "configure:8385: checking for $file" >&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 < -+int main() { -+ -+; return 0; } -+EOF -+if { (eval echo configure:8398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+ -+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ MALLOC_H=$file -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ if test "$MALLOC_H" != ""; then -+ cat >> confdefs.pytmp < ''') -+EOF -+cat >> confdefs.h < -+EOF -+ -+ break -+ fi -+done -+ -+for ac_func in strndup posix_memalign memalign -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:8433: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:8465: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+ -+for ac_func in malloc_usable_size -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:8496: 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 < -+#undef $ac_func -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:8528: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.pytmp <> confdefs.h <&6 -+fi -+done -+ -+MALLOC_USABLE_SIZE_CONST_PTR=const -+if test -n "$HAVE_MALLOC_H"; then -+ echo $ac_n "checking whether malloc_usable_size definition can use const argument""... $ac_c" 1>&6 -+echo "configure:8558: checking whether malloc_usable_size definition can use const argument" >&5 -+ cat > conftest.$ac_ext < -+ #include -+ size_t malloc_usable_size(const void *ptr); -+int main() { -+return malloc_usable_size(0); -+; return 0; } -+EOF -+if { (eval echo configure:8569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6 -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+ MALLOC_USABLE_SIZE_CONST_PTR= -+fi -+rm -f conftest* -+fi -+cat >> confdefs.pytmp <> confdefs.h <&6 -+echo "configure:8591: checking for valloc in malloc.h" >&5 -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "valloc" >/dev/null 2>&1; then -+ rm -rf conftest* -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VALLOC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VALLOC 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+echo $ac_n "checking for valloc in unistd.h""... $ac_c" 1>&6 -+echo "configure:8616: checking for valloc in unistd.h" >&5 -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "valloc" >/dev/null 2>&1; then -+ rm -rf conftest* -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_VALLOC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_VALLOC 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+echo $ac_n "checking for _aligned_malloc in malloc.h""... $ac_c" 1>&6 -+echo "configure:8641: checking for _aligned_malloc in malloc.h" >&5 -+cat > conftest.$ac_ext < -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "_aligned_malloc" >/dev/null 2>&1; then -+ rm -rf conftest* -+ cat >> confdefs.pytmp <<\EOF -+ (''' HAVE_ALIGNED_MALLOC ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define HAVE_ALIGNED_MALLOC 1 -+EOF -+ -+ echo "$ac_t""yes" 1>&6 -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+ -+ -+ -+ -+ -+if test -n "$JS_STANDALONE"; then -+MOZ_APP_NAME="mozjs" -+JS_LIBRARY_NAME="mozjs-$MOZILLA_SYMBOLVERSION" -+else -+JS_LIBRARY_NAME="mozjs" -+fi -+JS_CONFIG_LIBS="$NSPR_LIBS $LIBS" -+if test -n "$GNU_CC"; then -+JS_CONFIG_MOZ_JS_LIBS='-L${libdir} -l${JS_LIBRARY_NAME}' -+else -+JS_CONFIG_MOZ_JS_LIBS='${libdir}/${JS_LIBRARY_NAME}.lib' -+fi -+ -+ -+ -+ -+# Avoid using obsolete NSPR features -+cat >> confdefs.pytmp <<\EOF -+ (''' NO_NSPR_10_SUPPORT ''', ' 1 ') -+EOF -+cat >> confdefs.h <<\EOF -+#define NO_NSPR_10_SUPPORT 1 -+EOF -+ -+ -+top_srcdir=$srcdir -+ -+ -+trap '' 1 2 15 -+cat > confcache <<\EOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs. It is not useful on other systems. -+# If it contains results you don't want to keep, you may remove or edit it. -+# -+# By default, configure uses ./config.cache as the cache file, -+# creating it if it does not exist already. You can give configure -+# the --cache-file=FILE option to use a different cache file; that is -+# what configure does when it calls configure scripts in -+# subdirectories, so they share the cache. -+# Giving --cache-file=/dev/null disables caching, for debugging configure. -+# config.status only pays attention to the cache file if you give it the -+# --recheck option to rerun configure. -+# -+EOF -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, don't put newlines in cache variables' values. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+(set) 2>&1 | -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote substitution -+ # turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ -e "s/'/'\\\\''/g" \ -+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' -+ ;; -+ esac >> confcache -+if cmp -s $cache_file confcache; then -+ : -+else -+ if test -w $cache_file; then -+ echo "updating cache $cache_file" -+ cat confcache > $cache_file -+ else -+ echo "not updating unwritable cache $cache_file" -+ fi -+fi -+rm -f confcache -+ -+ -+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -+: ${CONFIG_STATUS=./config.data} -+ -+echo creating $CONFIG_STATUS -+ -+cat > $CONFIG_STATUS <> $CONFIG_STATUS -+rm confdefs.pytmp confdefs.h -+ -+cat >> $CONFIG_STATUS <<\EOF -+] -+ -+substs = [ -+EOF -+ -+sed 's/$/,/' >> $CONFIG_STATUS <> $CONFIG_STATUS -+done -+ -+cat >> $CONFIG_STATUS <<\EOF -+] -+ -+non_global_defines = [ -+EOF -+ -+if test -n "$_NON_GLOBAL_ACDEFINES"; then -+ for var in $_NON_GLOBAL_ACDEFINES; do -+ echo " '$var'," >> $CONFIG_STATUS -+ done -+fi -+ -+cat >> $CONFIG_STATUS <&6 --echo "configure:12466: checking for $ac_func" >&5 -+echo "configure:12468: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:12500: \"$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 -@@ -12526,7 +12528,7 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $XCFLAGS" - cat > conftest.$ac_ext < -@@ -12545,7 +12547,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:12549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:12551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else - echo "configure: failed program was:" >&5 diff --git a/meta-gnome/recipes-support/mozjs68/mozjs68_68.4.2.bb b/meta-gnome/recipes-support/mozjs68/mozjs68_68.4.2.bb deleted file mode 100644 index 978ce04..0000000 --- a/meta-gnome/recipes-support/mozjs68/mozjs68_68.4.2.bb +++ /dev/null @@ -1,114 +0,0 @@ -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=dc9b6ecd19a14a54a628edaaf23733bf" - -SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/teams/releng/tarballs-needing-help/mozjs/mozjs-68.4.2.tar.bz2;downloadfilename=mozjs68-68.4.2.tar.bz2 \ - file://avoid-running-autoconf2.13.patch \ - file://0001-Yocto-build-fixes.patch \ - " - -SRC_URI[md5sum] = "cb1ab1983f72d45c737069747c088aa5" -SRC_URI[sha256sum] = "097fb482aa0e57fb117fde6816fbabfedcb862ee81906990363954f47ce93227" -S = "${WORKDIR}/mozjs-68.4.2" - - -inherit autotools pkgconfig perlnative pythonnative -inherit rust-common -inherit distro_features_check -CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" -TOOLCHAIN = "clang" - -DEPENDS += "nspr zlib rust-native cargo-native clang-native cbindgen-native nasm-native yasm-native" - -# 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 \ - --disable-jemalloc \ - --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},--x-includes=no --x-libraries=no,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}" - export RUSTC="${WORKDIR}/recipe-sysroot-native/usr/bin/rustc" - export RUST_HOST="${BUILD_SYS}" - export RUST_TARGET="${TARGET_SYS}" - export RUST_TARGET_PATH="${STAGING_LIBDIR_NATIVE}/rustlib" - export BINDGEN_MFLOAT="${@bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', '-mfloat-abi=hard', '', d)}" - export BINDGEN_CFLAGS="--target=${TARGET_SYS} --sysroot=${RECIPE_SYSROOT} ${BINDGEN_MFLOAT}" - export INSTALL_SDK=0 - ${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 third_party/python; 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 third_party/python; 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_append() { - rm -f ${D}/${libdir}/libjs.a -} - -PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} += "${libdir}/lib*.so" - -FILES_${PN}-dev += "${bindir}/js68-config" -RPROVIDES_lib${BPN} += "libmozjs-68" - -# 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-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch new file mode 100644 index 0000000..8b2c4fb --- /dev/null +++ b/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Force-the-correct-target-string-with-environment-var.patch @@ -0,0 +1,22 @@ +From c5797daaddc1fd650eaba09c454a866daab291b2 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Tue, 20 Oct 2020 08:00:41 -0400 +Subject: [PATCH] Force the correct target string with environment variable. + +Otherwise, the cc crate will emit incorrect --target compiler flags. +--- + mozglue/static/rust/build.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mozglue/static/rust/build.rs b/mozglue/static/rust/build.rs +index 5bc6bae40..75c2e65a2 100644 +--- a/mozglue/static/rust/build.rs ++++ b/mozglue/static/rust/build.rs +@@ -26,6 +26,7 @@ fn main() { + } + path + }; ++ env::set_var("TARGET", "x86_64-oe-linux"); + let mut build = cc::Build::new(); + build.cpp(true); + // For js-confdefs.h, see wrappers.cpp. diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch new file mode 100644 index 0000000..e70bcf1 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs78/mozjs78/0003-Set-rust-host-and-target-correctly.patch @@ -0,0 +1,85 @@ +From de3d0659eb98f32a6da57c585a5417106bf93f99 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Tue, 20 Oct 2020 08:03:45 -0400 +Subject: [PATCH] Set rust host and target correctly + +--- + build/moz.configure/rust.configure | 44 +++++++++++++++++++++--------- + 1 file changed, 31 insertions(+), 13 deletions(-) + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index e5122d6b8..5575267d3 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -48,15 +48,6 @@ def unwrap_rustup(prog, name): + return + + def from_rustup_which(): +- out = check_cmd_output('rustup', 'which', name, +- executable=prog).rstrip() +- # If for some reason the above failed to return something, keep the +- # PROG we found originally. +- if out: +- log.info('Actually using \'%s\'', out) +- return out +- +- log.info('No `rustup which` output, using \'%s\'', prog) + return prog + + (retcode, stdout, stderr) = get_cmd_output(prog, '+stable') +@@ -218,6 +209,26 @@ def rust_supported_targets(rustc): + return data + + ++option(env='RUST_HOST', ++ nargs=1, ++ help='Define the system type for Rust performing the build') ++ ++@depends('RUST_HOST') ++@checking('rust host', lambda host: host) ++def rust_host_env(value): ++ if value: ++ return value[0] ++ ++option(env='RUST_TARGET', ++ nargs=1, ++ help='Define the system type for Rust where the resulting executables will be used') ++ ++@depends('RUST_TARGET') ++@checking('rust target', lambda target: target) ++def rust_target_env(value): ++ if value: ++ return value[0] ++ + @template + def rust_triple_alias(host_or_target, host_or_target_c_compiler): + """Template defining the alias used for rustc's --target flag. +@@ -228,8 +239,9 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): + + host_or_target_str = {host: 'host', target: 'target'}[host_or_target] + +- @depends(rustc, host_or_target, host_or_target_c_compiler, +- rust_supported_targets, arm_target, when=rust_compiler) ++ @depends(rustc, host_or_target, rust_host_env, rust_target_env, ++ c_compiler, rust_supported_targets, arm_target, ++ when=rust_compiler) + @checking('for rust %s triplet' % host_or_target_str) + @imports('os') + @imports(_from='mozbuild.configure.util', _import='LineIO') +@@ -237,8 +249,14 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler): + @imports(_from='six', _import='ensure_binary') + @imports(_from='tempfile', _import='mkstemp') + @imports(_from='textwrap', _import='dedent') +- def rust_target(rustc, host_or_target, compiler_info, +- rust_supported_targets, arm_target): ++ def rust_target(rustc, host_or_target, rust_host_env, rust_target_env, ++ compiler_info, rust_supported_targets, arm_target): ++ ++ specified_targets = {"host": rust_host_env, "target": rust_target_env} ++ specified_target = specified_targets[host_or_target_str] ++ if (specified_target): ++ return specified_target ++ + # Rust's --target options are similar to, but not exactly the same + # as, the autoconf-derived targets we use. An example would be that + # Rust uses distinct target triples for targetting the GNU C++ ABI diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch new file mode 100644 index 0000000..430e343 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs78/mozjs78/0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch @@ -0,0 +1,19 @@ +From f753e54ce3287920c17612d837a0bd18bfba09d3 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Tue, 20 Oct 2020 08:04:40 -0400 +Subject: [PATCH] Do not add RequiredDefines.h here, instead add to gjs recipe + +--- + js/src/build/js.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in +index d40deb174..06f70ae8d 100644 +--- a/js/src/build/js.pc.in ++++ b/js/src/build/js.pc.in +@@ -11,4 +11,4 @@ Libs: -L${libdir} -l@JS_LIBRARY_NAME@ + # Use -isystem for includes rather than -I, to mark them as "system headers" + # that don't generate warning diagnostics. For justification, see + # https://bugzilla.mozilla.org/show_bug.cgi?id=1539036 +-Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@ ++Cflags: -isystem ${includedir}/@JS_LIBRARY_NAME@ diff --git a/meta-gnome/recipes-support/mozjs/mozjs/avoid-running-autoconf2.13.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/avoid-running-autoconf2.13.patch similarity index 65% rename from meta-gnome/recipes-support/mozjs/mozjs/avoid-running-autoconf2.13.patch rename to meta-gnome/recipes-support/mozjs78/mozjs78/avoid-running-autoconf2.13.patch index 46d9a40..6483c8c 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs/avoid-running-autoconf2.13.patch +++ b/meta-gnome/recipes-support/mozjs78/mozjs78/avoid-running-autoconf2.13.patch @@ -20,11 +20,12 @@ index 7286b23ce86a..87702b520806 100644 mozconfig_autoconf = None if mozconfig['path']: make_extra = mozconfig['make_extra'] -@@ -115,6 +116,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, - break - else: - refresh = False -+ refresh = False +@@ -110,7 +110,7 @@ def prepare_configure(old_configure, mozillabuild, mozconfig, autoconf, build_en + old_configure = os.path.join(old_configure_dir, 'js', 'src', + os.path.basename(old_configure)) - if refresh: - log.info('Refreshing %s with %s', old_configure, autoconf) +- refresh = True ++ refresh = False + if exists(old_configure): + mtime = getmtime(old_configure) + aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb b/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb new file mode 100644 index 0000000..87e4b4e --- /dev/null +++ b/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb @@ -0,0 +1,122 @@ +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=dc9b6ecd19a14a54a628edaaf23733bf" + +# Path: /teams/releng/tarballs-needing-help/mozjs/mozjs-78.0.1gnome.tar.xz +SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/mozjs-78.0.1gnome.tar.xz;downloadfilename=mozjs78-78.0.1.tar.xz \ + file://avoid-running-autoconf2.13.patch \ + file://0001-Force-the-correct-target-string-with-environment-var.patch \ + file://0003-Set-rust-host-and-target-correctly.patch \ + file://0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch \ + " + +SRC_URI[md5sum] = "09bf510150144238dd31f7f4e1582cf8" +SRC_URI[sha256sum] = "78d762012be9eb460b5805da4f919d1a12b15f4040f126c98a42c4dddac7339e" +S = "${WORKDIR}/mozjs-78.0.1gnome" + +inherit autotools pkgconfig perlnative python3native +inherit rust-common +inherit features_check +CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" +TOOLCHAIN = "clang" + +DEPENDS += "nspr zlib rust-native cargo-native clang-native cbindgen-native nasm-native yasm-native python3" + +# 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 \ + --disable-jemalloc \ + --disable-debug-symbols \ + ${@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},--x-includes=no --x-libraries=no,virtual/libx11" + +EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" +EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" + + +export TMP="${B}" +export RUSTC="${WORKDIR}/recipe-sysroot-native/usr/bin/rustc" +export RUST_HOST="${BUILD_SYS}" +export RUST_TARGET="${RUST_TARGET_SYS}" +export RUST_TARGET_PATH="${STAGING_LIBDIR_NATIVE}/rustlib" +export BINDGEN_MFLOAT="${@bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', '-mfloat-abi=hard', '', d)}" +export BINDGEN_CFLAGS="--target=${RUST_TARGET_SYS} --sysroot=${RECIPE_SYSROOT} ${BINDGEN_MFLOAT}" +export INSTALL_SDK="0" +export STAGING_LIBDIR +export NO_RUST_PANIC_HOOK="1" + +# +# Silence a host leak while linking native binary (nsinstall_real) used during the +# mozjs build. This should be fixed, but I was unable to find a way to do so. +# +# log.do_compile: +# +# recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-clang -std=gnu99 -o nsinstall_real -DXP_UNIX -O3 host_nsinstall.o host_pathsub.o +# +# recipe-sysroot-native/usr/bin/x86_64-oe-linux-ld: +# +# warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9" is unsafe for cross-compilation +# warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu" is unsafe for cross-compilation +# warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9/../../../lib64" is unsafe for cross-compilation +# warning: library search path "/usr/lib/gcc/x86_64-linux-gnu/9/../../.." is unsafe for cross-compilation +# +WARN_QA_remove = "compile-host-path" + +setup_pythonpath() { + export SHELL="/bin/sh" + cd ${S} + PYTHONPATH="${S}/config:${S}/build" + for mod in which pytoml jsmin distro six pyyaml/lib3; do + PYTHONPATH="$PYTHONPATH:${S}/third_party/python/${mod}" + done + + for sub_dir in python testing/mozbase; do + for module_dir in `ls $sub_dir -1`;do + if [ -d "${S}/$sub_dir/$module_dir" ];then + PYTHONPATH="$PYTHONPATH:${S}/$sub_dir/$module_dir" + fi + done + done + export PYTHONPATH + cd ${B} +} + +do_configure() { + setup_pythonpath + mkdir -p "${B}/_virtualenvs" + ln -s "../../recipe-sysroot-native/usr/lib" "${B}/_virtualenvs/lib" + ${S}/js/src/configure ${EXTRA_OECONF} +} + +do_compile_prepend() { + setup_pythonpath +} + +do_install_prepend() { + setup_pythonpath +} + +do_install_append() { + rm -f ${D}/${libdir}/libjs.a +} + +PACKAGES =+ "lib${BPN}" +FILES_lib${BPN} += "${libdir}/lib*.so" + +FILES_${PN}-dev += "${bindir}/js78-config" +RPROVIDES_lib${BPN} += "libmozjs-78" + +DISABLE_STATIC = "" diff --git a/meta-intel b/meta-intel index 1e6dcb7..7022383 160000 --- a/meta-intel +++ b/meta-intel @@ -1 +1 @@ -Subproject commit 1e6dcb762fed9ab5d0265477e4a2ab56748750da +Subproject commit 702238367bbe17f306bdf061792b27b650dcde61 diff --git a/meta-rust b/meta-rust index d0dc19a..2e085dd 160000 --- a/meta-rust +++ b/meta-rust @@ -1 +1 @@ -Subproject commit d0dc19aa78883c6927b8287267ba283760417fe7 +Subproject commit 2e085dda43dc80e6c55ac41f83db20fb7739a0a1 diff --git a/poky b/poky index 04d71b4..012ad10 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 04d71b42e7323087b945e9c507337c1cfb54f48b +Subproject commit 012ad10a89a889c21e67c27dc37d22520212548f