diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-08 03:21:33 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 23:39:32 +0300 |
| commit | 213cb2696d00a85cd48d356cb5131824a302d828 (patch) | |
| tree | bfdf8fcdfef3a88e392ca3acfca6dec4dc836c9f /poky/meta/recipes-devtools | |
| parent | 40d8f44b51f83548f7ca8df062dd7435b784c0a8 (diff) | |
| download | openbmc-213cb2696d00a85cd48d356cb5131824a302d828.tar.xz | |
subtree updates
meta-raspberrypi: 8dc3a31088..c7f4c739a3:
Khem Raj (5):
linux-raspberrypi: Upgrade to 5.10.52
userland: Update to latest master branch
raspberrypi-firmware: Update to latest
raspberrypi-tools: Update to latest
sdcard_image-rpi.bbclass: Fix IMAGE_TYPEDEP override to use new syntax
Martin Jansa (4):
Convert to new override syntax
Manually fix conversion
layer.conf: Update to honister
userland: package man pages in PN-doc
Pierre-Jean Texier (2):
kas: local.conf: bump CONF_VERSION variable
kas: local.conf: disable prelink
poky: 17aabc0127..492205ea83:
Alexander Kanavin (17):
llvm: update 12.0.0 -> 12.0.1
systemd: update 248.3 -> 249.1
python3-testools: update 2.4.0 -> 2.5.0
libuv: update 1.41.0 -> 1.42.0
gnu-config: update to latest revision
vulkan-samples: update to latest revision
cmake: update 3.20.5 -> 3.21.0
cmake: update 3.21.0 -> 3.21.1
mtools: update 4.0.32 -> 4.0.34
util-linux: update 2.37 -> 2.37.1
iputils: update 20210202 -> 20210722
freetype: update 2.10.4 -> 2.11.0
devtool: print a warning on upgrades if PREFERRED_VERSION is set
rpm: do not RRECOMMEND rpm-build
selftest: add core-image-weston to no-gpl3-no-meta-gpl2 image test
shadow: update 4.8.1 -> 4.9
local.conf.sample: disable prelink
Bernhard Rosenkränzer (1):
gcc: update 11.1 -> 11.2
Bruce Ashfield (6):
linux-yocto/5.10: update to v5.10.53
linux-yocto/5.13: update to v5.13.5
linux-yocto/5.4: update to v5.4.135
linux-yocto-rt/5.10: update to -rt47
linux-yocto/5.13: enable TYPEC_TCPCI in usbc fragment
linux-yocto/5.10: enable TYPEC_TCPCI in usbc fragment
Changqing Li (1):
archiver.bbclass: fix do_ar_configured failure for kernel
Chen Qi (3):
zstd: fix CVE_PRODUCT
insane.bbclass: fix the file-rdeps QA message for the new override syntax
iputils: fix do_configure failure of missing ip command
Damian Wrobel (1):
rootfs: remove ldconfig auxiliary cache where appropriate
Denys Dmytriyenko (4):
meta: convert nested overrides leftovers to new syntax
convert-overrides.py: handle few more cases of overrides
libwpe: remove rpi-specific custom code
poky-tiny: drop uclibc override
Jon Mason (1):
parselogs.py: qemuarm should be qemuarmv5
Joshua Watt (4):
mesa: Fix v3d & vc4 dmabuf import
bitbake: bitbake: asyncrpc: Catch early SIGTERM
libxft: Fix bad PKG value
bitbake: contrib: vim: Update for new override syntax
Kai Kang (2):
u-boot_2021.07: set UBOOT_MACHINE for qemumips and qemumips64
python3-pytest: display correct version info
Kevin Hao (2):
meta-yocto-bsp: Introduce the v5.13 bbappend
meta-yocto-bsp: Bump to the v5.10.55
Khem Raj (10):
binutils: Upgrade to 2.37 branch
texinfo: Update gnulib to fix build with glibc 2.34
systemd: Fix build on musl
stress-ng: Drop defining daddr_t
stress-ng: Detemine minimal stack size via sysconf
mesa: Define a fallback for DRIDRIVERS
libssh2: Fix syntax for using ptest override
toaster-managed-mode.json: Correctly specify term with new override syntax
distrooverrides.bbclass: Correct override syntax
devtool.py: Correct override syntax
Lee Chee Yang (1):
aspell: fix CVE-2019-25051
Marek Vasut (2):
image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior
kernel-uboot: Handle gzip and lzo compression options
Martin Jansa (6):
convert-overrides.py: show processed file and version of this script
convert-overrides.py: remove base_dep_prepend and autotools_dep_prepend exception
convert-overrides.py: 0.9.1 include '(' as delimiter for shortvars
convert-overrides.py: allow specifying multiple target dirs
convert-overrides.py: allow dots before override in vars_re and shortvars_re
systemd-boot: use ld.bfd as efi-ld even when gold or lld is used in ${LD}
Matthias Klein (2):
runqemu: Fix typo in error message
runqemu: decouple bios and kernel options
Matthias Schiffer (3):
initscripts: populate-volatile.sh: do not log to tty0
initscripts: populate-volatile.sh: run create_file synchronously
initscripts: fix creation order for /var/log with VOLATILE_LOG_DIR=true
Michael Halstead (1):
releases: update to include 3.3.1
Michael Opdenacker (18):
oe-setup-builddir: update YP docs and OE URLs
conf-notes.txt: now suggesting to run 'runqemu qemux86-64'
test-manual: document LTO related reproducibility bug
quick start manual: update "source oe-init-build-env" output
dev-manual: fix wrong reference to class
documentation/README: improve BitBake manual referencing guidelines
manuals: simplify references to BitBake manual
manuals: remove explicit BitBake variable references
meta-skeleton: add recipe examples from documentation sources
bitbake: doc: bitbake-user-manual: fix syntax in example and improve description
bitbake: doc: bitbake-user-manual: update bitbake option help
bitbake: doc: bitbake-user-manual: grammar fix for the number of "metadata"
manuals: initial documentation for CVE management
ref-manual: remove example recipe source files
profile-manual: document how to build perf manpages on target
cve-check: fix comments
cve-check: update link to NVD website for CVE details
cve-check: improve comment about CVE patch file names
Mingli Yu (2):
perlcross: not break build if already patched
curl: Upgrade to 7.78.0
Nicolas Dechesne (4):
yocto-check-layer: improve missed dependencies
checklayer: new function get_layer_dependencies()
checklayer: rename _find_layer_depends
yocto-check-layer: ensure that all layer dependencies are tested too
Oleksandr Kravchuk (1):
bitbake.conf: change GNOME_MIRROR to new one
Patrick Williams (1):
pixman: re-disable iwmmxt
Paul Barker (4):
bitbake: asyncrpc: Fix bad message error in client
bitbake: asyncrpc: Set timeout when waiting for reply from server
bitbake: parse/ast: Substitute '~' when naming anonymous functions
kernel-yocto: Simplify no git repo case in do_kernel_checkout
Quentin Schulz (4):
bitbake: doc: Makefile: turn warnings into errors by default
bitbake: doc: bitbake-user-manual: ref-variables: order alphabetically the glossary sources
bitbake: doc: bitbake-user-manual: ref-variables: force glossary output to be alphabetically sorted
bitbake: doc: bitbake-user-manual: replace ``FOO`` by :term:`FOO` where possible
Richard Purdie (49):
Add MAINTAINERS.md file
yocto-check-layer: Remove duplicated code
libubootenv: Drop default-env RRECOMMENDS
bitbake: data_smart: Allow colon in variable expansion regex
meta-poky/meta-yocto-bsp: Convert to new override syntax
layer.conf: Update to honister
autotools/base/icecc: Remove prepend from function names
scripts/contrib: Add override conversion script
systemtap: Fix headers issue with x86 and 5.13 headers
migration-guides: Add start of 3.4 guide with override migration notes
common-tasks: Fix conversion error in npm example
bitbake: bitbake: Switch to using new override syntax
bitbake: doc/lib: Update to use new override syntax containing colons
bitbake: doc/lib: Add fixes for issues missed by the automated conversion
bitbake: bitbake: Update to version 1.51.1
layer.conf: Override changes mean we're only compatible with honister
Convert to new override syntax
meta: Manual override fixes
local.conf.sample: Bump version so users update their config
sanity.conf: Require bitbake 1.51.1
dropbear: Fix incorrect package override for postrm
convert-overrides: Allow script to handle patch/diffs
sdk: Decouple default install path from built in path
sstate: Fix rebuilds when changing layer config
populate_sdk_ext: Fix handling of TOOLCHAIN_HOST_TASK in the eSDK case
local.conf.sample: Bump version so users update their config
poky: Use SDKPATHINSTALL instead of SDKPATH
vim: Clarify where RDEPENDS/RRECOMMENDS apply
bitbake: data_smart: Fix inactive overide accidental variable value corruption
local.conf.sample: Fix missed override conversion
license: Exclude COPYING.MIT from pseudo
meta: Convert IMAGE_TYPEDEP to use override syntax
uboot-extlinux-config: Fix missing override conversion
image/image_types: Convert CONVERSION_CMD/COMPRESS_CMD to new override syntax
image: Drop COMPRESS_CMD
devupstream: Allow support of native class extensions
diffoscope: Upgrade 178 -> 179
strace: Upgrade 5.12 -> 5.13
valgrind: Add patches for glibc 2.34 support
bitbake: runqueue: Improve multiconfig deferred task issues
elfutils: Add patch from upstream for glibc 2.34 ptest fixes
bitbake: doc: Fix append/prepend/remove references
bitbake: fetch/tests/toaster: Override conversion fixups
bitbake: process: Improve traceback error reporting from main loop
bitbake: command: Ensure we catch/handle exceptions
bitbake: ui/taskexp: Improve startup exception handling
bitbake: ui/taskexp: Fix to work with empty build directories
oeqa/runtime/cases/ptest: Increase test timeout from 300s to 450s
packagedata: Fix after override syntax change
Ross Burton (2):
glew: fix Makefile race
libx11: fix xkb compilation with _EVDEVK symbols
Saul Wold (1):
MAINTAINERS: Saul will cover devtool and eSDK
Stefan Wiehler (1):
dev-manual: fix source release example script
Stefano Babic (1):
mtd-utils: upgrade 2.1.2 -> 2.1.3
Tim Orling (2):
python3-hypothesis: upgrade 6.14.3 -> 6.14.5
python3-importlib-metadata: upgrade 4.6.1 -> 4.6.3
Tony Battersby (2):
lto.inc: disable LTO for grub
gcc: Backport patch to make LTO builds more reproducible
Tony Tascioglu (6):
ffmpeg: fix-CVE-2020-20446
ffmpeg: fix CVE-2020-20453
ffmpeg: fix CVE-2020-22015
ffmpeg: fix CVE-2020-22021
ffmpeg: fix CVE-2020-22033 and CVE-2020-22019
ffmpeg: fix CVE-2021-33815
Trevor Woerner (1):
ffmpeg: add libatomic for armv5
Ulrich Ölmann (2):
initramfs-framework: fix whitespace issue
initramfs-framework/setup-live: fix shebang
Vinay Kumar (1):
glibc: Fix CVE-2021-33574
Vivien Didelot (1):
init-manager-systemd: define weak dev manager
Zqiang (1):
python3: use monotonic clock for condvar if possible
hongxu (1):
createrepo-c: fix createrepo-c failed in nativesdk
leimaohui (1):
archiver.bbclass: Fix patch error for recipes that inherit dos2unix.
wangmy (3):
bind: upgrade 9.16.18 -> 9.16.19
i2c-tools: upgrade 4.2 -> 4.3
diffoscope: upgrade 177 -> 178
zangrc (2):
python3-dbus: upgrade 1.2.16 -> 1.2.18
python3-pip: upgrade 21.1.3 -> 21.2.1
meta-openembedded: 8fbcfb9f02..3cf2475ea0:
Anastasios Kavoukis (1):
pm-qa: fix paths for shell scripts
Andreas Müller (3):
mozjs/0001-Port-build-to-python3.patch: Fix typos in description
jack: upgrade 1.19.18 -> 1.19.19
fluidsynth: upgrade 2.2.1 -> 2.2.2
Andrej Valek (1):
thrift: upgrade to 0.14.2
Andrew Jeffery (2):
python3-gmpy: Add native support
python3-ecdsa: Add native support
Armin Kuster (2):
hiawatha: fix url.
wireshark: update to 3.4.7
Ben Brown (1):
android-tools: fix install of adb client when TOOLS is overridden
Changqing Li (1):
apache2: upgrade 2.4.46 -> 2.4.48
Devendra Tewari (1):
Suppress eol in functionfs setup scripts (#147)
Gianfranco (1):
vboxguestdrivers: upgrade 6.1.22 -> 6.1.24
Joe Slater (2):
php: move to version 7.4.21
gtksourceview4: work around dependency deficiency
Johannes Obermüller (1):
evtest: fix timestamps in output
Kai Kang (2):
python3-blivet: 3.1.4 -> 3.4.0
python3-blivetgui: 2.1.10 -> 2.2.1
Khem Raj (23):
netperf: Update to latest
netperf: Add systemd unit file
packagegroup-meta-oe: Add lmdb
packagegroup-meta-oe: Add mbw
addcli: check for ns_get16 and ns_get32
fuse: Define closefrom if not available
autofs: Fix build with glibc 2.34+
ntp: Do not use PTHREAD_STACK_MIN on glibc
ntp: Fix make check
mongodb: Upgrade to 4.4.7
vboxguestdrivers: Remove __divmoddi4 patch
packagegroup-meta-oe: Add jemalloc
apitrace: Exclude from builds with glibc 2.34+
libhugetlbfs: Disable build with glibc 2.34+
fvwm: Package extra files and man pages
luajit: Fix override syntax
lua: Drop uclibc patch
packagegroup-meta-oe: Correct override name and fix syntax
recipes: Fix override syntax
emacs,libgpiod,cockpit: Fix override syntax in using FILES_${PN}
fvwm: Fix build time paths in target perl/python scripts
nis: Drop uclibc check in anon python function
jemalloc: Fix build on musl
Leon Anavi (3):
python3-networkx: Upgrade 2.6.1 -> 2.6.2
python3-pysonos: Upgrade 0.0.53 -> 0.0.54
python3-zeroconf: Upgrade 0.33.1 -> 0.33.2
Li Wang (1):
openlldp: fix segfault
Maksym Sloyko (1):
libusbgx: Configure the Devices Used
Martin Jansa (5):
Convert to new override syntax
layer.conf: Update to honister
mariadb: manually fix the conversion
packagegroup-meta-oe: manually finish override syntax conversion
klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion
Mingli Yu (4):
mariadb: redefine log-error item
jemalloc: add new recipe
hdf5: improve reproducibility
mariadb: Update SRC_URI
Nicolas Dechesne (1):
mbw: add new recipe
Paulo Neves (1):
htop: Add ncurses-terminfo-base to RDEPENDS
Sakib Sajal (1):
lmdb: add recipe
Salman Ahmed (2):
nginx: upgrade 1.18.0 -> 1.20.1
nginx: upgrade 1.19.6 -> 1.21.1
Tony Battersby (1):
net-snmp: fix QA Issue after LDFLAGS change
Yi Zhao (3):
postfix: upgrade 3.6.1 -> 3.6.2
audit: upgrade 3.0.2 -> 3.0.3
audit: fix compile error for 2.8.5
Zang Ruochen (1):
python3-robotframework: upgrade 4.0.3 -> 4.1
wangmy (17):
evince: upgrade 40.2 -> 40.4
gnome-backgrounds: upgrade 3.36.0 -> 3.38.0
gnome-desktop3: upgrade 3.36.6 -> 3.38.8
cmark: upgrade 0.30.0 -> 0.30.1
ctags: upgrade 5.9.20210711.0 -> 5.9.20210718.0
libnet-dns-perl: upgrade 1.31 -> 1.32
libtalloc: upgrade 2.3.2 -> 2.3.3
nghttp2: upgrade 1.43.0 -> 1.44.0
bats: upgrade 1.3.0 -> 1.4.1
networkmanager: upgrade 1.32.2 -> 1.32.4
gensio: upgrade 2.2.7 -> 2.2.8
libmbim: upgrade 1.24.8 -> 1.26.0
fetchmail: upgrade 6.4.19 -> 6.4.20
ctags: upgrade 5.9.20210718.0 -> 5.9.20210801.0
libblockdev: upgrade 2.25 -> 2.26
libqmi: upgrade 1.28.6 -> 1.28.8
monit: upgrade 5.28.0 -> 5.28.1
zangrc (15):
python3-qrcode: upgrade 7.1 -> 7.2
python3-rdflib: upgrade 5.0.0 -> 6.0.0
python3-simplejson: upgrade 3.17.2 -> 3.17.3
python3-bitstring: upgrade 3.1.7 -> 3.1.9
python3-iso8601: upgrade 0.1.14 -> 0.1.16
python3-gmqtt: upgrade 0.6.9 -> 0.6.10
python3-graphviz: upgrade 0.16 -> 0.17
python3-smbus: upgrade 4.2 -> 4.3
python3-pandas: upgrade 1.3.0 -> 1.3.1
python3-progress: upgrade 1.5 -> 1.6
python3-sentry-sdk: upgrade 1.3.0 -> 1.3.1
python3-socketio: upgrade 5.3.0 -> 5.4.0
python3-tqdm: upgrade 4.61.2 -> 4.62.0
python3-twisted: upgrade 21.2.0 -> 21.7.0
python3-xlsxwriter: upgrade 1.4.4 -> 1.4.5
zhengruoqin (15):
live555: upgrade 20210710 -> 20210720
libtest-warnings-perl: upgrade 0.030 -> 0.031
python3-pybind11: upgrade 2.6.2 -> 2.7.0
python3-pymongo: upgrade 3.11.4 -> 3.12.0
python3-sqlalchemy: upgrade 1.4.20 -> 1.4.22
python3-sentry-sdk: upgrade 1.2.0 -> 1.3.0
libcurses-perl: upgrade 1.37 -> 1.38
libdbd-sqlite-perl: upgrade 1.66 -> 1.68
libencode-perl: upgrade 3.10 -> 3.11
python3-bitarray: upgrade 2.2.2 -> 2.2.3
python3-cbor2: upgrade 5.4.0 -> 5.4.1
python3-gast: upgrade 0.5.0 -> 0.5.1
poppler: upgrade 21.07.0 -> 21.08.0
valijson: upgrade 0.4 -> 0.5
xwd: upgrade 1.0.7 -> 1.0.8
meta-security: 152cdb506b..c885d399cd:
Armin Kuster (18):
suricata.inc: exclude ppc in rust version
suricata: Drop 4.1.x its EOL
add meta-rust
crowdsec: add pkg
packagegroup-core-security.bb: fix suricat-ptest inclusion
gitlab-ci.yml: streamline builds matrix
krill: Add new pkg
clamav: fix branch name and update
meta-security: Convert to new override syntax
meta-tpm: Convert to new override syntax
meta-integrity: Convert to new override syntax
meta-hardening: Convert to new override syntax
meta-security-isafw: Convert to new override syntax
meta-parsec: Convert to new override syntax
meta-security-compliance: Convert to new override syntax
dynamix-layers: Convert to new override syntax
kas: Convert to new override syntax
packagegroup-core-security.bb: only include suricat-ptest if rust is included
Martin Jansa (1):
layer.conf: Update to honister
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iec7301cf1c43b7cec462dcf88292a8b1b12a5045
Diffstat (limited to 'poky/meta/recipes-devtools')
230 files changed, 6212 insertions, 6681 deletions
diff --git a/poky/meta/recipes-devtools/apt/apt_2.2.4.bb b/poky/meta/recipes-devtools/apt/apt_2.2.4.bb index f12011141..29fc49fb3 100644 --- a/poky/meta/recipes-devtools/apt/apt_2.2.4.bb +++ b/poky/meta/recipes-devtools/apt/apt_2.2.4.bb @@ -16,12 +16,12 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-aptwebserver.cc-Include-array.patch \ " -SRC_URI_append_class-native = " \ +SRC_URI:append:class-native = " \ file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI_append_class-nativesdk = " \ +SRC_URI:append:class-nativesdk = " \ file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " @@ -37,13 +37,13 @@ inherit cmake perlnative bash-completion upstream-version-is-even useradd # User is added to allow apt to drop privs, will runtime warn without USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home /nonexistent --no-create-home _apt" +USERADD_PARAM:${PN} = "--system --home /nonexistent --no-create-home _apt" BBCLASSEXTEND = "native nativesdk" DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" -EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ +EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DDPKG_DATADIR=${datadir}/dpkg \ -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ @@ -51,14 +51,14 @@ EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DWITH_TESTS=False \ " -do_configure_prepend () { +do_configure:prepend () { echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake } # Unfortunately apt hardcodes this all over the place -FILES_${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt" -RDEPENDS_${PN} += "bash perl dpkg" +FILES:${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt" +RDEPENDS:${PN} += "bash perl dpkg" customize_apt_conf_sample() { cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF @@ -113,23 +113,23 @@ DPkg::Path ""; EOF } -do_install_append_class-native() { +do_install:append:class-native() { customize_apt_conf_sample } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { customize_apt_conf_sample } -do_install_append_class-target() { +do_install:append:class-target() { #Write the correct apt-architecture to apt.conf APT_CONF=${D}/etc/apt/apt.conf echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} } # Avoid non-reproducible -src package -do_install_append () { +do_install:append () { sed -i -e "s,${B},,g" \ ${B}/apt-pkg/tagfile-keys.cc } diff --git a/poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2021.02.19.bb b/poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2021.02.19.bb index 54079b5f0..2f86b5065 100644 --- a/poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2021.02.19.bb +++ b/poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2021.02.19.bb @@ -12,6 +12,6 @@ inherit autotools allarch texinfo PACKAGES = "${PN} ${PN}-doc" -FILES_${PN} += "${datadir}/aclocal" +FILES:${PN} += "${datadir}/aclocal" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb b/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb index 852606720..324e6f8de 100644 --- a/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb +++ b/poky/meta/recipes-devtools/autoconf/autoconf_2.71.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv3+" HOMEPAGE = "http://www.gnu.org/software/autoconf/" SECTION = "devel" DEPENDS = "m4-native autoconf-native automake-native gnu-config-native help2man-native" -DEPENDS_remove_class-native = "autoconf-native automake-native help2man-native" +DEPENDS:remove:class-native = "autoconf-native automake-native help2man-native" LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \ file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464" @@ -19,11 +19,11 @@ SRC_URI = "${GNU_MIRROR}/autoconf/${BP}.tar.gz \ file://autotest-automake-result-format.patch \ file://man-host-perl.patch \ " -SRC_URI_append_class-native = " file://no-man.patch" +SRC_URI:append:class-native = " file://no-man.patch" SRC_URI[sha256sum] = "431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c" -RDEPENDS_${PN} = "m4 gnu-config \ +RDEPENDS:${PN} = "m4 gnu-config \ perl \ perl-module-bytes \ perl-module-carp \ @@ -51,13 +51,13 @@ RDEPENDS_${PN} = "m4 gnu-config \ perl-module-thread-queue \ perl-module-threads \ " -RDEPENDS_${PN}_class-native = "m4-native gnu-config-native hostperl-runtime-native" +RDEPENDS:${PN}:class-native = "m4-native gnu-config-native hostperl-runtime-native" inherit autotools texinfo PERL = "${USRBINPATH}/perl" -PERL_class-native = "/usr/bin/env perl" -PERL_class-nativesdk = "/usr/bin/env perl" +PERL:class-native = "/usr/bin/env perl" +PERL:class-nativesdk = "/usr/bin/env perl" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" @@ -70,11 +70,11 @@ update_gnu_config() { } do_configure[prefuncs] += "update_gnu_config" -do_configure_class-native() { +do_configure:class-native() { oe_runconf } -do_install_append() { +do_install:append() { rm -rf ${D}${datadir}/emacs } diff --git a/poky/meta/recipes-devtools/automake/automake.inc b/poky/meta/recipes-devtools/automake/automake.inc index 87cedc983..ceca16ab6 100644 --- a/poky/meta/recipes-devtools/automake/automake.inc +++ b/poky/meta/recipes-devtools/automake/automake.inc @@ -18,4 +18,4 @@ do_configure() { export AUTOMAKE = "${@bb.utils.which('automake', d.getVar('PATH'))}" -FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" +FILES:${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/poky/meta/recipes-devtools/automake/automake_1.16.3.bb b/poky/meta/recipes-devtools/automake/automake_1.16.3.bb index 7dc59d9fe..1882eedcd 100644 --- a/poky/meta/recipes-devtools/automake/automake_1.16.3.bb +++ b/poky/meta/recipes-devtools/automake/automake_1.16.3.bb @@ -1,11 +1,11 @@ require automake.inc LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS_class-native = "autoconf-native" +DEPENDS:class-native = "autoconf-native" NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ autoconf \ perl \ perl-module-bytes \ @@ -16,7 +16,7 @@ RDEPENDS_${PN} += "\ perl-module-threads \ perl-module-vars " -RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" +RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native" SRC_URI += "file://python-libdir.patch \ file://buildtest.patch \ @@ -29,12 +29,12 @@ SRC_URI += "file://python-libdir.patch \ SRC_URI[sha256sum] = "ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f" PERL = "${USRBINPATH}/perl" -PERL_class-native = "${USRBINPATH}/env perl" -PERL_class-nativesdk = "${USRBINPATH}/env perl" +PERL:class-native = "${USRBINPATH}/env perl" +PERL:class-nativesdk = "${USRBINPATH}/env perl" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" -do_install_append () { +do_install:append () { install -d ${D}${datadir} } diff --git a/poky/meta/recipes-devtools/binutils/binutils-2.36.inc b/poky/meta/recipes-devtools/binutils/binutils-2.37.inc index d54e2a345..4218c0a61 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-2.36.inc +++ b/poky/meta/recipes-devtools/binutils/binutils-2.37.inc @@ -12,13 +12,13 @@ LIC_FILES_CHKSUM="\ # When upgrading to 2.37, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.36.1" -CVE_VERSION = "2.36.1" -SRCBRANCH ?= "binutils-2_36-branch" +PV = "2.37" +CVE_VERSION = "2.37" +SRCBRANCH ?= "binutils-2_37-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1" +SRCREV ?= "87d4632d36323091e731eb07b8aa65f90293da66" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ @@ -35,8 +35,5 @@ SRC_URI = "\ file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ file://0015-sync-with-OE-libtool-changes.patch \ file://0016-Check-for-clang-before-checking-gcc-version.patch \ - file://0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch \ - file://0018-Add-DWARF-5-support-in-gold.patch \ - file://CVE-2021-20197.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index e98f31f9c..f44f46602 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc @@ -13,7 +13,7 @@ EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VEND # e.g. we switch between different machines with different tunes. EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH" -LDGOLD_sdkmingw32 = "" +LDGOLD:sdkmingw32 = "" do_install () { autotools_do_install diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb index 5dbaa0301..5dbaa0301 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.36.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.37.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb index 07a8e7c41..ca99e9113 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.36.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.37.bb @@ -15,9 +15,6 @@ do_configure[dirs] += "${B}/ld ${B}/bfd" do_configure() { # create config.h, oe enables initfini-array by default echo "#define HAVE_INITFINI_ARRAY" > ${B}/ld/config.h - # use the bfd_stdint.h from binutils-native, this is the same of the one - # generated by binutils-cross - cp ${RECIPE_SYSROOT_NATIVE}/usr/include/bfd_stdint.h ${B}/bfd/ } # target depends @@ -82,4 +79,3 @@ do_check() { done } addtask check after do_configure - diff --git a/poky/meta/recipes-devtools/binutils/binutils-cross_2.36.bb b/poky/meta/recipes-devtools/binutils/binutils-cross_2.37.bb index fbd1f7d25..fbd1f7d25 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-cross_2.36.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-cross_2.37.bb diff --git a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb index 37f4d6d2e..5bd036fd4 100644 --- a/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.36.bb +++ b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb @@ -8,6 +8,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" SRC_URI += "file://0001-binutils-crosssdk-Generate-relocatable-SDKs.patch" -do_configure_prepend () { +do_configure:prepend () { sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt } diff --git a/poky/meta/recipes-devtools/binutils/binutils.inc b/poky/meta/recipes-devtools/binutils/binutils.inc index 81891963c..7d5149fa1 100644 --- a/poky/meta/recipes-devtools/binutils/binutils.inc +++ b/poky/meta/recipes-devtools/binutils/binutils.inc @@ -15,7 +15,7 @@ DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-nativ inherit autotools gettext multilib_header texinfo -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ ${libdir}/lib*.so.* \ ${libdir}/bfd-plugins/lib*.so \ @@ -23,9 +23,9 @@ FILES_${PN} = " \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" -RPROVIDES_${PN} += "${PN}-symlinks" +RPROVIDES:${PN} += "${PN}-symlinks" -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ @@ -37,9 +37,9 @@ FILES_${PN}-dev = " \ # list and reuse it. LDGOLD_ALTS ?= "ld.gold dwp" -LDGOLD_ALTS_riscv64 = "" -LDGOLD_ALTS_riscv32 = "" -LDGOLD_ALTS_libc-glibc_mipsarch = "" +LDGOLD_ALTS:riscv64 = "" +LDGOLD_ALTS:riscv32 = "" +LDGOLD_ALTS:libc-glibc:mipsarch = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -61,7 +61,7 @@ USE_ALTERNATIVES_FOR = " \ strip \ " -python do_package_prepend() { +python do_package:prepend() { make_alts = d.getVar("USE_ALTERNATIVES_FOR") or "" prefix = d.getVar("TARGET_PREFIX") bindir = d.getVar("bindir") @@ -86,12 +86,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" EXTRA_TARGETS = "" -EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " -EXTRA_TARGETS_class-native = "" +EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS:class-native = "" -LDGOLD_class-native = "" -LDGOLD_class-crosssdk = "" -LDGOLD_libc-glibc_mipsarch = "" +LDGOLD:class-native = "" +LDGOLD:class-crosssdk = "" +LDGOLD:libc-glibc:mipsarch = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -170,15 +170,13 @@ do_install () { done oe_multilib_header bfd.h - # bfd_stdint.h encodes the compiler name in the header - sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},," } inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" +ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" python () { if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): diff --git a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 49dacfef8..53e30a0aa 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,4 +1,4 @@ -From 3b278a56a0e98d50ec62735598ee5f4b1834e8b3 Mon Sep 17 00:00:00 2001 +From 257ad1ce148417e1cefe2332d8acc5c8216c2522 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs diff --git a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index d07947404..a6ca41374 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From cf4c8a97b7dc1fe36a7d5dabed417fe18b15ad6b Mon Sep 17 00:00:00 2001 +From 6e93d0328f499569db7ce6396f94f304ce340df8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories diff --git a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index cc37d30c5..3c4f706f2 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,4 @@ -From 9701cab0fdf6a0c011978ae140c4c12a962956f6 Mon Sep 17 00:00:00 2001 +From d49016d3faf684319bf3ac37450558920d70be03 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Wed, 19 Feb 2020 09:51:16 -0800 Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index 2c9a487335c..3b01357b651 100644 +index f8e99325361..fd196541f59 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ @@ -43,10 +43,10 @@ index 2c9a487335c..3b01357b651 100644 NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) diff --git a/ld/Makefile.in b/ld/Makefile.in -index b41941c89e2..a6382bf2a45 100644 +index ef2e99e08da..cb8f5bfb70e 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -554,7 +554,8 @@ ZLIB = @zlibdir@ -lz +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -57,7 +57,7 @@ index b41941c89e2..a6382bf2a45 100644 AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) diff --git a/ld/ldelf.c b/ld/ldelf.c -index f7407ab55a7..b25781cc0c4 100644 +index 21e655bb55c..d1615003ede 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -911,7 +911,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, @@ -70,7 +70,7 @@ index f7407ab55a7..b25781cc0c4 100644 if (!ldelf_parse_ld_so_conf (&info, tmppath)) { diff --git a/ld/ldmain.c b/ld/ldmain.c -index 863df0293ea..080b1c4c6c2 100644 +index 42660eb9a3c..5a4a4d5da3d 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -70,6 +70,7 @@ char *program_name; @@ -82,7 +82,7 @@ index 863df0293ea..080b1c4c6c2 100644 /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; diff --git a/ld/ldmain.h b/ld/ldmain.h -index 38e63922d31..0966914938c 100644 +index 39d08a6c378..4c3519e7970 100644 --- a/ld/ldmain.h +++ b/ld/ldmain.h @@ -23,6 +23,7 @@ diff --git a/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch index 1cd459ae8..f476ff210 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -1,4 +1,4 @@ -From 7e7512c82402363688cca6f1febea2c01cb03409 Mon Sep 17 00:00:00 2001 +From b8d43b6b8d98e176346871c92935458b06598c5b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:07:33 +0000 Subject: [PATCH] configure: widen the regexp for SH architectures @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 68779feb42b..7b369071141 100755 +index 3dd206525a7..e8ba1a1d3de 100755 --- a/configure +++ b/configure -@@ -3887,7 +3887,7 @@ case "${target}" in +@@ -3892,7 +3892,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -27,10 +27,10 @@ index 68779feb42b..7b369071141 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index d16a2757689..92f01fb3ed7 100644 +index 797a624621e..3a8a3ae1f3b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1177,7 +1177,7 @@ case "${target}" in +@@ -1175,7 +1175,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; diff --git a/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index dde0cb5d6..7cd4a99d3 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From 6a67d277941228d997b527990960413f8444fb81 Mon Sep 17 00:00:00 2001 +From 1a9fcaae50e63b993019bd4dc00219e43421efdc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index 3b01357b651..b7a1f7491b0 100644 +index fd196541f59..d94fa7e64e1 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @@ -25,10 +25,10 @@ index 3b01357b651..b7a1f7491b0 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index a6382bf2a45..5ee3a4971be 100644 +index cb8f5bfb70e..9a58879c5ca 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -562,7 +562,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index caa5f0bdd..d6b04fdae 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 8ad249270414a23a3e65c74fd67a8e4adaebec78 Mon Sep 17 00:00:00 2001 +From 29517900352336708495d41902b5b7e8cc9a401a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/ld/ldelf.c b/ld/ldelf.c -index b25781cc0c4..77d7fb8ff03 100644 +index d1615003ede..6a894285b11 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c -@@ -1248,6 +1248,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, +@@ -1250,6 +1250,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, && command_line.rpath == NULL) { path = (const char *) getenv ("LD_RUN_PATH"); @@ -26,7 +26,7 @@ index b25781cc0c4..77d7fb8ff03 100644 if (path && ldelf_search_needed (path, &n, force, is_linux, elfsize)) -@@ -1608,6 +1610,8 @@ ldelf_before_allocation (char *audit, char *depaudit, +@@ -1610,6 +1612,8 @@ ldelf_before_allocation (char *audit, char *depaudit, rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); diff --git a/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index b13a35e02..39cef70bc 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From 091870218f192a5698c4420adf938e7178553c07 Mon Sep 17 00:00:00 2001 +From 37581c8ce9d98a1183706e12a2c9a73f7f40462d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 788590957e1..1bca4aafeb7 100644 +index 4f1213b983b..2ba18b75cac 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -367,7 +367,8 @@ install-strip: install diff --git a/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch index 5c148eaa9..c724dfd7a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From bb48edf1a87bbc711e8978dd1e9112fe953dc1bf Mon Sep 17 00:00:00 2001 +From 99e1565b9d2b929d4ee4e9da6f63766b22b23fc3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -62,11 +62,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> ld/lexsup.c | 16 ++++++++++++++++ 9 files changed, 86 insertions(+) -diff --git a/ld/config.in b/ld/config.in -index 7b60d778587..37b8e9b6f6c 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -40,6 +40,9 @@ +@@ -43,6 +43,9 @@ language is requested. */ #undef ENABLE_NLS @@ -76,11 +74,9 @@ index 7b60d778587..37b8e9b6f6c 100644 /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION -diff --git a/ld/configure b/ld/configure -index b0969791959..50bb04ce6a8 100755 --- a/ld/configure +++ b/ld/configure -@@ -828,6 +828,7 @@ with_lib_path +@@ -829,6 +829,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -88,8 +84,8 @@ index b0969791959..50bb04ce6a8 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1496,6 +1497,8 @@ Optional Features: - --disable-largefile omit support for large files +@@ -1498,6 +1499,8 @@ Optional Features: + --enable-checking enable run-time checks --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) + --enable-poison-system-directories @@ -97,7 +93,7 @@ index b0969791959..50bb04ce6a8 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -15820,6 +15823,19 @@ fi +@@ -15215,6 +15218,19 @@ fi @@ -117,11 +113,9 @@ index b0969791959..50bb04ce6a8 100755 # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in -diff --git a/ld/configure.ac b/ld/configure.ac -index c9c69ab9245..59dab0a6ac4 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) +@@ -106,6 +106,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -138,30 +132,26 @@ index c9c69ab9245..59dab0a6ac4 100644 dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 93f5af92c7d..ff7f71a7b66 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct +@@ -162,6 +162,14 @@ typedef struct in the linker script. */ - bfd_boolean force_group_allocation; + bool force_group_allocation; + /* If TRUE (the default) warn for uses of system directories when + cross linking. */ -+ bfd_boolean poison_system_directories; ++ bool poison_system_directories; + + /* If TRUE (default FALSE) give an error for uses of system + directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; ++ bool error_poison_system_directories; + /* Big or little endian as set on command line. */ enum endian_enum endian; -diff --git a/ld/ld.texi b/ld/ld.texi -index 7a602b9c6ab..cccbfbab3bb 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2810,6 +2810,18 @@ string identifying the original linked file does not change. +@@ -2863,6 +2863,18 @@ string identifying the original linked f Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -180,11 +170,9 @@ index 7a602b9c6ab..cccbfbab3bb 100644 @end table @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 81cb86d51e2..cd5c2752679 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *nam new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -208,11 +196,9 @@ index 81cb86d51e2..cd5c2752679 100644 } /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index b0101028321..77f5accb5d9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -161,6 +161,8 @@ enum option_values +@@ -163,6 +163,8 @@ enum option_values OPTION_CTF_VARIABLES, OPTION_NO_CTF_VARIABLES, OPTION_CTF_SHARE_TYPES, @@ -221,24 +207,38 @@ index b0101028321..77f5accb5d9 100644 }; /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 080b1c4c6c2..78d8a2df278 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -324,6 +324,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; +@@ -321,6 +321,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index f005a58a045..5eb8439fef7 100644 +@@ -1444,7 +1446,7 @@ undefined_symbol (struct bfd_link_info * + argv[1] = "undefined-symbol"; + argv[2] = (char *) name; + argv[3] = NULL; +- ++ + if (verbose) + einfo (_("%P: About to run error handling script '%s' with arguments: '%s' '%s'\n"), + argv[0], argv[1], argv[2]); +@@ -1465,7 +1467,7 @@ undefined_symbol (struct bfd_link_info * + carry on to issue the normal error message. */ + } + #endif /* SUPPORT_ERROR_HANDLING_SCRIPT */ +- ++ + if (section != NULL) + { + if (error_count < MAX_ERRORS_IN_A_ROW) --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -591,6 +591,14 @@ static const struct ld_option ld_options[] = +@@ -595,6 +595,14 @@ static const struct ld_option ld_options " <method> is: share-unconflicted (default),\n" " share-duplicated"), TWO_DASHES }, @@ -253,16 +253,16 @@ index f005a58a045..5eb8439fef7 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1676,6 +1684,14 @@ parse_args (unsigned argc, char **argv) - config.print_map_discarded = TRUE; +@@ -1686,6 +1694,14 @@ parse_args (unsigned argc, char **argv) + config.print_map_discarded = true; break; + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; ++ command_line.poison_system_directories = false; + break; + + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = true; + break; + case OPTION_DEPENDENCY_FILE: diff --git a/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch index b8a1939d3..fab92d52e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 5bd94030de598d3a13091dafaed3b956e0ab708f Mon Sep 17 00:00:00 2001 +From fb6d52dda9c230baf869ed5f981581a7b5094b70 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd -index e7b55b0dd78..2caf492e172 100644 +index 30087e3b8f8..1896e11790c 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -896,12 +896,12 @@ case "${targ}" in +@@ -891,12 +891,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -35,10 +35,10 @@ index e7b55b0dd78..2caf492e172 100644 mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec diff --git a/ld/configure.tgt b/ld/configure.tgt -index 0c780b24d57..47431770a17 100644 +index 6205d7c9872..c08533658e5 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks +@@ -530,12 +530,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks ;; mips*-*-windiss) targ_emul=elf32mipswindiss ;; diff --git a/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch b/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch index fe2d02f29..b2f7448a2 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From c64a5ca02a55b748311032e2c7d9c4f87bd74c63 Mon Sep 17 00:00:00 2001 +From 21920b7a3d10a7dae4c1f18a4bb185de78048e3f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -28,14 +28,14 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> gas/configure | 3 +++ gas/configure.ac | 3 +++ include/elf/mips.h | 1 + - include/opcode/mips.h | 6 ++++++ + include/opcode/mips.h | 8 +++++++- ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 15 files changed, 65 insertions(+), 21 deletions(-) + 15 files changed, 66 insertions(+), 22 deletions(-) diff --git a/bfd/aoutx.h b/bfd/aoutx.h -index 8025b8c5241..cdcb7876896 100644 +index 17560bd8f54..10b1cad74e6 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, @@ -47,7 +47,7 @@ index 8025b8c5241..cdcb7876896 100644 arch_flags = M_MIPS2; break; diff --git a/bfd/archures.c b/bfd/archures.c -index 8c1d32ca930..b4b2927ebc0 100644 +index 390691bfba1..b0b7a5fa7a0 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -59,10 +59,10 @@ index 8c1d32ca930..b4b2927ebc0 100644 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 7eff85b7eaa..6c9eb12865e 100644 +index 57b3c453649..a00b0d44359 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -1590,6 +1590,7 @@ enum bfd_architecture +@@ -1562,6 +1562,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -71,10 +71,10 @@ index 7eff85b7eaa..6c9eb12865e 100644 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 diff --git a/bfd/config.bfd b/bfd/config.bfd -index 2caf492e172..e75417da4d8 100644 +index 1896e11790c..8270fd2708d 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -879,6 +879,11 @@ case "${targ}" in +@@ -874,6 +874,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -87,7 +87,7 @@ index 2caf492e172..e75417da4d8 100644 targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c -index 5a944ceee81..c57d12ba3dd 100644 +index 76b507e3c77..c1563cf4319 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -108,7 +108,8 @@ enum @@ -101,17 +101,17 @@ index 5a944ceee81..c57d12ba3dd 100644 #define NN(index) (&arch_info_struct[(index) + 1]) @@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), - N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", false, NN(I_xlr)), + N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", false, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) -+ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), -+ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", false, NULL) ++ N (64, 64, bfd_mach_mips_micromips, "mips:micromips", false, NN(I_micromips)), ++ N (64, 64, bfd_mach_mips_xlp, "mips:xlp", false, NULL) }; /* The default architecture is mips:3000, but with a machine number of diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c -index 3cbb3cf9495..0c6cd47b40c 100644 +index e4827fd17de..fa8c2512837 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6980,6 +6980,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -124,7 +124,7 @@ index 3cbb3cf9495..0c6cd47b40c 100644 default: switch (flags & EF_MIPS_ARCH) { -@@ -12335,6 +12338,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12339,6 +12342,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -135,7 +135,7 @@ index 3cbb3cf9495..0c6cd47b40c 100644 case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14352,6 +14359,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = +@@ -14428,6 +14435,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -144,10 +144,10 @@ index 3cbb3cf9495..0c6cd47b40c 100644 /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, diff --git a/binutils/readelf.c b/binutils/readelf.c -index ad16b4571c9..4bf2b732502 100644 +index a6073f7ec80..2f2448b5eba 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3502,6 +3502,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) +@@ -3613,6 +3613,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -156,10 +156,10 @@ index ad16b4571c9..4bf2b732502 100644 /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c -index 538b69710f5..b021b64f14b 100644 +index 0201f816814..a3cfcdbe982 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c -@@ -568,6 +568,7 @@ static int mips_32bitmode = 0; +@@ -570,6 +570,7 @@ static int mips_32bitmode = 0; || mips_opts.arch == CPU_RM7000 \ || mips_opts.arch == CPU_VR5500 \ || mips_opts.micromips \ @@ -167,7 +167,7 @@ index 538b69710f5..b021b64f14b 100644 ) /* Whether the processor uses hardware interlocks to protect reads -@@ -597,6 +598,7 @@ static int mips_32bitmode = 0; +@@ -599,6 +600,7 @@ static int mips_32bitmode = 0; && mips_opts.isa != ISA_MIPS3) \ || mips_opts.arch == CPU_R4300 \ || mips_opts.micromips \ @@ -175,7 +175,7 @@ index 538b69710f5..b021b64f14b 100644 ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20156,7 +20158,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = +@@ -20157,7 +20159,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -185,10 +185,10 @@ index 538b69710f5..b021b64f14b 100644 /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, diff --git a/gas/configure b/gas/configure -index d03432c6dc6..d5ae54925e9 100755 +index 110d707f079..789d1b38b33 100755 --- a/gas/configure +++ b/gas/configure -@@ -12761,6 +12761,9 @@ _ACEOF +@@ -12083,6 +12083,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; @@ -199,10 +199,10 @@ index d03432c6dc6..d5ae54925e9 100755 mips_cpu=r3900 ;; diff --git a/gas/configure.ac b/gas/configure.ac -index 82706561886..f1c27bf2878 100644 +index 78efba88e23..c1b4ef6b3b0 100644 --- a/gas/configure.ac +++ b/gas/configure.ac -@@ -332,6 +332,9 @@ changequote([,])dnl +@@ -331,6 +331,9 @@ changequote([,])dnl mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; @@ -225,10 +225,19 @@ index 4bd86307120..2d7df22abf2 100644 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 diff --git a/include/opcode/mips.h b/include/opcode/mips.h -index d1b4a2574ac..879c68fcfd4 100644 +index 9add3c9d5bf..a99c53f652f 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { +@@ -1157,7 +1157,7 @@ mips_opcode_32bit_p (const struct mips_opcode *mo) + #define INSN_ISA32R3 8 + #define INSN_ISA32R5 9 + #define INSN_ISA32R6 10 +-#define INSN_ISA64 11 ++#define INSN_ISA64 11 + #define INSN_ISA64R2 12 + #define INSN_ISA64R3 13 + #define INSN_ISA64R5 14 +@@ -1265,6 +1265,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -237,7 +246,7 @@ index d1b4a2574ac..879c68fcfd4 100644 /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { +@@ -1389,6 +1391,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -245,21 +254,21 @@ index d1b4a2574ac..879c68fcfd4 100644 /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) - return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) - || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); +@@ -1459,6 +1462,9 @@ cpu_is_member (int cpu, unsigned int mask) + case CPU_INTERAPTIV_MR2: + return (mask & INSN_INTERAPTIV_MR2) != 0; + case CPU_XLP: + return (mask & INSN_XLP) != 0; + default: - return FALSE; + return false; } diff --git a/ld/configure.tgt b/ld/configure.tgt -index 47431770a17..f714744eab3 100644 +index c08533658e5..7abf32215c2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -509,6 +509,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; @@ -270,10 +279,10 @@ index 47431770a17..f714744eab3 100644 targ_extra_emuls="elf32lr5900" targ_extra_libpath=$targ_extra_emuls diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c -index 317ced51204..6869f890656 100644 +index 591caf11e28..00120afed47 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = +@@ -698,13 +698,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -293,10 +302,10 @@ index 317ced51204..6869f890656 100644 /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c -index b45eb40bf69..2f4eb5c0354 100644 +index db72c039bfd..ff2fa614de1 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c -@@ -328,6 +328,7 @@ decode_mips_operand (const char *p) +@@ -329,6 +329,7 @@ decode_mips_operand (const char *p) #define IOCT3 INSN_OCTEON3 #define XLR INSN_XLR #define IAMR2 INSN_INTERAPTIV_MR2 @@ -304,15 +313,15 @@ index b45eb40bf69..2f4eb5c0354 100644 #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -991,6 +992,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, +{"crc", "d,s,t", 0x7000001c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, /* ctc0 is at the bottom of the table. */ - {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, + {"ctc1", "t,g", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1023,12 +1025,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -327,7 +336,7 @@ index b45eb40bf69..2f4eb5c0354 100644 /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1100,6 +1103,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -335,16 +344,16 @@ index b45eb40bf69..2f4eb5c0354 100644 {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = - /* dmfc3 is at the bottom of the table. */ - /* dmtc3 is at the bottom of the table. */ +@@ -1113,6 +1117,8 @@ const struct mips_opcode mips_builtin_opcodes[] = + /* dmfc2 is at the bottom of the table. */ + /* dmtc2 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, +{"dmtur", "t,d", 0x7000001f, 0xffe007ff, RD_1, 0, XLP, 0, 0 }, +{"dmul", "d,s,t", 0x70000006, 0xfc0007ff, WR_1|RD_2|RD_3, 0, XLP, 0, 0 }, {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1266,9 +1272,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -357,7 +366,7 @@ index b45eb40bf69..2f4eb5c0354 100644 {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1437,7 +1443,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -366,7 +375,7 @@ index b45eb40bf69..2f4eb5c0354 100644 {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1482,10 +1488,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -382,7 +391,7 @@ index b45eb40bf69..2f4eb5c0354 100644 {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1535,7 +1544,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -391,7 +400,7 @@ index b45eb40bf69..2f4eb5c0354 100644 {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = +@@ -1977,9 +1986,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, @@ -401,6 +410,6 @@ index b45eb40bf69..2f4eb5c0354 100644 +{"swapw", "t,b", 0x70000014, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, +{"swapwu", "t,b", 0x70000015, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, +{"swapd", "t,b", 0x70000016, 0xfc00ffff, MOD_1|RD_2|SM, 0, XLR|XLP, 0, 0 }, - {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, - {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, + {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, I2 }, + {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, I2 }, {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, diff --git a/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index 1041b7301..389232c1e 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From 7f4938d062146e40b4e6d427a5eca6cc6acaaeee Mon Sep 17 00:00:00 2001 +From b77c5a67d4ac2513d0b4bab5e4dd1c33b339689b Mon Sep 17 00:00:00 2001 From: Zhenhua Luo <zhenhua.luo@nxp.com> Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,22 +11,22 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index bbbadffad8f..72092355e12 100644 +index 13d8b6c3c07..cd979f9c80c 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c -@@ -6302,8 +6302,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -6378,8 +6378,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, - {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}}, - {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, + {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, EXT, {0}}, + {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, EXT, {0}}, -{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}}, -{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}}, {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, -@@ -6363,7 +6361,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { +@@ -6433,7 +6431,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { - {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, - {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, + {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, + {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, EXT, {0}}, -{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, +{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}}, diff --git a/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch b/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch index 659ae799a..04f81c667 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From bb229568e505f2276ca58b72fef6781034fa839f Mon Sep 17 00:00:00 2001 +From 02374940dd34fddd2b04624af3f23e01f9cb81cd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets diff --git a/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch b/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch index d4067691c..a75e72105 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch @@ -1,4 +1,4 @@ -From a1031fca1b6c1348c078bb8a9df6e7d29148dae1 Mon Sep 17 00:00:00 2001 +From fd34d57c9e2a0bff1283a6707062ed4a42476b10 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:04:07 +0000 Subject: [PATCH] Use libtool 2.4 @@ -9,24 +9,24 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - bfd/configure | 1322 +++++++++++++++----- + bfd/configure | 1340 +++++++++++++++----- bfd/configure.ac | 2 +- - binutils/configure | 1320 +++++++++++++++----- - gas/configure | 1320 +++++++++++++++----- - gprof/configure | 1320 +++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------- - libctf/configure | 1319 +++++++++++++++----- - libtool.m4 | 1080 +++++++++++----- + binutils/configure | 1338 +++++++++++++++----- + gas/configure | 1338 +++++++++++++++----- + gprof/configure | 1338 +++++++++++++++----- + ld/configure | 1713 +++++++++++++++++++------- + libctf/configure | 1337 +++++++++++++++----- + libtool.m4 | 1100 +++++++++++------ ltmain.sh | 2925 +++++++++++++++++++++++++++++--------------- ltoptions.m4 | 2 +- ltversion.m4 | 12 +- lt~obsolete.m4 | 2 +- - opcodes/configure | 1320 +++++++++++++++----- - zlib/configure | 1320 +++++++++++++++----- - 14 files changed, 10931 insertions(+), 4028 deletions(-) + opcodes/configure | 1338 +++++++++++++++----- + zlib/configure | 1338 +++++++++++++++----- + 14 files changed, 10995 insertions(+), 4128 deletions(-) diff --git a/bfd/configure b/bfd/configure -index b3665c68c13..376b951d496 100755 +index daa51244369..79d0c4b4623 100755 --- a/bfd/configure +++ b/bfd/configure @@ -705,6 +705,9 @@ OTOOL @@ -47,7 +47,7 @@ index b3665c68c13..376b951d496 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1505,6 +1509,8 @@ Optional Packages: +@@ -1507,6 +1511,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -56,7 +56,7 @@ index b3665c68c13..376b951d496 100755 --with-mmap try using mmap for BFD input files if available --with-separate-debug-dir=DIR Look for global separate debug info in DIR -@@ -5694,8 +5700,8 @@ esac +@@ -4988,8 +4994,8 @@ esac @@ -67,7 +67,7 @@ index b3665c68c13..376b951d496 100755 -@@ -5735,7 +5741,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5029,7 +5035,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -76,7 +76,7 @@ index b3665c68c13..376b951d496 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6421,8 +6427,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5715,8 +5721,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -87,7 +87,7 @@ index b3665c68c13..376b951d496 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6471,6 +6477,80 @@ esac +@@ -5765,6 +5771,80 @@ esac @@ -168,7 +168,7 @@ index b3665c68c13..376b951d496 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6487,6 +6567,11 @@ case $reload_flag in +@@ -5781,6 +5861,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -180,7 +180,7 @@ index b3665c68c13..376b951d496 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6655,7 +6740,8 @@ mingw* | pw32*) +@@ -5949,7 +6034,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -190,7 +190,7 @@ index b3665c68c13..376b951d496 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6809,6 +6895,21 @@ esac +@@ -6103,6 +6189,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -212,7 +212,7 @@ index b3665c68c13..376b951d496 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6822,11 +6923,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6118,6 +6219,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -226,11 +226,7 @@ index b3665c68c13..376b951d496 100755 + + + - - - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -371,7 +367,15 @@ index b3665c68c13..376b951d496 100755 + + + -+if test -n "$ac_tool_prefix"; then + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -6132,8 +6384,10 @@ for plugin in $plugin_names; do + done + + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -379,7 +383,7 @@ index b3665c68c13..376b951d496 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6842,7 +7096,7 @@ do +@@ -6149,7 +6403,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -388,7 +392,7 @@ index b3665c68c13..376b951d496 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6862,11 +7116,15 @@ $as_echo "no" >&6; } +@@ -6169,11 +6423,15 @@ $as_echo "no" >&6; } fi @@ -407,7 +411,7 @@ index b3665c68c13..376b951d496 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6882,7 +7140,7 @@ do +@@ -6189,7 +6447,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -416,7 +420,7 @@ index b3665c68c13..376b951d496 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6901,6 +7159,10 @@ else +@@ -6208,6 +6466,10 @@ else $as_echo "no" >&6; } fi @@ -427,7 +431,7 @@ index b3665c68c13..376b951d496 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6912,16 +7174,72 @@ ac_tool_warned=yes ;; +@@ -6219,25 +6481,20 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -436,20 +440,37 @@ index b3665c68c13..376b951d496 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -6248,6 +6505,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -462,7 +483,7 @@ index b3665c68c13..376b951d496 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -488,23 +509,29 @@ index b3665c68c13..376b951d496 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi ++ ++ ++ ++ ++ ++ - - -@@ -7263,8 +7581,8 @@ esac + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +@@ -6588,8 +6902,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -515,7 +542,7 @@ index b3665c68c13..376b951d496 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7300,6 +7618,7 @@ for ac_symprfx in "" "_"; do +@@ -6625,6 +6939,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -523,7 +550,7 @@ index b3665c68c13..376b951d496 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7341,6 +7660,18 @@ _LT_EOF +@@ -6666,6 +6981,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -542,7 +569,7 @@ index b3665c68c13..376b951d496 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7352,7 +7683,7 @@ _LT_EOF +@@ -6677,7 +7004,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -551,7 +578,7 @@ index b3665c68c13..376b951d496 100755 const char *name; void *address; } -@@ -7378,8 +7709,8 @@ static const void *lt_preloaded_setup() { +@@ -6703,8 +7030,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -562,7 +589,7 @@ index b3665c68c13..376b951d496 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7389,8 +7720,8 @@ _LT_EOF +@@ -6714,8 +7041,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -573,7 +600,7 @@ index b3665c68c13..376b951d496 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7427,6 +7758,16 @@ else +@@ -6752,6 +7079,14 @@ else $as_echo "ok" >&6; } fi @@ -585,12 +612,10 @@ index b3665c68c13..376b951d496 100755 +fi + + -+ -+ -@@ -7443,6 +7784,45 @@ fi +@@ -6770,6 +7105,47 @@ fi @@ -633,10 +658,12 @@ index b3665c68c13..376b951d496 100755 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ -@@ -7654,6 +8034,123 @@ esac +@@ -6979,6 +7355,123 @@ esac need_locks="$enable_libtool_lock" @@ -760,7 +787,7 @@ index b3665c68c13..376b951d496 100755 case $host_os in rhapsody* | darwin*) -@@ -8217,6 +8714,8 @@ _LT_EOF +@@ -7542,6 +8035,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -769,7 +796,7 @@ index b3665c68c13..376b951d496 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8381,7 +8880,8 @@ fi +@@ -7706,7 +8201,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -779,7 +806,7 @@ index b3665c68c13..376b951d496 100755 -@@ -8470,7 +8970,7 @@ aix3*) +@@ -7795,7 +8291,7 @@ aix3*) esac # Global variables: @@ -788,7 +815,7 @@ index b3665c68c13..376b951d496 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8768,8 +9268,6 @@ fi +@@ -8093,8 +8589,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -797,7 +824,7 @@ index b3665c68c13..376b951d496 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8935,6 +9433,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8260,6 +8754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -810,7 +837,7 @@ index b3665c68c13..376b951d496 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8997,7 +9501,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8322,7 +8822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -819,7 +846,7 @@ index b3665c68c13..376b951d496 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9054,13 +9558,17 @@ case $host_os in +@@ -8379,13 +8879,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -843,7 +870,7 @@ index b3665c68c13..376b951d496 100755 # # Check to make sure the PIC flag actually works. -@@ -9121,6 +9629,11 @@ fi +@@ -8446,6 +8950,11 @@ fi @@ -855,7 +882,7 @@ index b3665c68c13..376b951d496 100755 # # Check to make sure the static flag actually works. # -@@ -9471,7 +9984,8 @@ _LT_EOF +@@ -8796,7 +9305,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -865,7 +892,7 @@ index b3665c68c13..376b951d496 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9570,12 +10084,12 @@ _LT_EOF +@@ -8895,12 +9405,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -880,7 +907,7 @@ index b3665c68c13..376b951d496 100755 fi ;; esac -@@ -9589,8 +10103,8 @@ _LT_EOF +@@ -8914,8 +9424,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -891,7 +918,7 @@ index b3665c68c13..376b951d496 100755 fi ;; -@@ -9608,8 +10122,8 @@ _LT_EOF +@@ -8933,8 +9443,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -902,7 +929,7 @@ index b3665c68c13..376b951d496 100755 else ld_shlibs=no fi -@@ -9655,8 +10169,8 @@ _LT_EOF +@@ -8980,8 +9490,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -913,7 +940,7 @@ index b3665c68c13..376b951d496 100755 else ld_shlibs=no fi -@@ -9786,7 +10300,13 @@ _LT_EOF +@@ -9111,7 +9621,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -928,7 +955,7 @@ index b3665c68c13..376b951d496 100755 /* end confdefs.h. */ int -@@ -9799,22 +10319,29 @@ main () +@@ -9124,22 +9640,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -971,7 +998,7 @@ index b3665c68c13..376b951d496 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9826,7 +10353,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9151,7 +9674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -986,7 +1013,7 @@ index b3665c68c13..376b951d496 100755 /* end confdefs.h. */ int -@@ -9839,22 +10372,29 @@ main () +@@ -9164,22 +9693,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -1029,7 +1056,7 @@ index b3665c68c13..376b951d496 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9899,20 +10439,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9224,20 +9760,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1107,7 +1134,7 @@ index b3665c68c13..376b951d496 100755 ;; darwin* | rhapsody*) -@@ -9973,7 +10556,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9298,7 +9877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1116,7 +1143,7 @@ index b3665c68c13..376b951d496 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9981,7 +10564,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9306,7 +9885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1125,7 +1152,7 @@ index b3665c68c13..376b951d496 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9997,7 +10580,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9322,7 +9901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1134,7 +1161,7 @@ index b3665c68c13..376b951d496 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10021,10 +10604,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9346,10 +9925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1147,7 +1174,7 @@ index b3665c68c13..376b951d496 100755 ;; esac else -@@ -10103,23 +10686,36 @@ fi +@@ -9428,23 +10007,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -1192,7 +1219,7 @@ index b3665c68c13..376b951d496 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10204,7 +10800,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9529,7 +10121,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1201,7 +1228,7 @@ index b3665c68c13..376b951d496 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10223,9 +10819,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9548,9 +10140,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1213,7 +1240,7 @@ index b3665c68c13..376b951d496 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10801,8 +11397,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10126,8 +10718,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -1225,7 +1252,7 @@ index b3665c68c13..376b951d496 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10835,13 +11432,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10160,13 +10753,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -1298,7 +1325,7 @@ index b3665c68c13..376b951d496 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10923,7 +11578,7 @@ haiku*) +@@ -10248,7 +10899,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -1307,16 +1334,16 @@ index b3665c68c13..376b951d496 100755 hardcode_into_libs=yes ;; -@@ -11719,7 +12374,7 @@ else +@@ -11044,7 +11695,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11722 "configure" +-#line 11047 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11763,10 +12418,10 @@ else +@@ -11088,10 +11739,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -1329,16 +1356,16 @@ index b3665c68c13..376b951d496 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11825,7 +12480,7 @@ else +@@ -11150,7 +11801,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11828 "configure" +-#line 11153 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11869,10 +12524,10 @@ else +@@ -11194,10 +11845,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -1351,16 +1378,16 @@ index b3665c68c13..376b951d496 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14599,7 +15254,7 @@ SHARED_LDFLAGS= +@@ -13114,7 +13765,7 @@ SHARED_LDFLAGS= if test "$enable_shared" = "yes"; then x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" fi + fi - case "${host}" in -@@ -17199,13 +17854,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15762,13 +16413,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -1381,7 +1408,7 @@ index b3665c68c13..376b951d496 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17220,14 +17882,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15783,14 +16441,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -1400,7 +1427,7 @@ index b3665c68c13..376b951d496 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17260,12 +17925,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15823,12 +16484,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -1414,7 +1441,7 @@ index b3665c68c13..376b951d496 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17320,8 +17985,13 @@ reload_flag \ +@@ -15883,8 +16544,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1428,7 +1455,7 @@ index b3665c68c13..376b951d496 100755 STRIP \ RANLIB \ CC \ -@@ -17331,12 +18001,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15894,12 +16560,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -1444,7 +1471,7 @@ index b3665c68c13..376b951d496 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17352,7 +18024,6 @@ no_undefined_flag \ +@@ -15915,7 +16583,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1452,7 +1479,7 @@ index b3665c68c13..376b951d496 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17388,6 +18059,7 @@ module_cmds \ +@@ -15951,6 +16618,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1460,7 +1487,7 @@ index b3665c68c13..376b951d496 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18176,7 +18848,8 @@ $as_echo X"$file" | +@@ -16720,7 +17388,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1470,7 +1497,7 @@ index b3665c68c13..376b951d496 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18279,19 +18952,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16823,19 +17492,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1514,7 +1541,7 @@ index b3665c68c13..376b951d496 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -18321,6 +19017,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16865,6 +17557,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -1527,7 +1554,7 @@ index b3665c68c13..376b951d496 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18330,6 +19032,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16874,6 +17572,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1537,7 +1564,7 @@ index b3665c68c13..376b951d496 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -18444,12 +19149,12 @@ with_gcc=$GCC +@@ -16988,12 +17689,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1553,7 +1580,7 @@ index b3665c68c13..376b951d496 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18536,9 +19241,6 @@ inherit_rpath=$inherit_rpath +@@ -17080,9 +17781,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1563,7 +1590,7 @@ index b3665c68c13..376b951d496 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18554,6 +19256,9 @@ include_expsyms=$lt_include_expsyms +@@ -17098,6 +17796,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1573,7 +1600,7 @@ index b3665c68c13..376b951d496 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18586,210 +19291,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17130,210 +17831,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -1948,23 +1975,23 @@ index b3665c68c13..376b951d496 100755 chmod +x "$ofile" diff --git a/bfd/configure.ac b/bfd/configure.ac -index 0797a08ff37..133d714cf18 100644 +index 07a75ed1626..288374c504c 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -315,7 +315,7 @@ changequote(,)dnl +@@ -304,7 +304,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" fi + fi - case "${host}" in diff --git a/binutils/configure b/binutils/configure -index 83b4b0172db..2154238189e 100755 +index bf6461dab1e..8e6f6d30b4d 100755 --- a/binutils/configure +++ b/binutils/configure -@@ -697,8 +697,11 @@ OTOOL +@@ -696,8 +696,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1976,7 +2003,7 @@ index 83b4b0172db..2154238189e 100755 OBJDUMP LN_S NM -@@ -815,6 +818,7 @@ enable_static +@@ -814,6 +817,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1984,7 +2011,7 @@ index 83b4b0172db..2154238189e 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: +@@ -1509,6 +1513,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1993,7 +2020,7 @@ index 83b4b0172db..2154238189e 100755 --with-debuginfod Enable debuginfo lookups with debuginfod (auto/yes/no) --with-system-zlib use installed libz -@@ -5490,8 +5496,8 @@ esac +@@ -4844,8 +4850,8 @@ esac @@ -2004,7 +2031,7 @@ index 83b4b0172db..2154238189e 100755 -@@ -5531,7 +5537,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4885,7 +4891,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -2013,7 +2040,7 @@ index 83b4b0172db..2154238189e 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6217,8 +6223,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5571,8 +5577,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2024,7 +2051,7 @@ index 83b4b0172db..2154238189e 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6267,6 +6273,80 @@ esac +@@ -5621,6 +5627,80 @@ esac @@ -2105,7 +2132,7 @@ index 83b4b0172db..2154238189e 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6283,6 +6363,11 @@ case $reload_flag in +@@ -5637,6 +5717,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2117,7 +2144,7 @@ index 83b4b0172db..2154238189e 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6451,7 +6536,8 @@ mingw* | pw32*) +@@ -5805,7 +5890,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2127,7 +2154,7 @@ index 83b4b0172db..2154238189e 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6605,6 +6691,21 @@ esac +@@ -5959,6 +6045,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -2149,7 +2176,7 @@ index 83b4b0172db..2154238189e 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6620,9 +6721,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5974,6 +6075,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2304,6 +2331,12 @@ index 83b4b0172db..2154238189e 100755 + + + + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -5988,8 +6240,10 @@ for plugin in $plugin_names; do + done + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -2314,7 +2347,7 @@ index 83b4b0172db..2154238189e 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6638,7 +6892,7 @@ do +@@ -6005,7 +6259,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2323,7 +2356,7 @@ index 83b4b0172db..2154238189e 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6658,11 +6912,15 @@ $as_echo "no" >&6; } +@@ -6025,11 +6279,15 @@ $as_echo "no" >&6; } fi @@ -2342,7 +2375,7 @@ index 83b4b0172db..2154238189e 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6678,7 +6936,7 @@ do +@@ -6045,7 +6303,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2351,7 +2384,7 @@ index 83b4b0172db..2154238189e 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6697,6 +6955,10 @@ else +@@ -6064,6 +6322,10 @@ else $as_echo "no" >&6; } fi @@ -2362,7 +2395,7 @@ index 83b4b0172db..2154238189e 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6708,12 +6970,10 @@ ac_tool_warned=yes ;; +@@ -6075,29 +6337,81 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2371,16 +2404,40 @@ index 83b4b0172db..2154238189e 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -6725,6 +6985,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -2393,7 +2450,7 @@ index 83b4b0172db..2154238189e 100755 +int +main () +{ -+ + + ; + return 0; +} @@ -2419,30 +2476,23 @@ index 83b4b0172db..2154238189e 100755 + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7059,8 +7377,8 @@ esac + + + +@@ -6444,8 +6758,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -2453,7 +2503,7 @@ index 83b4b0172db..2154238189e 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7096,6 +7414,7 @@ for ac_symprfx in "" "_"; do +@@ -6481,6 +6795,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -2461,7 +2511,7 @@ index 83b4b0172db..2154238189e 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7137,6 +7456,18 @@ _LT_EOF +@@ -6522,6 +6837,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -2480,7 +2530,7 @@ index 83b4b0172db..2154238189e 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7148,7 +7479,7 @@ _LT_EOF +@@ -6533,7 +6860,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2489,7 +2539,7 @@ index 83b4b0172db..2154238189e 100755 const char *name; void *address; } -@@ -7174,8 +7505,8 @@ static const void *lt_preloaded_setup() { +@@ -6559,8 +6886,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2500,7 +2550,7 @@ index 83b4b0172db..2154238189e 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7185,8 +7516,8 @@ _LT_EOF +@@ -6570,8 +6897,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2511,7 +2561,7 @@ index 83b4b0172db..2154238189e 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7223,6 +7554,21 @@ else +@@ -6608,6 +6935,19 @@ else $as_echo "ok" >&6; } fi @@ -2528,17 +2578,17 @@ index 83b4b0172db..2154238189e 100755 + + + -+ -+ -@@ -7239,6 +7585,40 @@ fi +@@ -6624,6 +6964,42 @@ fi + + ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -2574,7 +2624,7 @@ index 83b4b0172db..2154238189e 100755 -@@ -7450,6 +7830,123 @@ esac +@@ -6835,6 +7211,123 @@ esac need_locks="$enable_libtool_lock" @@ -2698,7 +2748,7 @@ index 83b4b0172db..2154238189e 100755 case $host_os in rhapsody* | darwin*) -@@ -8013,6 +8510,8 @@ _LT_EOF +@@ -7398,6 +7891,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -2707,7 +2757,7 @@ index 83b4b0172db..2154238189e 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8208,7 +8707,8 @@ fi +@@ -7593,7 +8088,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2717,7 +2767,7 @@ index 83b4b0172db..2154238189e 100755 -@@ -8297,7 +8797,7 @@ aix3*) +@@ -7682,7 +8178,7 @@ aix3*) esac # Global variables: @@ -2726,7 +2776,7 @@ index 83b4b0172db..2154238189e 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8595,8 +9095,6 @@ fi +@@ -7980,8 +8476,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2735,7 +2785,7 @@ index 83b4b0172db..2154238189e 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8762,6 +9260,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8147,6 +8641,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2748,7 +2798,7 @@ index 83b4b0172db..2154238189e 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8824,7 +9328,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8209,7 +8709,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2757,7 +2807,7 @@ index 83b4b0172db..2154238189e 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8881,13 +9385,17 @@ case $host_os in +@@ -8266,13 +8766,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2781,7 +2831,7 @@ index 83b4b0172db..2154238189e 100755 # # Check to make sure the PIC flag actually works. -@@ -8948,6 +9456,11 @@ fi +@@ -8333,6 +8837,11 @@ fi @@ -2793,7 +2843,7 @@ index 83b4b0172db..2154238189e 100755 # # Check to make sure the static flag actually works. # -@@ -9298,7 +9811,8 @@ _LT_EOF +@@ -8683,7 +9192,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2803,7 +2853,7 @@ index 83b4b0172db..2154238189e 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9397,12 +9911,12 @@ _LT_EOF +@@ -8782,12 +9292,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2818,7 +2868,7 @@ index 83b4b0172db..2154238189e 100755 fi ;; esac -@@ -9416,8 +9930,8 @@ _LT_EOF +@@ -8801,8 +9311,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2829,7 +2879,7 @@ index 83b4b0172db..2154238189e 100755 fi ;; -@@ -9435,8 +9949,8 @@ _LT_EOF +@@ -8820,8 +9330,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2840,7 +2890,7 @@ index 83b4b0172db..2154238189e 100755 else ld_shlibs=no fi -@@ -9482,8 +9996,8 @@ _LT_EOF +@@ -8867,8 +9377,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2851,7 +2901,7 @@ index 83b4b0172db..2154238189e 100755 else ld_shlibs=no fi -@@ -9613,7 +10127,13 @@ _LT_EOF +@@ -8998,7 +9508,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2866,7 +2916,7 @@ index 83b4b0172db..2154238189e 100755 /* end confdefs.h. */ int -@@ -9626,22 +10146,29 @@ main () +@@ -9011,22 +9527,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2909,7 +2959,7 @@ index 83b4b0172db..2154238189e 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9653,7 +10180,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9038,7 +9561,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -2924,7 +2974,7 @@ index 83b4b0172db..2154238189e 100755 /* end confdefs.h. */ int -@@ -9666,22 +10199,29 @@ main () +@@ -9051,22 +9580,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2967,7 +3017,7 @@ index 83b4b0172db..2154238189e 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9726,20 +10266,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9111,20 +9647,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3045,7 +3095,7 @@ index 83b4b0172db..2154238189e 100755 ;; darwin* | rhapsody*) -@@ -9800,7 +10383,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9185,7 +9764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3054,7 +3104,7 @@ index 83b4b0172db..2154238189e 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9808,7 +10391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9193,7 +9772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3063,7 +3113,7 @@ index 83b4b0172db..2154238189e 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9824,7 +10407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9209,7 +9788,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3072,7 +3122,7 @@ index 83b4b0172db..2154238189e 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9848,10 +10431,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9233,10 +9812,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3085,7 +3135,7 @@ index 83b4b0172db..2154238189e 100755 ;; esac else -@@ -9930,23 +10513,36 @@ fi +@@ -9315,23 +9894,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3130,7 +3180,7 @@ index 83b4b0172db..2154238189e 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10031,7 +10627,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9416,7 +10008,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3139,7 +3189,7 @@ index 83b4b0172db..2154238189e 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10050,9 +10646,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9435,9 +10027,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3151,7 +3201,7 @@ index 83b4b0172db..2154238189e 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10628,8 +11224,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10013,8 +10605,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3163,7 +3213,7 @@ index 83b4b0172db..2154238189e 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10662,13 +11259,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10047,13 +10640,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -3236,7 +3286,7 @@ index 83b4b0172db..2154238189e 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10750,7 +11405,7 @@ haiku*) +@@ -10135,7 +10786,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3245,16 +3295,16 @@ index 83b4b0172db..2154238189e 100755 hardcode_into_libs=yes ;; -@@ -11546,7 +12201,7 @@ else +@@ -10931,7 +11582,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11549 "configure" +-#line 10934 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11590,10 +12245,10 @@ else +@@ -10975,10 +11626,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3267,16 +3317,16 @@ index 83b4b0172db..2154238189e 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11652,7 +12307,7 @@ else +@@ -11037,7 +11688,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11655 "configure" +-#line 11040 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11696,10 +12351,10 @@ else +@@ -11081,10 +11732,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3289,7 +3339,7 @@ index 83b4b0172db..2154238189e 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -16308,13 +16963,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -15455,13 +16106,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -3310,7 +3360,7 @@ index 83b4b0172db..2154238189e 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16329,14 +16991,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -15476,14 +16134,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -3329,7 +3379,7 @@ index 83b4b0172db..2154238189e 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16369,12 +17034,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -15516,12 +16177,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -3343,7 +3393,7 @@ index 83b4b0172db..2154238189e 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16429,8 +17094,13 @@ reload_flag \ +@@ -15576,8 +16237,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3357,7 +3407,7 @@ index 83b4b0172db..2154238189e 100755 STRIP \ RANLIB \ CC \ -@@ -16440,12 +17110,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -15587,12 +16253,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -3373,7 +3423,7 @@ index 83b4b0172db..2154238189e 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16461,7 +17133,6 @@ no_undefined_flag \ +@@ -15608,7 +16276,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3381,7 +3431,7 @@ index 83b4b0172db..2154238189e 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16497,6 +17168,7 @@ module_cmds \ +@@ -15644,6 +16311,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3389,7 +3439,7 @@ index 83b4b0172db..2154238189e 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -17263,7 +17935,8 @@ $as_echo X"$file" | +@@ -16410,7 +17078,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -3399,7 +3449,7 @@ index 83b4b0172db..2154238189e 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17366,19 +18039,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16513,19 +17182,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3443,7 +3493,7 @@ index 83b4b0172db..2154238189e 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17408,6 +18104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -16555,6 +17247,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -3456,7 +3506,7 @@ index 83b4b0172db..2154238189e 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17417,6 +18119,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -16564,6 +17262,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3466,7 +3516,7 @@ index 83b4b0172db..2154238189e 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17531,12 +18236,12 @@ with_gcc=$GCC +@@ -16678,12 +17379,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3482,7 +3532,7 @@ index 83b4b0172db..2154238189e 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17623,9 +18328,6 @@ inherit_rpath=$inherit_rpath +@@ -16770,9 +17471,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3492,7 +3542,7 @@ index 83b4b0172db..2154238189e 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17641,6 +18343,9 @@ include_expsyms=$lt_include_expsyms +@@ -16788,6 +17486,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3502,7 +3552,7 @@ index 83b4b0172db..2154238189e 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17673,210 +18378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16820,210 +17521,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -3877,10 +3927,10 @@ index 83b4b0172db..2154238189e 100755 chmod +x "$ofile" diff --git a/gas/configure b/gas/configure -index d5ae54925e9..3ff1148d9dd 100755 +index 789d1b38b33..7ac563a13ad 100755 --- a/gas/configure +++ b/gas/configure -@@ -682,8 +682,11 @@ OTOOL +@@ -681,8 +681,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -3892,7 +3942,7 @@ index d5ae54925e9..3ff1148d9dd 100755 OBJDUMP LN_S NM -@@ -800,6 +803,7 @@ enable_static +@@ -799,6 +802,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -3900,7 +3950,7 @@ index d5ae54925e9..3ff1148d9dd 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1491,6 +1495,8 @@ Optional Packages: +@@ -1490,6 +1494,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -3909,7 +3959,7 @@ index d5ae54925e9..3ff1148d9dd 100755 --with-cpu=CPU default cpu variant is CPU (currently only supported on ARC) --with-system-zlib use installed libz -@@ -5278,8 +5284,8 @@ esac +@@ -4569,8 +4575,8 @@ esac @@ -3920,7 +3970,7 @@ index d5ae54925e9..3ff1148d9dd 100755 -@@ -5319,7 +5325,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4610,7 +4616,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -3929,7 +3979,7 @@ index d5ae54925e9..3ff1148d9dd 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6005,8 +6011,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5296,8 +5302,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -3940,7 +3990,7 @@ index d5ae54925e9..3ff1148d9dd 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6055,6 +6061,80 @@ esac +@@ -5346,6 +5352,80 @@ esac @@ -4021,7 +4071,7 @@ index d5ae54925e9..3ff1148d9dd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6071,6 +6151,11 @@ case $reload_flag in +@@ -5362,6 +5442,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -4033,7 +4083,7 @@ index d5ae54925e9..3ff1148d9dd 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6239,7 +6324,8 @@ mingw* | pw32*) +@@ -5530,7 +5615,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -4043,7 +4093,7 @@ index d5ae54925e9..3ff1148d9dd 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6393,6 +6479,21 @@ esac +@@ -5684,6 +5770,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -4065,7 +4115,7 @@ index d5ae54925e9..3ff1148d9dd 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6408,9 +6509,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5699,6 +5800,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4220,6 +4270,12 @@ index d5ae54925e9..3ff1148d9dd 100755 + + + + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -5713,8 +5965,10 @@ for plugin in $plugin_names; do + done + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -4230,7 +4286,7 @@ index d5ae54925e9..3ff1148d9dd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6426,7 +6680,7 @@ do +@@ -5730,7 +5984,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -4239,7 +4295,7 @@ index d5ae54925e9..3ff1148d9dd 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6446,11 +6700,15 @@ $as_echo "no" >&6; } +@@ -5750,11 +6004,15 @@ $as_echo "no" >&6; } fi @@ -4258,7 +4314,7 @@ index d5ae54925e9..3ff1148d9dd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6466,7 +6724,7 @@ do +@@ -5770,7 +6028,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -4267,7 +4323,7 @@ index d5ae54925e9..3ff1148d9dd 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6485,6 +6743,10 @@ else +@@ -5789,6 +6047,10 @@ else $as_echo "no" >&6; } fi @@ -4278,7 +4334,7 @@ index d5ae54925e9..3ff1148d9dd 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6496,12 +6758,10 @@ ac_tool_warned=yes ;; +@@ -5800,29 +6062,81 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -4287,16 +4343,40 @@ index d5ae54925e9..3ff1148d9dd 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -6513,6 +6773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -4309,7 +4389,7 @@ index d5ae54925e9..3ff1148d9dd 100755 +int +main () +{ -+ + + ; + return 0; +} @@ -4335,30 +4415,23 @@ index d5ae54925e9..3ff1148d9dd 100755 + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6847,8 +7165,8 @@ esac + + + +@@ -6169,8 +6483,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -4369,7 +4442,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6884,6 +7202,7 @@ for ac_symprfx in "" "_"; do +@@ -6206,6 +6520,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -4377,7 +4450,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6925,6 +7244,18 @@ _LT_EOF +@@ -6247,6 +6562,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -4396,7 +4469,7 @@ index d5ae54925e9..3ff1148d9dd 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6936,7 +7267,7 @@ _LT_EOF +@@ -6258,7 +6585,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -4405,7 +4478,7 @@ index d5ae54925e9..3ff1148d9dd 100755 const char *name; void *address; } -@@ -6962,8 +7293,8 @@ static const void *lt_preloaded_setup() { +@@ -6284,8 +6611,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4416,7 +4489,7 @@ index d5ae54925e9..3ff1148d9dd 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6973,8 +7304,8 @@ _LT_EOF +@@ -6295,8 +6622,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -4427,7 +4500,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7011,6 +7342,21 @@ else +@@ -6333,6 +6660,19 @@ else $as_echo "ok" >&6; } fi @@ -4444,17 +4517,17 @@ index d5ae54925e9..3ff1148d9dd 100755 + + + -+ -+ -@@ -7027,6 +7373,40 @@ fi +@@ -6349,6 +6689,42 @@ fi + + ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -4490,7 +4563,7 @@ index d5ae54925e9..3ff1148d9dd 100755 -@@ -7238,6 +7618,123 @@ esac +@@ -6560,6 +6936,123 @@ esac need_locks="$enable_libtool_lock" @@ -4614,7 +4687,7 @@ index d5ae54925e9..3ff1148d9dd 100755 case $host_os in rhapsody* | darwin*) -@@ -7801,6 +8298,8 @@ _LT_EOF +@@ -7123,6 +7616,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -4623,7 +4696,7 @@ index d5ae54925e9..3ff1148d9dd 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7996,7 +8495,8 @@ fi +@@ -7318,7 +7813,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -4633,7 +4706,7 @@ index d5ae54925e9..3ff1148d9dd 100755 -@@ -8085,7 +8585,7 @@ aix3*) +@@ -7407,7 +7903,7 @@ aix3*) esac # Global variables: @@ -4642,7 +4715,7 @@ index d5ae54925e9..3ff1148d9dd 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8383,8 +8883,6 @@ fi +@@ -7705,8 +8201,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -4651,7 +4724,7 @@ index d5ae54925e9..3ff1148d9dd 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8550,6 +9048,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7872,6 +8366,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4664,7 +4737,7 @@ index d5ae54925e9..3ff1148d9dd 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8612,7 +9116,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7934,7 +8434,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4673,7 +4746,7 @@ index d5ae54925e9..3ff1148d9dd 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8669,13 +9173,17 @@ case $host_os in +@@ -7991,13 +8491,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -4697,7 +4770,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # # Check to make sure the PIC flag actually works. -@@ -8736,6 +9244,11 @@ fi +@@ -8058,6 +8562,11 @@ fi @@ -4709,7 +4782,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # # Check to make sure the static flag actually works. # -@@ -9086,7 +9599,8 @@ _LT_EOF +@@ -8408,7 +8917,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -4719,7 +4792,7 @@ index d5ae54925e9..3ff1148d9dd 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9185,12 +9699,12 @@ _LT_EOF +@@ -8507,12 +9017,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -4734,7 +4807,7 @@ index d5ae54925e9..3ff1148d9dd 100755 fi ;; esac -@@ -9204,8 +9718,8 @@ _LT_EOF +@@ -8526,8 +9036,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -4745,7 +4818,7 @@ index d5ae54925e9..3ff1148d9dd 100755 fi ;; -@@ -9223,8 +9737,8 @@ _LT_EOF +@@ -8545,8 +9055,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4756,7 +4829,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else ld_shlibs=no fi -@@ -9270,8 +9784,8 @@ _LT_EOF +@@ -8592,8 +9102,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4767,7 +4840,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else ld_shlibs=no fi -@@ -9401,7 +9915,13 @@ _LT_EOF +@@ -8723,7 +9233,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -4782,7 +4855,7 @@ index d5ae54925e9..3ff1148d9dd 100755 /* end confdefs.h. */ int -@@ -9414,22 +9934,29 @@ main () +@@ -8736,22 +9252,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4825,7 +4898,7 @@ index d5ae54925e9..3ff1148d9dd 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9441,7 +9968,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8763,7 +9286,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -4840,7 +4913,7 @@ index d5ae54925e9..3ff1148d9dd 100755 /* end confdefs.h. */ int -@@ -9454,22 +9987,29 @@ main () +@@ -8776,22 +9305,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4883,7 +4956,7 @@ index d5ae54925e9..3ff1148d9dd 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9514,20 +10054,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8836,20 +9372,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4961,7 +5034,7 @@ index d5ae54925e9..3ff1148d9dd 100755 ;; darwin* | rhapsody*) -@@ -9588,7 +10171,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8910,7 +9489,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4970,7 +5043,7 @@ index d5ae54925e9..3ff1148d9dd 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9596,7 +10179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8918,7 +9497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -4979,7 +5052,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9612,7 +10195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8934,7 +9513,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -4988,7 +5061,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9636,10 +10219,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8958,10 +9537,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -5001,7 +5074,7 @@ index d5ae54925e9..3ff1148d9dd 100755 ;; esac else -@@ -9718,23 +10301,36 @@ fi +@@ -9040,23 +9619,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -5046,7 +5119,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9819,7 +10415,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9141,7 +9733,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5055,7 +5128,7 @@ index d5ae54925e9..3ff1148d9dd 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9838,9 +10434,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9160,9 +9752,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5067,7 +5140,7 @@ index d5ae54925e9..3ff1148d9dd 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10416,8 +11012,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9738,8 +10330,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -5079,7 +5152,7 @@ index d5ae54925e9..3ff1148d9dd 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10450,13 +11047,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9772,13 +10365,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -5152,7 +5225,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10538,7 +11193,7 @@ haiku*) +@@ -9860,7 +10511,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -5161,16 +5234,16 @@ index d5ae54925e9..3ff1148d9dd 100755 hardcode_into_libs=yes ;; -@@ -11334,7 +11989,7 @@ else +@@ -10656,7 +11307,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11337 "configure" +-#line 10659 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11378,10 +12033,10 @@ else +@@ -10700,10 +11351,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5183,16 +5256,16 @@ index d5ae54925e9..3ff1148d9dd 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11440,7 +12095,7 @@ else +@@ -10762,7 +11413,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11443 "configure" +-#line 10765 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11484,10 +12139,10 @@ else +@@ -10806,10 +11457,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5205,7 +5278,7 @@ index d5ae54925e9..3ff1148d9dd 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -16020,13 +16675,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -14785,13 +15436,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -5226,7 +5299,7 @@ index d5ae54925e9..3ff1148d9dd 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -16041,14 +16703,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -14806,14 +15464,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -5245,7 +5318,7 @@ index d5ae54925e9..3ff1148d9dd 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -16081,12 +16746,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -14846,12 +15507,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -5259,7 +5332,7 @@ index d5ae54925e9..3ff1148d9dd 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16141,8 +16806,13 @@ reload_flag \ +@@ -14906,8 +15567,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5273,7 +5346,7 @@ index d5ae54925e9..3ff1148d9dd 100755 STRIP \ RANLIB \ CC \ -@@ -16152,12 +16822,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -14917,12 +15583,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -5289,7 +5362,7 @@ index d5ae54925e9..3ff1148d9dd 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16173,7 +16845,6 @@ no_undefined_flag \ +@@ -14938,7 +15606,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5297,7 +5370,7 @@ index d5ae54925e9..3ff1148d9dd 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16209,6 +16880,7 @@ module_cmds \ +@@ -14974,6 +15641,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5305,7 +5378,7 @@ index d5ae54925e9..3ff1148d9dd 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16982,7 +17654,8 @@ $as_echo X"$file" | +@@ -15747,7 +16415,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -5315,7 +5388,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -17085,19 +17758,42 @@ SP2NL=$lt_lt_SP2NL +@@ -15850,19 +16519,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5359,7 +5432,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -17127,6 +17823,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -15892,6 +16584,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -5372,7 +5445,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17136,6 +17838,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -15901,6 +16599,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5382,7 +5455,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17250,12 +17955,12 @@ with_gcc=$GCC +@@ -16015,12 +16716,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5398,7 +5471,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17342,9 +18047,6 @@ inherit_rpath=$inherit_rpath +@@ -16107,9 +16808,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5408,7 +5481,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17360,6 +18062,9 @@ include_expsyms=$lt_include_expsyms +@@ -16125,6 +16823,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5418,7 +5491,7 @@ index d5ae54925e9..3ff1148d9dd 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17392,210 +18097,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -16157,210 +16858,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -5793,7 +5866,7 @@ index d5ae54925e9..3ff1148d9dd 100755 chmod +x "$ofile" diff --git a/gprof/configure b/gprof/configure -index b12ec2e472f..57986ca995a 100755 +index 5703bba4462..e1ac86ec797 100755 --- a/gprof/configure +++ b/gprof/configure @@ -663,8 +663,11 @@ OTOOL @@ -5825,7 +5898,7 @@ index b12ec2e472f..57986ca995a 100755 Some influential environment variables: CC C compiler command -@@ -5125,8 +5131,8 @@ esac +@@ -4471,8 +4477,8 @@ esac @@ -5836,7 +5909,7 @@ index b12ec2e472f..57986ca995a 100755 -@@ -5166,7 +5172,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4512,7 +4518,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -5845,7 +5918,7 @@ index b12ec2e472f..57986ca995a 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5852,8 +5858,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5198,8 +5204,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5856,7 +5929,7 @@ index b12ec2e472f..57986ca995a 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -5902,6 +5908,80 @@ esac +@@ -5248,6 +5254,80 @@ esac @@ -5937,7 +6010,7 @@ index b12ec2e472f..57986ca995a 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5918,6 +5998,11 @@ case $reload_flag in +@@ -5264,6 +5344,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -5949,7 +6022,7 @@ index b12ec2e472f..57986ca995a 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6086,7 +6171,8 @@ mingw* | pw32*) +@@ -5432,7 +5517,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5959,7 +6032,7 @@ index b12ec2e472f..57986ca995a 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6240,6 +6326,21 @@ esac +@@ -5586,6 +5672,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -5981,7 +6054,7 @@ index b12ec2e472f..57986ca995a 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6253,11 +6354,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5601,6 +5702,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5995,11 +6068,7 @@ index b12ec2e472f..57986ca995a 100755 + + + - - - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -6140,7 +6209,15 @@ index b12ec2e472f..57986ca995a 100755 + + + -+if test -n "$ac_tool_prefix"; then + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -5615,8 +5867,10 @@ for plugin in $plugin_names; do + done + + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -6148,7 +6225,7 @@ index b12ec2e472f..57986ca995a 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6273,7 +6527,7 @@ do +@@ -5632,7 +5886,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -6157,7 +6234,7 @@ index b12ec2e472f..57986ca995a 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6293,11 +6547,15 @@ $as_echo "no" >&6; } +@@ -5652,11 +5906,15 @@ $as_echo "no" >&6; } fi @@ -6176,7 +6253,7 @@ index b12ec2e472f..57986ca995a 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6313,7 +6571,7 @@ do +@@ -5672,7 +5930,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -6185,7 +6262,7 @@ index b12ec2e472f..57986ca995a 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6332,6 +6590,10 @@ else +@@ -5691,6 +5949,10 @@ else $as_echo "no" >&6; } fi @@ -6196,7 +6273,7 @@ index b12ec2e472f..57986ca995a 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6343,16 +6605,72 @@ ac_tool_warned=yes ;; +@@ -5702,25 +5964,19 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6205,20 +6282,36 @@ index b12ec2e472f..57986ca995a 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -5732,6 +5988,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -6231,7 +6324,7 @@ index b12ec2e472f..57986ca995a 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -6257,23 +6350,30 @@ index b12ec2e472f..57986ca995a 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi - - - -@@ -6694,8 +7012,8 @@ esac ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +@@ -6071,8 +6385,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -6284,7 +6384,7 @@ index b12ec2e472f..57986ca995a 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -6731,6 +7049,7 @@ for ac_symprfx in "" "_"; do +@@ -6108,6 +6422,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -6292,7 +6392,7 @@ index b12ec2e472f..57986ca995a 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -6772,6 +7091,18 @@ _LT_EOF +@@ -6149,6 +6464,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -6311,7 +6411,7 @@ index b12ec2e472f..57986ca995a 100755 #ifdef __cplusplus extern "C" { #endif -@@ -6783,7 +7114,7 @@ _LT_EOF +@@ -6160,7 +6487,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -6320,7 +6420,7 @@ index b12ec2e472f..57986ca995a 100755 const char *name; void *address; } -@@ -6809,8 +7140,8 @@ static const void *lt_preloaded_setup() { +@@ -6186,8 +6513,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6331,7 +6431,7 @@ index b12ec2e472f..57986ca995a 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6820,8 +7151,8 @@ _LT_EOF +@@ -6197,8 +6524,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6342,7 +6442,7 @@ index b12ec2e472f..57986ca995a 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6858,6 +7189,20 @@ else +@@ -6235,6 +6562,18 @@ else $as_echo "ok" >&6; } fi @@ -6358,18 +6458,18 @@ index b12ec2e472f..57986ca995a 100755 + + + -+ -+ -@@ -6874,6 +7219,41 @@ fi +@@ -6251,6 +6590,43 @@ fi + + + ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -6405,7 +6505,7 @@ index b12ec2e472f..57986ca995a 100755 -@@ -7085,6 +7465,123 @@ esac +@@ -6462,6 +6838,123 @@ esac need_locks="$enable_libtool_lock" @@ -6529,7 +6629,7 @@ index b12ec2e472f..57986ca995a 100755 case $host_os in rhapsody* | darwin*) -@@ -7648,6 +8145,8 @@ _LT_EOF +@@ -7025,6 +7518,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -6538,7 +6638,7 @@ index b12ec2e472f..57986ca995a 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7843,7 +8342,8 @@ fi +@@ -7220,7 +7715,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -6548,7 +6648,7 @@ index b12ec2e472f..57986ca995a 100755 -@@ -7932,7 +8432,7 @@ aix3*) +@@ -7309,7 +7805,7 @@ aix3*) esac # Global variables: @@ -6557,7 +6657,7 @@ index b12ec2e472f..57986ca995a 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8230,8 +8730,6 @@ fi +@@ -7607,8 +8103,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6566,7 +6666,7 @@ index b12ec2e472f..57986ca995a 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8397,6 +8895,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7774,6 +8268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6579,7 +6679,7 @@ index b12ec2e472f..57986ca995a 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8459,7 +8963,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7836,7 +8336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6588,7 +6688,7 @@ index b12ec2e472f..57986ca995a 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8516,13 +9020,17 @@ case $host_os in +@@ -7893,13 +8393,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6612,7 +6712,7 @@ index b12ec2e472f..57986ca995a 100755 # # Check to make sure the PIC flag actually works. -@@ -8583,6 +9091,11 @@ fi +@@ -7960,6 +8464,11 @@ fi @@ -6624,7 +6724,7 @@ index b12ec2e472f..57986ca995a 100755 # # Check to make sure the static flag actually works. # -@@ -8933,7 +9446,8 @@ _LT_EOF +@@ -8310,7 +8819,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -6634,7 +6734,7 @@ index b12ec2e472f..57986ca995a 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9032,12 +9546,12 @@ _LT_EOF +@@ -8409,12 +8919,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -6649,7 +6749,7 @@ index b12ec2e472f..57986ca995a 100755 fi ;; esac -@@ -9051,8 +9565,8 @@ _LT_EOF +@@ -8428,8 +8938,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -6660,7 +6760,7 @@ index b12ec2e472f..57986ca995a 100755 fi ;; -@@ -9070,8 +9584,8 @@ _LT_EOF +@@ -8447,8 +8957,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6671,7 +6771,7 @@ index b12ec2e472f..57986ca995a 100755 else ld_shlibs=no fi -@@ -9117,8 +9631,8 @@ _LT_EOF +@@ -8494,8 +9004,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -6682,7 +6782,7 @@ index b12ec2e472f..57986ca995a 100755 else ld_shlibs=no fi -@@ -9248,7 +9762,13 @@ _LT_EOF +@@ -8625,7 +9135,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -6697,7 +6797,7 @@ index b12ec2e472f..57986ca995a 100755 /* end confdefs.h. */ int -@@ -9261,22 +9781,29 @@ main () +@@ -8638,22 +9154,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6740,7 +6840,7 @@ index b12ec2e472f..57986ca995a 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9288,7 +9815,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8665,7 +9188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -6755,7 +6855,7 @@ index b12ec2e472f..57986ca995a 100755 /* end confdefs.h. */ int -@@ -9301,22 +9834,29 @@ main () +@@ -8678,22 +9207,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -6798,7 +6898,7 @@ index b12ec2e472f..57986ca995a 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9361,20 +9901,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8738,20 +9274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6876,7 +6976,7 @@ index b12ec2e472f..57986ca995a 100755 ;; darwin* | rhapsody*) -@@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8812,7 +9391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6885,7 +6985,7 @@ index b12ec2e472f..57986ca995a 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8820,7 +9399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6894,7 +6994,7 @@ index b12ec2e472f..57986ca995a 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8836,7 +9415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6903,7 +7003,7 @@ index b12ec2e472f..57986ca995a 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8860,10 +9439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6916,7 +7016,7 @@ index b12ec2e472f..57986ca995a 100755 ;; esac else -@@ -9565,23 +10148,36 @@ fi +@@ -8942,23 +9521,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -6961,7 +7061,7 @@ index b12ec2e472f..57986ca995a 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9043,7 +9635,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -6970,7 +7070,7 @@ index b12ec2e472f..57986ca995a 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9062,9 +9654,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -6982,7 +7082,7 @@ index b12ec2e472f..57986ca995a 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9640,8 +10232,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -6994,7 +7094,7 @@ index b12ec2e472f..57986ca995a 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9674,13 +10267,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -7067,7 +7167,7 @@ index b12ec2e472f..57986ca995a 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10385,7 +11040,7 @@ haiku*) +@@ -9762,7 +10413,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -7076,16 +7176,16 @@ index b12ec2e472f..57986ca995a 100755 hardcode_into_libs=yes ;; -@@ -11181,7 +11836,7 @@ else +@@ -10558,7 +11209,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11184 "configure" +-#line 10561 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11225,10 +11880,10 @@ else +@@ -10602,10 +11253,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -7098,16 +7198,16 @@ index b12ec2e472f..57986ca995a 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11287,7 +11942,7 @@ else +@@ -10664,7 +11315,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11290 "configure" +-#line 10667 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11331,10 +11986,10 @@ else +@@ -10708,10 +11359,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -7120,7 +7220,7 @@ index b12ec2e472f..57986ca995a 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13341,13 +13996,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -12731,13 +13382,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -7141,7 +7241,7 @@ index b12ec2e472f..57986ca995a 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13362,14 +14024,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12752,14 +13410,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -7160,7 +7260,7 @@ index b12ec2e472f..57986ca995a 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13402,12 +14067,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -12792,12 +13453,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -7174,7 +7274,7 @@ index b12ec2e472f..57986ca995a 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13462,8 +14127,13 @@ reload_flag \ +@@ -12852,8 +13513,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -7188,7 +7288,7 @@ index b12ec2e472f..57986ca995a 100755 STRIP \ RANLIB \ CC \ -@@ -13473,12 +14143,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12863,12 +13529,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -7204,7 +7304,7 @@ index b12ec2e472f..57986ca995a 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13494,7 +14166,6 @@ no_undefined_flag \ +@@ -12884,7 +13552,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -7212,7 +7312,7 @@ index b12ec2e472f..57986ca995a 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13530,6 +14201,7 @@ module_cmds \ +@@ -12920,6 +13587,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -7220,7 +7320,7 @@ index b12ec2e472f..57986ca995a 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14295,7 +14967,8 @@ $as_echo X"$file" | +@@ -13685,7 +14353,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -7230,7 +7330,7 @@ index b12ec2e472f..57986ca995a 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14398,19 +15071,42 @@ SP2NL=$lt_lt_SP2NL +@@ -13788,19 +14457,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -7274,7 +7374,7 @@ index b12ec2e472f..57986ca995a 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14440,6 +15136,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -13830,6 +14522,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -7287,7 +7387,7 @@ index b12ec2e472f..57986ca995a 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14449,6 +15151,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -13839,6 +14537,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -7297,7 +7397,7 @@ index b12ec2e472f..57986ca995a 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14563,12 +15268,12 @@ with_gcc=$GCC +@@ -13953,12 +14654,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -7313,7 +7413,7 @@ index b12ec2e472f..57986ca995a 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -14655,9 +15360,6 @@ inherit_rpath=$inherit_rpath +@@ -14045,9 +14746,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -7323,7 +7423,7 @@ index b12ec2e472f..57986ca995a 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -14673,6 +15375,9 @@ include_expsyms=$lt_include_expsyms +@@ -14063,6 +14761,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -7333,7 +7433,7 @@ index b12ec2e472f..57986ca995a 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -14705,210 +15410,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14095,210 +14796,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -7708,7 +7808,7 @@ index b12ec2e472f..57986ca995a 100755 chmod +x "$ofile" diff --git a/ld/configure b/ld/configure -index 8355c433c76..a49ab3d1f09 100755 +index 2aeb3317b65..5ef46d31558 100755 --- a/ld/configure +++ b/ld/configure @@ -693,8 +693,11 @@ OTOOL @@ -7731,7 +7831,7 @@ index 8355c433c76..a49ab3d1f09 100755 enable_libtool_lock enable_plugins enable_largefile -@@ -1526,6 +1530,8 @@ Optional Packages: +@@ -1528,6 +1532,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7740,7 +7840,7 @@ index 8355c433c76..a49ab3d1f09 100755 --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. --with-system-zlib use installed libz -@@ -5979,8 +5985,8 @@ esac +@@ -5327,8 +5333,8 @@ esac @@ -7751,7 +7851,7 @@ index 8355c433c76..a49ab3d1f09 100755 -@@ -6020,7 +6026,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5368,7 +5374,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7760,7 +7860,7 @@ index 8355c433c76..a49ab3d1f09 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6706,8 +6712,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6054,8 +6060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7771,7 +7871,7 @@ index 8355c433c76..a49ab3d1f09 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6756,6 +6762,80 @@ esac +@@ -6104,6 +6110,80 @@ esac @@ -7852,7 +7952,7 @@ index 8355c433c76..a49ab3d1f09 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6772,6 +6852,11 @@ case $reload_flag in +@@ -6120,6 +6200,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7864,7 +7964,7 @@ index 8355c433c76..a49ab3d1f09 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6940,7 +7025,8 @@ mingw* | pw32*) +@@ -6288,7 +6373,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7874,7 +7974,7 @@ index 8355c433c76..a49ab3d1f09 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7094,6 +7180,21 @@ esac +@@ -6442,6 +6528,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -7896,7 +7996,7 @@ index 8355c433c76..a49ab3d1f09 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7109,9 +7210,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6457,6 +6558,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8051,6 +8151,12 @@ index 8355c433c76..a49ab3d1f09 100755 + + + + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -6471,8 +6723,10 @@ for plugin in $plugin_names; do + done + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -8061,7 +8167,7 @@ index 8355c433c76..a49ab3d1f09 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7127,7 +7381,7 @@ do +@@ -6488,7 +6742,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8070,7 +8176,7 @@ index 8355c433c76..a49ab3d1f09 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7147,11 +7401,15 @@ $as_echo "no" >&6; } +@@ -6508,11 +6762,15 @@ $as_echo "no" >&6; } fi @@ -8089,7 +8195,7 @@ index 8355c433c76..a49ab3d1f09 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7167,7 +7425,7 @@ do +@@ -6528,7 +6786,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8098,7 +8204,7 @@ index 8355c433c76..a49ab3d1f09 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7186,6 +7444,10 @@ else +@@ -6547,6 +6805,10 @@ else $as_echo "no" >&6; } fi @@ -8109,7 +8215,7 @@ index 8355c433c76..a49ab3d1f09 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7197,12 +7459,12 @@ ac_tool_warned=yes ;; +@@ -6558,25 +6820,19 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8118,15 +8224,33 @@ index 8355c433c76..a49ab3d1f09 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} -+ -+ -@@ -7212,6 +7474,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6588,6 +6844,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8186,10 +8310,12 @@ index 8355c433c76..a49ab3d1f09 100755 + + + - - ++ ++ if test -n "$ac_tool_prefix"; then -@@ -7548,8 +7866,8 @@ esac + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +@@ -6927,8 +7241,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8200,7 +8326,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7585,6 +7903,7 @@ for ac_symprfx in "" "_"; do +@@ -6964,6 +7278,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8208,7 +8334,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7626,6 +7945,18 @@ _LT_EOF +@@ -7005,6 +7320,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8227,7 +8353,7 @@ index 8355c433c76..a49ab3d1f09 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7637,7 +7968,7 @@ _LT_EOF +@@ -7016,7 +7343,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8236,7 +8362,7 @@ index 8355c433c76..a49ab3d1f09 100755 const char *name; void *address; } -@@ -7663,8 +7994,8 @@ static const void *lt_preloaded_setup() { +@@ -7042,8 +7369,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8247,7 +8373,7 @@ index 8355c433c76..a49ab3d1f09 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7674,8 +8005,8 @@ _LT_EOF +@@ -7053,8 +7380,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8258,7 +8384,7 @@ index 8355c433c76..a49ab3d1f09 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7712,6 +8043,19 @@ else +@@ -7091,6 +7418,17 @@ else $as_echo "ok" >&6; } fi @@ -8273,12 +8399,10 @@ index 8355c433c76..a49ab3d1f09 100755 + + + -+ -+ -@@ -7728,6 +8072,42 @@ fi +@@ -7107,6 +7445,44 @@ fi @@ -8286,6 +8410,8 @@ index 8355c433c76..a49ab3d1f09 100755 + + + ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -8321,7 +8447,7 @@ index 8355c433c76..a49ab3d1f09 100755 -@@ -7939,6 +8319,123 @@ esac +@@ -7318,6 +7694,123 @@ esac need_locks="$enable_libtool_lock" @@ -8445,7 +8571,7 @@ index 8355c433c76..a49ab3d1f09 100755 case $host_os in rhapsody* | darwin*) -@@ -8502,6 +8999,8 @@ _LT_EOF +@@ -7881,6 +8374,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8454,7 +8580,7 @@ index 8355c433c76..a49ab3d1f09 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8570,6 +9069,16 @@ done +@@ -7949,6 +8444,16 @@ done @@ -8471,7 +8597,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Set options -@@ -8698,7 +9207,8 @@ fi +@@ -8077,7 +8582,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8481,7 +8607,7 @@ index 8355c433c76..a49ab3d1f09 100755 -@@ -8787,7 +9297,7 @@ aix3*) +@@ -8166,7 +8672,7 @@ aix3*) esac # Global variables: @@ -8490,7 +8616,7 @@ index 8355c433c76..a49ab3d1f09 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9085,8 +9595,6 @@ fi +@@ -8464,8 +8970,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8499,7 +8625,7 @@ index 8355c433c76..a49ab3d1f09 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9252,6 +9760,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8631,6 +9135,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8512,7 +8638,7 @@ index 8355c433c76..a49ab3d1f09 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9314,7 +9828,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8693,7 +9203,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8521,7 +8647,7 @@ index 8355c433c76..a49ab3d1f09 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9371,13 +9885,17 @@ case $host_os in +@@ -8750,13 +9260,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8545,7 +8671,7 @@ index 8355c433c76..a49ab3d1f09 100755 # # Check to make sure the PIC flag actually works. -@@ -9438,6 +9956,11 @@ fi +@@ -8817,6 +9331,11 @@ fi @@ -8557,7 +8683,7 @@ index 8355c433c76..a49ab3d1f09 100755 # # Check to make sure the static flag actually works. # -@@ -9788,7 +10311,8 @@ _LT_EOF +@@ -9167,7 +9686,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8567,7 +8693,7 @@ index 8355c433c76..a49ab3d1f09 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9887,12 +10411,12 @@ _LT_EOF +@@ -9266,12 +9786,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8582,7 +8708,7 @@ index 8355c433c76..a49ab3d1f09 100755 fi ;; esac -@@ -9906,8 +10430,8 @@ _LT_EOF +@@ -9285,8 +9805,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8593,7 +8719,7 @@ index 8355c433c76..a49ab3d1f09 100755 fi ;; -@@ -9925,8 +10449,8 @@ _LT_EOF +@@ -9304,8 +9824,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8604,7 +8730,7 @@ index 8355c433c76..a49ab3d1f09 100755 else ld_shlibs=no fi -@@ -9972,8 +10496,8 @@ _LT_EOF +@@ -9351,8 +9871,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8615,7 +8741,7 @@ index 8355c433c76..a49ab3d1f09 100755 else ld_shlibs=no fi -@@ -10103,7 +10627,13 @@ _LT_EOF +@@ -9482,7 +10002,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8630,7 +8756,7 @@ index 8355c433c76..a49ab3d1f09 100755 /* end confdefs.h. */ int -@@ -10116,22 +10646,29 @@ main () +@@ -9495,22 +10021,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8673,7 +8799,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10143,7 +10680,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9522,7 +10055,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8688,7 +8814,7 @@ index 8355c433c76..a49ab3d1f09 100755 /* end confdefs.h. */ int -@@ -10156,22 +10699,29 @@ main () +@@ -9535,22 +10074,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8731,7 +8857,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10215,21 +10765,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9594,21 +10140,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -8811,7 +8937,7 @@ index 8355c433c76..a49ab3d1f09 100755 ;; darwin* | rhapsody*) -@@ -10290,7 +10883,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9669,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8820,7 +8946,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10298,7 +10891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9677,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8829,7 +8955,7 @@ index 8355c433c76..a49ab3d1f09 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10314,7 +10907,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9693,7 +10282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8838,7 +8964,7 @@ index 8355c433c76..a49ab3d1f09 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10338,10 +10931,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9717,10 +10306,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8851,7 +8977,7 @@ index 8355c433c76..a49ab3d1f09 100755 ;; esac else -@@ -10420,23 +11013,36 @@ fi +@@ -9799,23 +10388,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8896,7 +9022,7 @@ index 8355c433c76..a49ab3d1f09 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10521,7 +11127,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9900,7 +10502,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8905,7 +9031,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10540,9 +11146,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9919,9 +10521,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8917,7 +9043,7 @@ index 8355c433c76..a49ab3d1f09 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11118,8 +11724,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10497,8 +11099,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8929,7 +9055,7 @@ index 8355c433c76..a49ab3d1f09 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11152,13 +11759,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10531,13 +11134,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9002,7 +9128,7 @@ index 8355c433c76..a49ab3d1f09 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11240,7 +11905,7 @@ haiku*) +@@ -10619,7 +11280,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9011,16 +9137,16 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_into_libs=yes ;; -@@ -12036,7 +12701,7 @@ else +@@ -11415,7 +12076,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12036 "configure" +-#line 11415 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12080,10 +12745,10 @@ else +@@ -11459,10 +12120,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9033,16 +9159,16 @@ index 8355c433c76..a49ab3d1f09 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12142,7 +12807,7 @@ else +@@ -11521,7 +12182,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12142 "configure" +-#line 11521 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12186,10 +12851,10 @@ else +@@ -11565,10 +12226,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9055,7 +9181,7 @@ index 8355c433c76..a49ab3d1f09 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12581,6 +13246,7 @@ $RM -r conftest* +@@ -11960,6 +12621,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9063,7 +9189,7 @@ index 8355c433c76..a49ab3d1f09 100755 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12598,6 +13264,7 @@ $RM -r conftest* +@@ -11977,6 +12639,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9071,7 +9197,7 @@ index 8355c433c76..a49ab3d1f09 100755 compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12880,7 +13547,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -12259,7 +12922,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9086,7 +9212,7 @@ index 8355c433c76..a49ab3d1f09 100755 /* end confdefs.h. */ int -@@ -12893,22 +13566,29 @@ main () +@@ -12272,22 +12941,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9129,7 +9255,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12921,7 +13601,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12300,7 +12976,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9144,7 +9270,7 @@ index 8355c433c76..a49ab3d1f09 100755 /* end confdefs.h. */ int -@@ -12934,22 +13620,29 @@ main () +@@ -12313,22 +12995,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9187,7 +9313,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12992,29 +13685,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12371,29 +13060,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9286,7 +9412,7 @@ index 8355c433c76..a49ab3d1f09 100755 darwin* | rhapsody*) -@@ -13120,7 +13859,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12499,7 +13234,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9295,7 +9421,7 @@ index 8355c433c76..a49ab3d1f09 100755 else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13191,10 +13930,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12570,10 +13305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9308,7 +9434,7 @@ index 8355c433c76..a49ab3d1f09 100755 ;; esac fi -@@ -13235,9 +13974,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12614,9 +13349,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9320,7 +9446,7 @@ index 8355c433c76..a49ab3d1f09 100755 fi fi link_all_deplibs_CXX=yes -@@ -13307,20 +14046,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12686,20 +13421,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9345,7 +9471,7 @@ index 8355c433c76..a49ab3d1f09 100755 ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13515,7 +14254,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12894,7 +13629,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9354,7 +9480,7 @@ index 8355c433c76..a49ab3d1f09 100755 ;; esac -@@ -13561,7 +14300,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12940,7 +13675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9363,7 +9489,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13602,9 +14341,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -12981,9 +13716,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9375,7 +9501,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13739,6 +14478,13 @@ private: +@@ -13118,6 +13853,13 @@ private: }; _LT_EOF @@ -9389,7 +9515,7 @@ index 8355c433c76..a49ab3d1f09 100755 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13752,7 +14498,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13131,7 +13873,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9398,7 +9524,7 @@ index 8355c433c76..a49ab3d1f09 100755 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13761,13 +14507,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13140,13 +13882,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9425,7 +9551,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13787,8 +14542,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +@@ -13166,8 +13917,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9436,7 +9562,7 @@ index 8355c433c76..a49ab3d1f09 100755 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13824,6 +14581,7 @@ else +@@ -13203,6 +13956,7 @@ else fi $RM -f confest.$objext @@ -9444,7 +9570,7 @@ index 8355c433c76..a49ab3d1f09 100755 # PORTME: override above test on systems where it is broken case $host_os in -@@ -13859,7 +14617,7 @@ linux*) +@@ -13238,7 +13992,7 @@ linux*) solaris*) case $cc_basename in @@ -9453,7 +9579,7 @@ index 8355c433c76..a49ab3d1f09 100755 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13924,8 +14682,6 @@ fi +@@ -13303,8 +14057,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9462,7 +9588,7 @@ index 8355c433c76..a49ab3d1f09 100755 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14030,6 +14786,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -13409,6 +14161,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9474,7 +9600,7 @@ index 8355c433c76..a49ab3d1f09 100755 dgux*) case $cc_basename in ec++*) -@@ -14182,7 +14943,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -13561,7 +14318,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9483,7 +9609,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14247,10 +15008,17 @@ case $host_os in +@@ -13626,10 +14383,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9504,7 +9630,7 @@ index 8355c433c76..a49ab3d1f09 100755 # # Check to make sure the PIC flag actually works. -@@ -14308,6 +15076,8 @@ fi +@@ -13687,6 +14451,8 @@ fi @@ -9513,7 +9639,7 @@ index 8355c433c76..a49ab3d1f09 100755 # # Check to make sure the static flag actually works. # -@@ -14485,6 +15255,7 @@ fi +@@ -13864,6 +14630,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9521,7 +9647,7 @@ index 8355c433c76..a49ab3d1f09 100755 case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14499,15 +15270,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie +@@ -13878,15 +14645,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9547,7 +9673,7 @@ index 8355c433c76..a49ab3d1f09 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14770,8 +15546,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14149,8 +14921,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9559,7 +9685,7 @@ index 8355c433c76..a49ab3d1f09 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14803,13 +15580,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14182,13 +14955,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9632,7 +9758,7 @@ index 8355c433c76..a49ab3d1f09 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14890,7 +15725,7 @@ haiku*) +@@ -14269,7 +15100,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9641,7 +9767,7 @@ index 8355c433c76..a49ab3d1f09 100755 hardcode_into_libs=yes ;; -@@ -15349,6 +16184,7 @@ fi +@@ -14728,6 +15559,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9649,7 +9775,7 @@ index 8355c433c76..a49ab3d1f09 100755 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -18612,13 +19448,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -17770,13 +18602,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9670,7 +9796,7 @@ index 8355c433c76..a49ab3d1f09 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18633,14 +19476,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -17791,14 +18630,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -9689,7 +9815,7 @@ index 8355c433c76..a49ab3d1f09 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18673,12 +19519,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -17831,12 +18673,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9703,7 +9829,7 @@ index 8355c433c76..a49ab3d1f09 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18717,8 +19563,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote +@@ -17875,8 +18717,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9713,7 +9839,7 @@ index 8355c433c76..a49ab3d1f09 100755 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18745,12 +19591,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ +@@ -17903,12 +18745,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9727,7 +9853,7 @@ index 8355c433c76..a49ab3d1f09 100755 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18788,8 +19634,13 @@ reload_flag \ +@@ -17946,8 +18788,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9741,7 +9867,7 @@ index 8355c433c76..a49ab3d1f09 100755 STRIP \ RANLIB \ CC \ -@@ -18799,12 +19650,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17957,12 +18804,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9757,7 +9883,7 @@ index 8355c433c76..a49ab3d1f09 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18820,7 +19673,6 @@ no_undefined_flag \ +@@ -17978,7 +18827,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9765,7 +9891,7 @@ index 8355c433c76..a49ab3d1f09 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18842,8 +19694,8 @@ LD_CXX \ +@@ -18000,8 +18848,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9775,7 +9901,7 @@ index 8355c433c76..a49ab3d1f09 100755 lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18855,7 +19707,6 @@ no_undefined_flag_CXX \ +@@ -18013,7 +18861,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9783,7 +9909,7 @@ index 8355c433c76..a49ab3d1f09 100755 exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18889,6 +19740,7 @@ module_cmds \ +@@ -18047,6 +18894,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9791,7 +9917,7 @@ index 8355c433c76..a49ab3d1f09 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18903,7 +19755,8 @@ archive_expsym_cmds_CXX \ +@@ -18061,7 +18909,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9801,7 +9927,7 @@ index 8355c433c76..a49ab3d1f09 100755 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19668,7 +20521,8 @@ $as_echo X"$file" | +@@ -18826,7 +19675,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9811,7 +9937,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19771,19 +20625,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18929,19 +19779,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9855,7 +9981,7 @@ index 8355c433c76..a49ab3d1f09 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -19813,6 +20690,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -18971,6 +19844,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9868,7 +9994,7 @@ index 8355c433c76..a49ab3d1f09 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19822,6 +20705,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18980,6 +19859,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9878,7 +10004,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19936,12 +20822,12 @@ with_gcc=$GCC +@@ -19094,12 +19976,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9894,7 +10020,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -20028,9 +20914,6 @@ inherit_rpath=$inherit_rpath +@@ -19186,9 +20068,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9904,7 +10030,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -20046,6 +20929,9 @@ include_expsyms=$lt_include_expsyms +@@ -19204,6 +20083,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9914,7 +10040,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -20092,210 +20978,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19250,210 +20132,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10288,7 +10414,7 @@ index 8355c433c76..a49ab3d1f09 100755 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -20323,12 +21168,12 @@ with_gcc=$GCC_CXX +@@ -19481,12 +20322,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10304,7 +10430,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -20415,9 +21260,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -19573,9 +20414,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10314,7 +10440,7 @@ index 8355c433c76..a49ab3d1f09 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -20433,6 +21275,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -19591,6 +20429,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10325,10 +10451,10 @@ index 8355c433c76..a49ab3d1f09 100755 file_list_spec=$lt_file_list_spec_CXX diff --git a/libctf/configure b/libctf/configure -index 6b294bfebfb..52a025bb848 100755 +index 82bcf13a606..a7fb723a145 100755 --- a/libctf/configure +++ b/libctf/configure -@@ -663,6 +663,8 @@ OTOOL +@@ -666,6 +666,8 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -10337,7 +10463,7 @@ index 6b294bfebfb..52a025bb848 100755 OBJDUMP LN_S NM -@@ -790,6 +792,7 @@ enable_static +@@ -797,6 +799,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -10345,7 +10471,7 @@ index 6b294bfebfb..52a025bb848 100755 enable_libtool_lock enable_largefile enable_werror_always -@@ -1452,6 +1455,8 @@ Optional Packages: +@@ -1460,6 +1463,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -10354,7 +10480,7 @@ index 6b294bfebfb..52a025bb848 100755 --with-system-zlib use installed libz Some influential environment variables: -@@ -5411,8 +5416,8 @@ esac +@@ -5529,8 +5534,8 @@ esac @@ -10365,7 +10491,7 @@ index 6b294bfebfb..52a025bb848 100755 -@@ -5523,7 +5528,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5570,7 +5575,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -10374,7 +10500,7 @@ index 6b294bfebfb..52a025bb848 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6209,8 +6214,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -6256,8 +6261,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -10385,7 +10511,7 @@ index 6b294bfebfb..52a025bb848 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6259,6 +6264,80 @@ esac +@@ -6306,6 +6311,80 @@ esac @@ -10466,7 +10592,7 @@ index 6b294bfebfb..52a025bb848 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6275,6 +6354,11 @@ case $reload_flag in +@@ -6322,6 +6401,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -10478,7 +10604,7 @@ index 6b294bfebfb..52a025bb848 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6443,7 +6527,8 @@ mingw* | pw32*) +@@ -6490,7 +6574,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -10488,7 +10614,7 @@ index 6b294bfebfb..52a025bb848 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6597,6 +6682,21 @@ esac +@@ -6644,6 +6729,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -10510,7 +10636,7 @@ index 6b294bfebfb..52a025bb848 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6612,9 +6712,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6659,6 +6759,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -10665,6 +10791,12 @@ index 6b294bfebfb..52a025bb848 100755 + + + + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -6673,8 +6924,10 @@ for plugin in $plugin_names; do + done + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -10675,7 +10807,7 @@ index 6b294bfebfb..52a025bb848 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6630,7 +6883,7 @@ do +@@ -6690,7 +6943,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -10684,7 +10816,7 @@ index 6b294bfebfb..52a025bb848 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6650,11 +6903,15 @@ $as_echo "no" >&6; } +@@ -6710,11 +6963,15 @@ $as_echo "no" >&6; } fi @@ -10703,7 +10835,7 @@ index 6b294bfebfb..52a025bb848 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6670,7 +6927,7 @@ do +@@ -6730,7 +6987,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -10712,7 +10844,7 @@ index 6b294bfebfb..52a025bb848 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6689,6 +6946,10 @@ else +@@ -6749,6 +7006,10 @@ else $as_echo "no" >&6; } fi @@ -10723,7 +10855,7 @@ index 6b294bfebfb..52a025bb848 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6700,16 +6961,72 @@ ac_tool_warned=yes ;; +@@ -6760,25 +7021,19 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -10732,20 +10864,36 @@ index 6b294bfebfb..52a025bb848 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -6790,6 +7045,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -10758,7 +10906,7 @@ index 6b294bfebfb..52a025bb848 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -10784,23 +10932,30 @@ index 6b294bfebfb..52a025bb848 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi - - - -@@ -7051,8 +7368,8 @@ esac ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +@@ -7129,8 +7442,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -10811,7 +10966,7 @@ index 6b294bfebfb..52a025bb848 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7088,6 +7405,7 @@ for ac_symprfx in "" "_"; do +@@ -7166,6 +7479,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -10819,7 +10974,7 @@ index 6b294bfebfb..52a025bb848 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7129,6 +7447,18 @@ _LT_EOF +@@ -7207,6 +7521,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -10838,7 +10993,7 @@ index 6b294bfebfb..52a025bb848 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7140,7 +7470,7 @@ _LT_EOF +@@ -7218,7 +7544,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -10847,7 +11002,7 @@ index 6b294bfebfb..52a025bb848 100755 const char *name; void *address; } -@@ -7166,8 +7496,8 @@ static const void *lt_preloaded_setup() { +@@ -7244,8 +7570,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -10858,7 +11013,7 @@ index 6b294bfebfb..52a025bb848 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7177,8 +7507,8 @@ _LT_EOF +@@ -7255,8 +7581,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -10869,7 +11024,7 @@ index 6b294bfebfb..52a025bb848 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7215,6 +7545,16 @@ else +@@ -7293,6 +7619,14 @@ else $as_echo "ok" >&6; } fi @@ -10881,12 +11036,10 @@ index 6b294bfebfb..52a025bb848 100755 +fi + + -+ -+ -@@ -7231,6 +7571,45 @@ fi +@@ -7311,6 +7645,47 @@ fi @@ -10929,10 +11082,12 @@ index 6b294bfebfb..52a025bb848 100755 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ -@@ -7442,6 +7821,123 @@ esac +@@ -7520,6 +7895,123 @@ esac need_locks="$enable_libtool_lock" @@ -11056,7 +11211,7 @@ index 6b294bfebfb..52a025bb848 100755 case $host_os in rhapsody* | darwin*) -@@ -8005,6 +8501,8 @@ _LT_EOF +@@ -8083,6 +8575,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -11065,7 +11220,7 @@ index 6b294bfebfb..52a025bb848 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8170,7 +8668,8 @@ fi +@@ -8248,7 +8742,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -11075,7 +11230,7 @@ index 6b294bfebfb..52a025bb848 100755 -@@ -8259,7 +8758,7 @@ aix3*) +@@ -8337,7 +8832,7 @@ aix3*) esac # Global variables: @@ -11084,7 +11239,7 @@ index 6b294bfebfb..52a025bb848 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8557,8 +9056,6 @@ fi +@@ -8635,8 +9130,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -11093,7 +11248,7 @@ index 6b294bfebfb..52a025bb848 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8724,6 +9221,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8802,6 +9295,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -11106,7 +11261,7 @@ index 6b294bfebfb..52a025bb848 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8786,7 +9289,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8864,7 +9363,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -11115,7 +11270,7 @@ index 6b294bfebfb..52a025bb848 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8843,13 +9346,17 @@ case $host_os in +@@ -8921,13 +9420,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -11139,7 +11294,7 @@ index 6b294bfebfb..52a025bb848 100755 # # Check to make sure the PIC flag actually works. -@@ -8910,6 +9417,11 @@ fi +@@ -8988,6 +9491,11 @@ fi @@ -11151,7 +11306,7 @@ index 6b294bfebfb..52a025bb848 100755 # # Check to make sure the static flag actually works. # -@@ -9260,7 +9772,8 @@ _LT_EOF +@@ -9338,7 +9846,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -11161,7 +11316,7 @@ index 6b294bfebfb..52a025bb848 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9359,12 +9872,12 @@ _LT_EOF +@@ -9437,12 +9946,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -11176,7 +11331,7 @@ index 6b294bfebfb..52a025bb848 100755 fi ;; esac -@@ -9378,8 +9891,8 @@ _LT_EOF +@@ -9456,8 +9965,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -11187,7 +11342,7 @@ index 6b294bfebfb..52a025bb848 100755 fi ;; -@@ -9397,8 +9910,8 @@ _LT_EOF +@@ -9475,8 +9984,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -11198,7 +11353,7 @@ index 6b294bfebfb..52a025bb848 100755 else ld_shlibs=no fi -@@ -9444,8 +9957,8 @@ _LT_EOF +@@ -9522,8 +10031,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -11209,7 +11364,7 @@ index 6b294bfebfb..52a025bb848 100755 else ld_shlibs=no fi -@@ -9575,7 +10088,13 @@ _LT_EOF +@@ -9653,7 +10162,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -11224,7 +11379,7 @@ index 6b294bfebfb..52a025bb848 100755 /* end confdefs.h. */ int -@@ -9588,22 +10107,29 @@ main () +@@ -9666,22 +10181,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -11267,7 +11422,7 @@ index 6b294bfebfb..52a025bb848 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9615,7 +10141,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9693,7 +10215,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -11282,7 +11437,7 @@ index 6b294bfebfb..52a025bb848 100755 /* end confdefs.h. */ int -@@ -9628,22 +10160,29 @@ main () +@@ -9706,22 +10234,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -11325,7 +11480,7 @@ index 6b294bfebfb..52a025bb848 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9688,20 +10227,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9766,20 +10301,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -11403,7 +11558,7 @@ index 6b294bfebfb..52a025bb848 100755 ;; darwin* | rhapsody*) -@@ -9762,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9840,7 +10418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -11412,7 +11567,7 @@ index 6b294bfebfb..52a025bb848 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9770,7 +10352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9848,7 +10426,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -11421,7 +11576,7 @@ index 6b294bfebfb..52a025bb848 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9786,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9864,7 +10442,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -11430,7 +11585,7 @@ index 6b294bfebfb..52a025bb848 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9810,10 +10392,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9888,10 +10466,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -11443,7 +11598,7 @@ index 6b294bfebfb..52a025bb848 100755 ;; esac else -@@ -9892,23 +10474,36 @@ fi +@@ -9970,23 +10548,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -11488,7 +11643,7 @@ index 6b294bfebfb..52a025bb848 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9993,7 +10588,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10071,7 +10662,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -11497,7 +11652,7 @@ index 6b294bfebfb..52a025bb848 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10012,9 +10607,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -10090,9 +10681,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -11509,7 +11664,7 @@ index 6b294bfebfb..52a025bb848 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10590,8 +11185,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10668,8 +11259,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -11521,7 +11676,7 @@ index 6b294bfebfb..52a025bb848 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10624,13 +11220,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10702,13 +11294,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -11594,7 +11749,7 @@ index 6b294bfebfb..52a025bb848 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10712,7 +11366,7 @@ haiku*) +@@ -10790,7 +11440,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11603,16 +11758,16 @@ index 6b294bfebfb..52a025bb848 100755 hardcode_into_libs=yes ;; -@@ -11508,7 +12162,7 @@ else +@@ -11586,7 +12236,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11511 "configure" +-#line 11589 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11552,10 +12206,10 @@ else +@@ -11630,10 +12280,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -11625,16 +11780,16 @@ index 6b294bfebfb..52a025bb848 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11614,7 +12268,7 @@ else +@@ -11692,7 +12342,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11617 "configure" +-#line 11695 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11658,10 +12312,10 @@ else +@@ -11736,10 +12386,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -11647,7 +11802,7 @@ index 6b294bfebfb..52a025bb848 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14136,13 +14790,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -14286,13 +14936,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -11668,7 +11823,7 @@ index 6b294bfebfb..52a025bb848 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -14157,14 +14818,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -14307,14 +14964,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -11687,7 +11842,7 @@ index 6b294bfebfb..52a025bb848 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -14197,12 +14861,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -14347,12 +15007,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -11701,7 +11856,7 @@ index 6b294bfebfb..52a025bb848 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -14257,8 +14921,13 @@ reload_flag \ +@@ -14407,8 +15067,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -11715,7 +11870,7 @@ index 6b294bfebfb..52a025bb848 100755 STRIP \ RANLIB \ CC \ -@@ -14268,12 +14937,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -14418,12 +15083,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -11731,7 +11886,7 @@ index 6b294bfebfb..52a025bb848 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -14289,7 +14960,6 @@ no_undefined_flag \ +@@ -14439,7 +15106,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -11739,7 +11894,7 @@ index 6b294bfebfb..52a025bb848 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -14325,6 +14995,7 @@ module_cmds \ +@@ -14475,6 +15141,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -11747,7 +11902,7 @@ index 6b294bfebfb..52a025bb848 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -15081,7 +15752,8 @@ $as_echo X"$file" | +@@ -15231,7 +15898,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -11757,7 +11912,7 @@ index 6b294bfebfb..52a025bb848 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -15184,19 +15856,42 @@ SP2NL=$lt_lt_SP2NL +@@ -15334,19 +16002,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -11801,7 +11956,7 @@ index 6b294bfebfb..52a025bb848 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -15226,6 +15921,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -15376,6 +16067,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -11814,7 +11969,7 @@ index 6b294bfebfb..52a025bb848 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -15235,6 +15936,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -15385,6 +16082,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -11824,7 +11979,7 @@ index 6b294bfebfb..52a025bb848 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -15349,12 +16053,12 @@ with_gcc=$GCC +@@ -15499,12 +16199,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -11840,7 +11995,7 @@ index 6b294bfebfb..52a025bb848 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15441,9 +16145,6 @@ inherit_rpath=$inherit_rpath +@@ -15591,9 +16291,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -11850,7 +12005,7 @@ index 6b294bfebfb..52a025bb848 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15459,6 +16160,9 @@ include_expsyms=$lt_include_expsyms +@@ -15609,6 +16306,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -11860,7 +12015,7 @@ index 6b294bfebfb..52a025bb848 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15491,210 +16195,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15641,210 +16341,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -12235,7 +12390,7 @@ index 6b294bfebfb..52a025bb848 100755 chmod +x "$ofile" diff --git a/libtool.m4 b/libtool.m4 -index e993b621ac2..7715af647f4 100644 +index 9a13f3b117a..5be47564443 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1,7 +1,8 @@ @@ -12445,7 +12600,7 @@ index e993b621ac2..7715af647f4 100644 # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" +@@ -1320,6 +1369,51 @@ need_locks="$enable_libtool_lock" ])# _LT_ENABLE_LOCK @@ -12453,6 +12608,14 @@ index e993b621ac2..7715af647f4 100644 +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ AC_MSG_WARN([Failed: $AR $plugin_option rc]) ++ else ++ AR="$AR $plugin_option" ++ fi ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) @@ -12489,16 +12652,32 @@ index e993b621ac2..7715af647f4 100644 # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) +@@ -1336,23 +1430,7 @@ for plugin in $plugin_names; do + fi + done + +-AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- AC_MSG_WARN([Failed: $AR $plugin_option rc]) +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* +- fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR ++_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else +@@ -1653,7 +1731,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF @@ -12507,7 +12686,7 @@ index e993b621ac2..7715af647f4 100644 #include "confdefs.h" #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else +@@ -1697,10 +1775,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -12520,7 +12699,7 @@ index e993b621ac2..7715af647f4 100644 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -2240,8 +2318,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -12532,7 +12711,7 @@ index e993b621ac2..7715af647f4 100644 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ +@@ -2274,13 +2353,71 @@ m4_if([$1], [],[ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -12605,7 +12784,7 @@ index e993b621ac2..7715af647f4 100644 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -2332,7 +2473,7 @@ haiku*) +@@ -2362,7 +2499,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12614,7 +12793,7 @@ index e993b621ac2..7715af647f4 100644 hardcode_into_libs=yes ;; -@@ -2940,6 +3081,11 @@ case $reload_flag in +@@ -2970,6 +3107,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -12626,7 +12805,7 @@ index e993b621ac2..7715af647f4 100644 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3006,7 +3152,8 @@ mingw* | pw32*) +@@ -3036,7 +3178,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -12636,7 +12815,7 @@ index e993b621ac2..7715af647f4 100644 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -3157,6 +3304,21 @@ tpf*) +@@ -3187,6 +3330,21 @@ tpf*) ;; esac ]) @@ -12658,7 +12837,7 @@ index e993b621ac2..7715af647f4 100644 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3164,7 +3326,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3194,7 +3352,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], @@ -12671,7 +12850,7 @@ index e993b621ac2..7715af647f4 100644 ])# _LT_CHECK_MAGIC_METHOD -@@ -3267,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility: +@@ -3297,6 +3459,67 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) @@ -12739,7 +12918,7 @@ index e993b621ac2..7715af647f4 100644 # LT_LIB_M # -------- -@@ -3393,8 +3620,8 @@ esac +@@ -3423,8 +3646,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -12750,7 +12929,7 @@ index e993b621ac2..7715af647f4 100644 # Handle CRLF in mingw tool chain opt_cr= -@@ -3430,6 +3657,7 @@ for ac_symprfx in "" "_"; do +@@ -3460,6 +3683,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -12758,7 +12937,7 @@ index e993b621ac2..7715af647f4 100644 # Check to see that the pipe works correctly. pipe_works=no -@@ -3463,6 +3691,18 @@ _LT_EOF +@@ -3493,6 +3717,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -12777,7 +12956,7 @@ index e993b621ac2..7715af647f4 100644 #ifdef __cplusplus extern "C" { #endif -@@ -3474,7 +3714,7 @@ _LT_EOF +@@ -3504,7 +3740,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -12786,7 +12965,7 @@ index e993b621ac2..7715af647f4 100644 const char *name; void *address; } -@@ -3500,15 +3740,15 @@ static const void *lt_preloaded_setup() { +@@ -3530,15 +3766,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -12806,7 +12985,7 @@ index e993b621ac2..7715af647f4 100644 else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi -@@ -3541,6 +3781,13 @@ else +@@ -3571,6 +3807,13 @@ else AC_MSG_RESULT(ok) fi @@ -12820,7 +12999,7 @@ index e993b621ac2..7715af647f4 100644 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3551,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address], +@@ -3581,6 +3824,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) @@ -12829,7 +13008,7 @@ index e993b621ac2..7715af647f4 100644 ]) # _LT_CMD_GLOBAL_SYMBOLS -@@ -3562,7 +3811,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= +@@ -3592,7 +3837,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= @@ -12837,7 +13016,7 @@ index e993b621ac2..7715af647f4 100644 m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [ +@@ -3698,6 +3942,12 @@ m4_if([$1], [CXX], [ ;; esac ;; @@ -12850,7 +13029,7 @@ index e993b621ac2..7715af647f4 100644 dgux*) case $cc_basename in ec++*) -@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [ +@@ -3850,7 +4100,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in @@ -12859,7 +13038,7 @@ index e993b621ac2..7715af647f4 100644 # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4043,6 +4297,12 @@ m4_if([$1], [CXX], [ +@@ -4073,6 +4323,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; @@ -12872,7 +13051,7 @@ index e993b621ac2..7715af647f4 100644 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -4105,7 +4365,7 @@ m4_if([$1], [CXX], [ +@@ -4135,7 +4391,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in @@ -12881,7 +13060,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4162,9 +4422,11 @@ case $host_os in +@@ -4192,9 +4448,11 @@ case $host_os in _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac @@ -12896,7 +13075,7 @@ index e993b621ac2..7715af647f4 100644 # # Check to make sure the PIC flag actually works. -@@ -4183,6 +4445,8 @@ fi +@@ -4213,6 +4471,8 @@ fi _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) @@ -12905,7 +13084,7 @@ index e993b621ac2..7715af647f4 100644 # # Check to make sure the static flag actually works. # -@@ -4203,6 +4467,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], +@@ -4233,6 +4493,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl @@ -12913,7 +13092,7 @@ index e993b621ac2..7715af647f4 100644 m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl -@@ -4211,6 +4476,7 @@ m4_require([_LT_TAG_COMPILER])dnl +@@ -4241,6 +4502,7 @@ m4_require([_LT_TAG_COMPILER])dnl AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -12921,7 +13100,7 @@ index e993b621ac2..7715af647f4 100644 case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -4225,15 +4491,20 @@ m4_if([$1], [CXX], [ +@@ -4255,15 +4517,20 @@ m4_if([$1], [CXX], [ ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" @@ -12947,7 +13126,7 @@ index e993b621ac2..7715af647f4 100644 ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4401,7 +4672,8 @@ _LT_EOF +@@ -4431,7 +4698,8 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -12957,7 +13136,7 @@ index e993b621ac2..7715af647f4 100644 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4500,12 +4772,12 @@ _LT_EOF +@@ -4530,12 +4798,12 @@ _LT_EOF _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' @@ -12972,7 +13151,7 @@ index e993b621ac2..7715af647f4 100644 fi ;; esac -@@ -4519,8 +4791,8 @@ _LT_EOF +@@ -4549,8 +4817,8 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -12983,7 +13162,7 @@ index e993b621ac2..7715af647f4 100644 fi ;; -@@ -4538,8 +4810,8 @@ _LT_EOF +@@ -4568,8 +4836,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -12994,7 +13173,7 @@ index e993b621ac2..7715af647f4 100644 else _LT_TAGVAR(ld_shlibs, $1)=no fi -@@ -4585,8 +4857,8 @@ _LT_EOF +@@ -4615,8 +4883,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -13005,7 +13184,7 @@ index e993b621ac2..7715af647f4 100644 else _LT_TAGVAR(ld_shlibs, $1)=no fi -@@ -4716,7 +4988,7 @@ _LT_EOF +@@ -4746,7 +5014,7 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -13014,7 +13193,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else -@@ -4727,7 +4999,7 @@ _LT_EOF +@@ -4757,7 +5025,7 @@ _LT_EOF else # Determine the default libpath from the value encoded in an # empty executable. @@ -13023,7 +13202,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -4771,20 +5043,63 @@ _LT_EOF +@@ -4801,20 +5069,63 @@ _LT_EOF # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -13101,7 +13280,7 @@ index e993b621ac2..7715af647f4 100644 ;; darwin* | rhapsody*) -@@ -4818,7 +5133,7 @@ _LT_EOF +@@ -4848,7 +5159,7 @@ _LT_EOF # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -13110,7 +13289,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4826,7 +5141,7 @@ _LT_EOF +@@ -4856,7 +5167,7 @@ _LT_EOF hpux9*) if test "$GCC" = yes; then @@ -13119,7 +13298,7 @@ index e993b621ac2..7715af647f4 100644 else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -4842,7 +5157,7 @@ _LT_EOF +@@ -4872,7 +5183,7 @@ _LT_EOF hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -13128,7 +13307,7 @@ index e993b621ac2..7715af647f4 100644 else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -4866,10 +5181,10 @@ _LT_EOF +@@ -4896,10 +5207,10 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -13141,7 +13320,7 @@ index e993b621ac2..7715af647f4 100644 ;; esac else -@@ -4916,16 +5231,31 @@ _LT_EOF +@@ -4946,16 +5257,31 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -13180,7 +13359,7 @@ index e993b621ac2..7715af647f4 100644 else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5010,7 +5340,7 @@ _LT_EOF +@@ -5040,7 +5366,7 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' @@ -13189,7 +13368,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5029,9 +5359,9 @@ _LT_EOF +@@ -5059,9 +5385,9 @@ _LT_EOF _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -13201,7 +13380,7 @@ index e993b621ac2..7715af647f4 100644 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -5303,8 +5633,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], +@@ -5333,8 +5659,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) @@ -13210,7 +13389,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5315,6 +5643,8 @@ _LT_TAGDECL([], [include_expsyms], [1], +@@ -5345,6 +5669,8 @@ _LT_TAGDECL([], [include_expsyms], [1], [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) @@ -13219,7 +13398,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented -@@ -5416,6 +5746,7 @@ CC="$lt_save_CC" +@@ -5446,6 +5772,7 @@ CC="$lt_save_CC" m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl @@ -13227,7 +13406,7 @@ index e993b621ac2..7715af647f4 100644 if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then -@@ -5477,6 +5808,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5507,6 +5834,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -13235,7 +13414,7 @@ index e993b621ac2..7715af647f4 100644 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -5494,6 +5826,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5524,6 +5852,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -13243,7 +13422,7 @@ index e993b621ac2..7715af647f4 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -5657,7 +5990,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5687,7 +6016,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -13252,7 +13431,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5669,7 +6002,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5699,7 +6028,7 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. @@ -13261,7 +13440,7 @@ index e993b621ac2..7715af647f4 100644 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -5711,29 +6044,75 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5741,29 +6070,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) @@ -13360,7 +13539,7 @@ index e993b621ac2..7715af647f4 100644 darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; -@@ -5808,7 +6187,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5838,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then ;; *) if test "$GXX" = yes; then @@ -13369,7 +13548,7 @@ index e993b621ac2..7715af647f4 100644 else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5879,10 +6258,10 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5909,10 +6284,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -13382,7 +13561,7 @@ index e993b621ac2..7715af647f4 100644 ;; esac fi -@@ -5923,9 +6302,9 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -5953,9 +6328,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -13394,7 +13573,7 @@ index e993b621ac2..7715af647f4 100644 fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -5995,20 +6374,20 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6025,20 +6400,20 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -13419,7 +13598,7 @@ index e993b621ac2..7715af647f4 100644 ;; *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6203,7 +6582,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6233,7 +6608,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -13428,7 +13607,7 @@ index e993b621ac2..7715af647f4 100644 ;; esac -@@ -6249,7 +6628,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6279,7 +6654,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in @@ -13437,7 +13616,7 @@ index e993b621ac2..7715af647f4 100644 # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6290,9 +6669,9 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6320,9 +6695,9 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -13449,7 +13628,7 @@ index e993b621ac2..7715af647f4 100644 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6421,6 +6800,7 @@ if test "$_lt_caught_CXX_error" != yes; then +@@ -6451,6 +6826,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC @@ -13457,7 +13636,7 @@ index e993b621ac2..7715af647f4 100644 LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -6435,6 +6815,29 @@ AC_LANG_POP +@@ -6465,6 +6841,29 @@ AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -13487,7 +13666,7 @@ index e993b621ac2..7715af647f4 100644 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose -@@ -6443,6 +6846,7 @@ AC_LANG_POP +@@ -6473,6 +6872,7 @@ AC_LANG_POP # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl @@ -13495,7 +13674,7 @@ index e993b621ac2..7715af647f4 100644 # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= -@@ -6493,6 +6897,13 @@ public class foo { +@@ -6523,6 +6923,13 @@ public class foo { }; _LT_EOF ]) @@ -13509,7 +13688,7 @@ index e993b621ac2..7715af647f4 100644 dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then -@@ -6504,7 +6915,7 @@ if AC_TRY_EVAL(ac_compile); then +@@ -6534,7 +6941,7 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -13518,7 +13697,7 @@ index e993b621ac2..7715af647f4 100644 -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -6513,13 +6924,22 @@ if AC_TRY_EVAL(ac_compile); then +@@ -6543,13 +6950,22 @@ if AC_TRY_EVAL(ac_compile); then test $p = "-R"; then prev=$p continue @@ -13545,7 +13724,7 @@ index e993b621ac2..7715af647f4 100644 # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -6539,8 +6959,10 @@ if AC_TRY_EVAL(ac_compile); then +@@ -6569,8 +6985,10 @@ if AC_TRY_EVAL(ac_compile); then _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi @@ -13556,7 +13735,7 @@ index e993b621ac2..7715af647f4 100644 *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -6576,6 +6998,7 @@ else +@@ -6606,6 +7024,7 @@ else fi $RM -f confest.$objext @@ -13564,7 +13743,7 @@ index e993b621ac2..7715af647f4 100644 # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], -@@ -6612,7 +7035,7 @@ linux*) +@@ -6642,7 +7061,7 @@ linux*) solaris*) case $cc_basename in @@ -13573,7 +13752,7 @@ index e993b621ac2..7715af647f4 100644 # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6725,7 +7148,9 @@ if test "$_lt_disable_F77" != yes; then +@@ -6755,7 +7174,9 @@ if test "$_lt_disable_F77" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC @@ -13583,7 +13762,7 @@ index e993b621ac2..7715af647f4 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -6779,6 +7204,7 @@ if test "$_lt_disable_F77" != yes; then +@@ -6809,6 +7230,7 @@ if test "$_lt_disable_F77" != yes; then GCC=$lt_save_GCC CC="$lt_save_CC" @@ -13591,7 +13770,7 @@ index e993b621ac2..7715af647f4 100644 fi # test "$_lt_disable_F77" != yes AC_LANG_POP -@@ -6855,7 +7281,9 @@ if test "$_lt_disable_FC" != yes; then +@@ -6885,7 +7307,9 @@ if test "$_lt_disable_FC" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC @@ -13601,7 +13780,7 @@ index e993b621ac2..7715af647f4 100644 compiler=$CC GCC=$ac_cv_fc_compiler_gnu -@@ -6911,7 +7339,8 @@ if test "$_lt_disable_FC" != yes; then +@@ -6941,7 +7365,8 @@ if test "$_lt_disable_FC" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC @@ -13611,7 +13790,7 @@ index e993b621ac2..7715af647f4 100644 fi # test "$_lt_disable_FC" != yes AC_LANG_POP -@@ -6948,10 +7377,12 @@ _LT_COMPILER_BOILERPLATE +@@ -6978,10 +7403,12 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. @@ -13625,7 +13804,7 @@ index e993b621ac2..7715af647f4 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" -@@ -6982,7 +7413,8 @@ fi +@@ -7012,7 +7439,8 @@ fi AC_LANG_RESTORE GCC=$lt_save_GCC @@ -13635,7 +13814,7 @@ index e993b621ac2..7715af647f4 100644 ])# _LT_LANG_GCJ_CONFIG -@@ -7017,9 +7449,11 @@ _LT_LINKER_BOILERPLATE +@@ -7047,9 +7475,11 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. lt_save_CC="$CC" @@ -13647,7 +13826,7 @@ index e993b621ac2..7715af647f4 100644 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -7032,7 +7466,8 @@ fi +@@ -7062,7 +7492,8 @@ fi GCC=$lt_save_GCC AC_LANG_RESTORE @@ -13657,7 +13836,7 @@ index e993b621ac2..7715af647f4 100644 ])# _LT_LANG_RC_CONFIG -@@ -7091,6 +7526,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +@@ -7121,6 +7552,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) @@ -13673,7 +13852,7 @@ index e993b621ac2..7715af647f4 100644 # _LT_DECL_SED # ------------ -@@ -7184,8 +7628,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], +@@ -7214,8 +7654,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -13684,7 +13863,7 @@ index e993b621ac2..7715af647f4 100644 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -7224,206 +7668,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +@@ -7254,206 +7694,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES @@ -19318,7 +19497,7 @@ index bf92b5e0790..c573da90c5c 100644 # These exist entirely to fool aclocal when bootstrapping libtool. # diff --git a/opcodes/configure b/opcodes/configure -index dca94db9c3f..26dcc4b82dd 100755 +index 3513e408ce1..133948631e9 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -680,6 +680,9 @@ OTOOL @@ -19337,9 +19516,9 @@ index dca94db9c3f..26dcc4b82dd 100755 with_gnu_ld +with_libtool_sysroot enable_libtool_lock + enable_checking enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: +@@ -1464,6 +1468,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -19348,7 +19527,7 @@ index dca94db9c3f..26dcc4b82dd 100755 Some influential environment variables: CC C compiler command -@@ -5403,8 +5409,8 @@ esac +@@ -4751,8 +4757,8 @@ esac @@ -19359,7 +19538,7 @@ index dca94db9c3f..26dcc4b82dd 100755 -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -4792,7 +4798,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -19368,7 +19547,7 @@ index dca94db9c3f..26dcc4b82dd 100755 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; +@@ -5478,8 +5484,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -19379,7 +19558,7 @@ index dca94db9c3f..26dcc4b82dd 100755 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac +@@ -5528,6 +5534,80 @@ esac @@ -19460,7 +19639,7 @@ index dca94db9c3f..26dcc4b82dd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in +@@ -5544,6 +5624,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -19472,7 +19651,7 @@ index dca94db9c3f..26dcc4b82dd 100755 darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) +@@ -5712,7 +5797,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -19482,7 +19661,7 @@ index dca94db9c3f..26dcc4b82dd 100755 lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6518,6 +6604,21 @@ esac +@@ -5866,6 +5952,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -19504,7 +19683,7 @@ index dca94db9c3f..26dcc4b82dd 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5881,6 +5982,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -19518,11 +19697,7 @@ index dca94db9c3f..26dcc4b82dd 100755 + + + - - - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -19663,7 +19838,15 @@ index dca94db9c3f..26dcc4b82dd 100755 + + + -+if test -n "$ac_tool_prefix"; then + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -5895,8 +6147,10 @@ for plugin in $plugin_names; do + done + + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -19671,7 +19854,7 @@ index dca94db9c3f..26dcc4b82dd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do +@@ -5912,7 +6166,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -19680,7 +19863,7 @@ index dca94db9c3f..26dcc4b82dd 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } +@@ -5932,11 +6186,15 @@ $as_echo "no" >&6; } fi @@ -19699,7 +19882,7 @@ index dca94db9c3f..26dcc4b82dd 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do +@@ -5952,7 +6210,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -19708,7 +19891,7 @@ index dca94db9c3f..26dcc4b82dd 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6610,6 +6868,10 @@ else +@@ -5971,6 +6229,10 @@ else $as_echo "no" >&6; } fi @@ -19719,7 +19902,7 @@ index dca94db9c3f..26dcc4b82dd 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; +@@ -5982,25 +6244,20 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19728,20 +19911,37 @@ index dca94db9c3f..26dcc4b82dd 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -6011,6 +6268,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -19754,7 +19954,7 @@ index dca94db9c3f..26dcc4b82dd 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -19780,23 +19980,29 @@ index dca94db9c3f..26dcc4b82dd 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi ++ ++ ++ ++ ++ ++ - - -@@ -6972,8 +7290,8 @@ esac + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +@@ -6351,8 +6665,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -19807,7 +20013,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do +@@ -6388,6 +6702,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -19815,7 +20021,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF +@@ -6429,6 +6744,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -19834,7 +20040,7 @@ index dca94db9c3f..26dcc4b82dd 100755 #ifdef __cplusplus extern "C" { #endif -@@ -7061,7 +7392,7 @@ _LT_EOF +@@ -6440,7 +6767,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -19843,7 +20049,7 @@ index dca94db9c3f..26dcc4b82dd 100755 const char *name; void *address; } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { +@@ -6466,8 +6793,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19854,7 +20060,7 @@ index dca94db9c3f..26dcc4b82dd 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF +@@ -6477,8 +6804,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -19865,7 +20071,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7136,6 +7467,16 @@ else +@@ -6515,6 +6842,14 @@ else $as_echo "ok" >&6; } fi @@ -19877,12 +20083,10 @@ index dca94db9c3f..26dcc4b82dd 100755 +fi + + -+ -+ -@@ -7152,6 +7493,45 @@ fi +@@ -6533,6 +6868,47 @@ fi @@ -19925,10 +20129,12 @@ index dca94db9c3f..26dcc4b82dd 100755 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ -@@ -7363,6 +7743,123 @@ esac +@@ -6742,6 +7118,123 @@ esac need_locks="$enable_libtool_lock" @@ -20052,7 +20258,7 @@ index dca94db9c3f..26dcc4b82dd 100755 case $host_os in rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF +@@ -7305,6 +7798,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -20061,7 +20267,7 @@ index dca94db9c3f..26dcc4b82dd 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8091,7 +8590,8 @@ fi +@@ -7470,7 +7965,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -20071,7 +20277,7 @@ index dca94db9c3f..26dcc4b82dd 100755 -@@ -8180,7 +8680,7 @@ aix3*) +@@ -7559,7 +8055,7 @@ aix3*) esac # Global variables: @@ -20080,7 +20286,7 @@ index dca94db9c3f..26dcc4b82dd 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi +@@ -7857,8 +8353,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -20089,7 +20295,7 @@ index dca94db9c3f..26dcc4b82dd 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8024,6 +8518,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20102,7 +20308,7 @@ index dca94db9c3f..26dcc4b82dd 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -8086,7 +8586,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -20111,7 +20317,7 @@ index dca94db9c3f..26dcc4b82dd 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in +@@ -8143,13 +8643,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -20135,7 +20341,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi +@@ -8210,6 +8714,11 @@ fi @@ -20147,7 +20353,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # # Check to make sure the static flag actually works. # -@@ -9181,7 +9694,8 @@ _LT_EOF +@@ -8560,7 +9069,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -20157,7 +20363,7 @@ index dca94db9c3f..26dcc4b82dd 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF +@@ -8659,12 +9169,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -20172,7 +20378,7 @@ index dca94db9c3f..26dcc4b82dd 100755 fi ;; esac -@@ -9299,8 +9813,8 @@ _LT_EOF +@@ -8678,8 +9188,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -20183,7 +20389,7 @@ index dca94db9c3f..26dcc4b82dd 100755 fi ;; -@@ -9318,8 +9832,8 @@ _LT_EOF +@@ -8697,8 +9207,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20194,7 +20400,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else ld_shlibs=no fi -@@ -9365,8 +9879,8 @@ _LT_EOF +@@ -8744,8 +9254,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -20205,7 +20411,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else ld_shlibs=no fi -@@ -9496,7 +10010,13 @@ _LT_EOF +@@ -8875,7 +9385,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -20220,7 +20426,7 @@ index dca94db9c3f..26dcc4b82dd 100755 /* end confdefs.h. */ int -@@ -9509,22 +10029,29 @@ main () +@@ -8888,22 +9404,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20263,7 +20469,7 @@ index dca94db9c3f..26dcc4b82dd 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8915,7 +9438,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -20278,7 +20484,7 @@ index dca94db9c3f..26dcc4b82dd 100755 /* end confdefs.h. */ int -@@ -9549,22 +10082,29 @@ main () +@@ -8928,22 +9457,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -20321,7 +20527,7 @@ index dca94db9c3f..26dcc4b82dd 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8988,20 +9524,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -20399,7 +20605,7 @@ index dca94db9c3f..26dcc4b82dd 100755 ;; darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9062,7 +9641,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -20408,7 +20614,7 @@ index dca94db9c3f..26dcc4b82dd 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9070,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -20417,7 +20623,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9086,7 +9665,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20426,7 +20632,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9110,10 +9689,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -20439,7 +20645,7 @@ index dca94db9c3f..26dcc4b82dd 100755 ;; esac else -@@ -9813,23 +10396,36 @@ fi +@@ -9192,23 +9771,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -20484,7 +20690,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9293,7 +9885,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -20493,7 +20699,7 @@ index dca94db9c3f..26dcc4b82dd 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9312,9 +9904,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20505,7 +20711,7 @@ index dca94db9c3f..26dcc4b82dd 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9890,8 +10482,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -20517,7 +20723,7 @@ index dca94db9c3f..26dcc4b82dd 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9924,13 +10517,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -20590,7 +20796,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10633,7 +11288,7 @@ haiku*) +@@ -10012,7 +10663,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -20599,16 +20805,16 @@ index dca94db9c3f..26dcc4b82dd 100755 hardcode_into_libs=yes ;; -@@ -11429,7 +12084,7 @@ else +@@ -10808,7 +11459,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11432 "configure" +-#line 10811 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11473,10 +12128,10 @@ else +@@ -10852,10 +11503,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -20621,16 +20827,16 @@ index dca94db9c3f..26dcc4b82dd 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11535,7 +12190,7 @@ else +@@ -10914,7 +11565,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11538 "configure" +-#line 10917 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11579,10 +12234,10 @@ else +@@ -10958,10 +11609,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -20643,7 +20849,7 @@ index dca94db9c3f..26dcc4b82dd 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13746,13 +14401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -13101,13 +13752,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -20664,7 +20870,7 @@ index dca94db9c3f..26dcc4b82dd 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13767,14 +14429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -13122,14 +13780,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -20683,7 +20889,7 @@ index dca94db9c3f..26dcc4b82dd 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13807,12 +14472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -13162,12 +13823,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -20697,7 +20903,7 @@ index dca94db9c3f..26dcc4b82dd 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13867,8 +14532,13 @@ reload_flag \ +@@ -13222,8 +13883,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -20711,7 +20917,7 @@ index dca94db9c3f..26dcc4b82dd 100755 STRIP \ RANLIB \ CC \ -@@ -13878,12 +14548,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13233,12 +13899,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -20727,7 +20933,7 @@ index dca94db9c3f..26dcc4b82dd 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13899,7 +14571,6 @@ no_undefined_flag \ +@@ -13254,7 +13922,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -20735,7 +20941,7 @@ index dca94db9c3f..26dcc4b82dd 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13935,6 +14606,7 @@ module_cmds \ +@@ -13290,6 +13957,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -20743,7 +20949,7 @@ index dca94db9c3f..26dcc4b82dd 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14700,7 +15372,8 @@ $as_echo X"$file" | +@@ -14055,7 +14723,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -20753,7 +20959,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14803,19 +15476,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14158,19 +14827,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -20797,7 +21003,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -14845,6 +15541,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -14200,6 +14892,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -20810,7 +21016,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14854,6 +15556,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14209,6 +14907,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -20820,7 +21026,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14968,12 +15673,12 @@ with_gcc=$GCC +@@ -14323,12 +15024,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -20836,7 +21042,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15060,9 +15765,6 @@ inherit_rpath=$inherit_rpath +@@ -14415,9 +15116,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -20846,7 +21052,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15078,6 +15780,9 @@ include_expsyms=$lt_include_expsyms +@@ -14433,6 +15131,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -20856,7 +21062,7 @@ index dca94db9c3f..26dcc4b82dd 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15110,210 +15815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -14465,210 +15166,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -21231,7 +21437,7 @@ index dca94db9c3f..26dcc4b82dd 100755 chmod +x "$ofile" diff --git a/zlib/configure b/zlib/configure -index b124acf9259..e4075ef3a2c 100755 +index 695819cd54b..14b5f28013a 100755 --- a/zlib/configure +++ b/zlib/configure @@ -646,8 +646,11 @@ OTOOL @@ -21419,7 +21625,7 @@ index b124acf9259..e4075ef3a2c 100755 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5407,6 +5508,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -21433,11 +21639,7 @@ index b124acf9259..e4075ef3a2c 100755 + + + - - - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -21579,7 +21781,15 @@ index b124acf9259..e4075ef3a2c 100755 + + + -+if test -n "$ac_tool_prefix"; then + plugin_option= + plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" + for plugin in $plugin_names; do +@@ -5421,8 +5674,10 @@ for plugin in $plugin_names; do + done + + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -21587,7 +21797,7 @@ index b124acf9259..e4075ef3a2c 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do +@@ -5438,7 +5693,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -21596,7 +21806,7 @@ index b124acf9259..e4075ef3a2c 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } +@@ -5458,11 +5713,15 @@ $as_echo "no" >&6; } fi @@ -21615,7 +21825,7 @@ index b124acf9259..e4075ef3a2c 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do +@@ -5478,7 +5737,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -21624,7 +21834,7 @@ index b124acf9259..e4075ef3a2c 100755 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5484,6 +5743,10 @@ else +@@ -5497,6 +5756,10 @@ else $as_echo "no" >&6; } fi @@ -21635,7 +21845,7 @@ index b124acf9259..e4075ef3a2c 100755 if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; +@@ -5508,25 +5771,19 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -21644,20 +21854,36 @@ index b124acf9259..e4075ef3a2c 100755 fi -test -z "$AR" && AR=ar +-if test -n "$plugin_option"; then +- if $AR --help 2>&1 | grep -q "\--plugin"; then +- touch conftest.c +- $AR $plugin_option rc conftest.a conftest.c +- if test "$?" != 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 ++ touch conftest.c ++ $AR $plugin_option rc conftest.a conftest.c ++ if test "$?" != 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 + $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} +- else +- AR="$AR $plugin_option" +- fi +- rm -f conftest.* ++ else ++ AR="$AR $plugin_option" + fi +-fi -test -z "$AR_FLAGS" && AR_FLAGS=cru ++ rm -f conftest.* +: ${AR=ar} +: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -5538,6 +5795,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -21670,7 +21896,7 @@ index b124acf9259..e4075ef3a2c 100755 +int +main () +{ - ++ + ; + return 0; +} @@ -21696,23 +21922,30 @@ index b124acf9259..e4075ef3a2c 100755 + fi + fi + rm -f conftest.* libconftest.a - ++ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - ++ +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi - - - -@@ -5846,8 +6165,8 @@ esac ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +@@ -5877,8 +6192,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -21723,7 +21956,7 @@ index b124acf9259..e4075ef3a2c 100755 # Handle CRLF in mingw tool chain opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do +@@ -5914,6 +6229,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -21731,7 +21964,7 @@ index b124acf9259..e4075ef3a2c 100755 # Check to see that the pipe works correctly. pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF +@@ -5955,6 +6271,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -21750,7 +21983,7 @@ index b124acf9259..e4075ef3a2c 100755 #ifdef __cplusplus extern "C" { #endif -@@ -5935,7 +6267,7 @@ _LT_EOF +@@ -5966,7 +6294,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -21759,7 +21992,7 @@ index b124acf9259..e4075ef3a2c 100755 const char *name; void *address; } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { +@@ -5992,8 +6320,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -21770,7 +22003,7 @@ index b124acf9259..e4075ef3a2c 100755 LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF +@@ -6003,8 +6331,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -21781,7 +22014,7 @@ index b124acf9259..e4075ef3a2c 100755 else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6010,6 +6342,19 @@ else +@@ -6041,6 +6369,17 @@ else $as_echo "ok" >&6; } fi @@ -21796,18 +22029,18 @@ index b124acf9259..e4075ef3a2c 100755 + + + -+ -+ -@@ -6027,6 +6372,41 @@ fi +@@ -6058,6 +6397,43 @@ fi + + + ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -21843,7 +22076,7 @@ index b124acf9259..e4075ef3a2c 100755 -@@ -6241,6 +6621,123 @@ esac +@@ -6272,6 +6648,123 @@ esac need_locks="$enable_libtool_lock" @@ -21967,7 +22200,7 @@ index b124acf9259..e4075ef3a2c 100755 case $host_os in rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF +@@ -6838,6 +7331,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -21976,7 +22209,7 @@ index b124acf9259..e4075ef3a2c 100755 cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7269,7 +7768,8 @@ fi +@@ -7300,7 +7795,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -21986,7 +22219,7 @@ index b124acf9259..e4075ef3a2c 100755 -@@ -7358,7 +7858,7 @@ aix3*) +@@ -7389,7 +7885,7 @@ aix3*) esac # Global variables: @@ -21995,7 +22228,7 @@ index b124acf9259..e4075ef3a2c 100755 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi +@@ -7687,8 +8183,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -22004,7 +22237,7 @@ index b124acf9259..e4075ef3a2c 100755 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7854,6 +8348,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -22017,7 +22250,7 @@ index b124acf9259..e4075ef3a2c 100755 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7916,7 +8416,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -22026,7 +22259,7 @@ index b124acf9259..e4075ef3a2c 100755 lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in +@@ -7973,13 +8473,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -22050,7 +22283,7 @@ index b124acf9259..e4075ef3a2c 100755 # # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi +@@ -8040,6 +8544,11 @@ fi @@ -22062,7 +22295,7 @@ index b124acf9259..e4075ef3a2c 100755 # # Check to make sure the static flag actually works. # -@@ -8359,7 +8872,8 @@ _LT_EOF +@@ -8390,7 +8899,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -22072,7 +22305,7 @@ index b124acf9259..e4075ef3a2c 100755 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF +@@ -8489,12 +8999,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -22087,7 +22320,7 @@ index b124acf9259..e4075ef3a2c 100755 fi ;; esac -@@ -8477,8 +8991,8 @@ _LT_EOF +@@ -8508,8 +9018,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -22098,7 +22331,7 @@ index b124acf9259..e4075ef3a2c 100755 fi ;; -@@ -8496,8 +9010,8 @@ _LT_EOF +@@ -8527,8 +9037,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -22109,7 +22342,7 @@ index b124acf9259..e4075ef3a2c 100755 else ld_shlibs=no fi -@@ -8543,8 +9057,8 @@ _LT_EOF +@@ -8574,8 +9084,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -22120,7 +22353,7 @@ index b124acf9259..e4075ef3a2c 100755 else ld_shlibs=no fi -@@ -8674,7 +9188,13 @@ _LT_EOF +@@ -8705,7 +9215,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -22135,7 +22368,7 @@ index b124acf9259..e4075ef3a2c 100755 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () +@@ -8721,22 +9237,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -22178,7 +22411,7 @@ index b124acf9259..e4075ef3a2c 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8748,7 +9271,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -22193,7 +22426,7 @@ index b124acf9259..e4075ef3a2c 100755 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () +@@ -8764,22 +9293,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -22236,7 +22469,7 @@ index b124acf9259..e4075ef3a2c 100755 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8824,20 +9360,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -22314,7 +22547,7 @@ index b124acf9259..e4075ef3a2c 100755 ;; darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8898,7 +9477,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -22323,7 +22556,7 @@ index b124acf9259..e4075ef3a2c 100755 hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8906,7 +9485,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -22332,7 +22565,7 @@ index b124acf9259..e4075ef3a2c 100755 else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8922,7 +9501,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -22341,7 +22574,7 @@ index b124acf9259..e4075ef3a2c 100755 else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8946,10 +9525,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -22354,7 +22587,7 @@ index b124acf9259..e4075ef3a2c 100755 ;; esac else -@@ -8997,26 +9580,39 @@ fi +@@ -9028,26 +9607,39 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -22402,7 +22635,7 @@ index b124acf9259..e4075ef3a2c 100755 else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9132,7 +9724,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -22411,7 +22644,7 @@ index b124acf9259..e4075ef3a2c 100755 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9151,9 +9743,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -22423,7 +22656,7 @@ index b124acf9259..e4075ef3a2c 100755 else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9729,8 +10321,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -22435,7 +22668,7 @@ index b124acf9259..e4075ef3a2c 100755 library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9763,13 +10356,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -22508,7 +22741,7 @@ index b124acf9259..e4075ef3a2c 100755 # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -9820,7 +10475,7 @@ haiku*) +@@ -9851,7 +10502,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -22517,16 +22750,16 @@ index b124acf9259..e4075ef3a2c 100755 hardcode_into_libs=yes ;; -@@ -10634,7 +11289,7 @@ else +@@ -10665,7 +11316,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10637 "configure" +-#line 10668 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10678,10 +11333,10 @@ else +@@ -10709,10 +11360,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -22539,16 +22772,16 @@ index b124acf9259..e4075ef3a2c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10740,7 +11395,7 @@ else +@@ -10771,7 +11422,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10743 "configure" +-#line 10774 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10784,10 +11439,10 @@ else +@@ -10815,10 +11466,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -22561,7 +22794,7 @@ index b124acf9259..e4075ef3a2c 100755 int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12257,13 +12912,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +@@ -12288,13 +12939,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -22582,7 +22815,7 @@ index b124acf9259..e4075ef3a2c 100755 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12278,14 +12940,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de +@@ -12309,14 +12967,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -22601,7 +22834,7 @@ index b124acf9259..e4075ef3a2c 100755 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12318,12 +12983,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q +@@ -12349,12 +13010,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -22615,7 +22848,7 @@ index b124acf9259..e4075ef3a2c 100755 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12378,8 +13043,13 @@ reload_flag \ +@@ -12409,8 +13070,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -22629,7 +22862,7 @@ index b124acf9259..e4075ef3a2c 100755 STRIP \ RANLIB \ CC \ -@@ -12389,12 +13059,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12420,12 +13086,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -22645,7 +22878,7 @@ index b124acf9259..e4075ef3a2c 100755 DSYMUTIL \ NMEDIT \ LIPO \ -@@ -12410,7 +13082,6 @@ no_undefined_flag \ +@@ -12441,7 +13109,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -22653,7 +22886,7 @@ index b124acf9259..e4075ef3a2c 100755 exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -12446,6 +13117,7 @@ module_cmds \ +@@ -12477,6 +13144,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -22661,7 +22894,7 @@ index b124acf9259..e4075ef3a2c 100755 postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -13044,7 +13716,8 @@ $as_echo X"$file" | +@@ -13075,7 +13743,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -22671,7 +22904,7 @@ index b124acf9259..e4075ef3a2c 100755 # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -13147,19 +13820,42 @@ SP2NL=$lt_lt_SP2NL +@@ -13178,19 +13847,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -22715,7 +22948,7 @@ index b124acf9259..e4075ef3a2c 100755 # A symbol stripping program. STRIP=$lt_STRIP -@@ -13189,6 +13885,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +@@ -13220,6 +13912,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -22728,7 +22961,7 @@ index b124acf9259..e4075ef3a2c 100755 # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -13198,6 +13900,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -13229,6 +13927,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -22738,7 +22971,7 @@ index b124acf9259..e4075ef3a2c 100755 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -13312,12 +14017,12 @@ with_gcc=$GCC +@@ -13343,12 +14044,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -22754,7 +22987,7 @@ index b124acf9259..e4075ef3a2c 100755 # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -13404,9 +14109,6 @@ inherit_rpath=$inherit_rpath +@@ -13435,9 +14136,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -22764,7 +22997,7 @@ index b124acf9259..e4075ef3a2c 100755 # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -13422,6 +14124,9 @@ include_expsyms=$lt_include_expsyms +@@ -13453,6 +14151,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -22774,7 +23007,7 @@ index b124acf9259..e4075ef3a2c 100755 # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -13454,210 +14159,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -13485,210 +14186,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? diff --git a/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index c3a95e653..0e4790577 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 0e026a8758a5416b548de21d5245477cf8e33ed2 Mon Sep 17 00:00:00 2001 +From ff256618bf85acca889920a1fb63ddea64cc98bc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index 824d9d460..6afd37aaf 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 9d41698ca97b2c5c20ac83147de1f02d385fa66f Mon Sep 17 00:00:00 2001 +From 4b612f902c596838ab260194f840a466f8291618 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch index 0602c803d..135cd0f9a 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch @@ -1,4 +1,4 @@ -From 805e3ce0c20bee5049ff167ab6f620a230c6db51 Mon Sep 17 00:00:00 2001 +From 707a5d49ecaa4fd722176d764251360a44fc5655 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 15 Apr 2020 14:17:20 -0700 Subject: [PATCH] Check for clang before checking gcc version @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 7b369071141..7da69e27ce9 100755 +index e8ba1a1d3de..e00d4764583 100755 --- a/configure +++ b/configure -@@ -5093,7 +5093,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -5275,7 +5275,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31,10 +31,10 @@ index 7b369071141..7da69e27ce9 100755 #endif int main() {} diff --git a/configure.ac b/configure.ac -index 92f01fb3ed7..e99d67ab86b 100644 +index 3a8a3ae1f3b..c7f08b802d0 100644 --- a/configure.ac +++ b/configure.ac -@@ -1311,7 +1311,7 @@ if test "$GCC" = yes; then +@@ -1309,7 +1309,7 @@ if test "$GCC" = yes; then AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) AC_LANG_PUSH(C++) AC_LINK_IFELSE([AC_LANG_SOURCE([ diff --git a/poky/meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch b/poky/meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch deleted file mode 100644 index b4880e0d1..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0017-Add-support-for-the-DW_FORM_strx-forms-to-the-BFD-li.patch +++ /dev/null @@ -1,183 +0,0 @@ -From a50c11a7a47b26e6a3e095dfb72aa2e465919fb6 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc@redhat.com> -Date: Fri, 5 Mar 2021 17:06:59 +0000 -Subject: [PATCH] Add support for the DW_FORM_strx* forms to the BFD library. - - PR 27521 - * dwarf2.c (is_str_attr): Add DW_FORM_strx* forms. - (read_indexed_string): Placeholder function. - (read_attribute_value): Handle DW_FORM_strx* and DW_FORM_addrx* - forms. - -Upstream-Status: Backport [https://sourceware.org/bugzilla/show_bug.cgi?id=27521] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - bfd/dwarf2.c | 105 ++++++++++++++++++++++++++++++++------------------- - 1 file changed, 67 insertions(+), 38 deletions(-) - -diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c -index 5651696c0f7..5ffcd93f54c 100644 ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -1160,8 +1160,23 @@ read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash, - static inline bfd_boolean - is_str_attr (enum dwarf_form form) - { -- return (form == DW_FORM_string || form == DW_FORM_strp -- || form == DW_FORM_line_strp || form == DW_FORM_GNU_strp_alt); -+ return (form == DW_FORM_string -+ || form == DW_FORM_strp -+ || form == DW_FORM_strx -+ || form == DW_FORM_strx1 -+ || form == DW_FORM_strx2 -+ || form == DW_FORM_strx3 -+ || form == DW_FORM_strx4 -+ || form == DW_FORM_line_strp -+ || form == DW_FORM_GNU_strp_alt); -+} -+ -+static const char * -+read_indexed_string (bfd_uint64_t index ATTRIBUTE_UNUSED, -+ struct comp_unit * unit ATTRIBUTE_UNUSED) -+{ -+ /* FIXME: Add support for indexed strings. */ -+ return "<indexed strings not yet supported>"; - } - - /* Read and fill in the value of attribute ATTR as described by FORM. -@@ -1192,6 +1207,9 @@ read_attribute_value (struct attribute * attr, - - switch (form) - { -+ case DW_FORM_flag_present: -+ attr->u.val = 1; -+ break; - case DW_FORM_ref_addr: - /* DW_FORM_ref_addr is an address in DWARF2, and an offset in - DWARF3. */ -@@ -1237,15 +1255,32 @@ read_attribute_value (struct attribute * attr, - info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; -+ case DW_FORM_ref1: -+ case DW_FORM_flag: -+ case DW_FORM_data1: -+ case DW_FORM_addrx1: -+ attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end); -+ info_ptr += 1; -+ break; - case DW_FORM_data2: -+ case DW_FORM_ref2: - attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end); - info_ptr += 2; - break; -+ case DW_FORM_addrx3: -+ attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end); -+ attr->u.val &= 0xffffff; -+ info_ptr += 3; -+ break; -+ case DW_FORM_ref4: - case DW_FORM_data4: -+ case DW_FORM_addrx4: - attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end); - info_ptr += 4; - break; - case DW_FORM_data8: -+ case DW_FORM_ref8: -+ case DW_FORM_ref_sig8: - attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end); - info_ptr += 8; - break; -@@ -1265,6 +1300,33 @@ read_attribute_value (struct attribute * attr, - attr->u.str = read_alt_indirect_string (unit, info_ptr, info_ptr_end, &bytes_read); - info_ptr += bytes_read; - break; -+ case DW_FORM_strx1: -+ attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end); -+ info_ptr += 1; -+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit); -+ break; -+ case DW_FORM_strx2: -+ attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end); -+ info_ptr += 2; -+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit); -+ break; -+ case DW_FORM_strx3: -+ attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end); -+ info_ptr += 3; -+ attr->u.val &= 0xffffff; -+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit); -+ break; -+ case DW_FORM_strx4: -+ attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end); -+ info_ptr += 4; -+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit); -+ break; -+ case DW_FORM_strx: -+ attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, -+ FALSE, info_ptr_end); -+ info_ptr += bytes_read; -+ attr->u.str = (char *) read_indexed_string (attr->u.val, unit); -+ break; - case DW_FORM_exprloc: - case DW_FORM_block: - amt = sizeof (struct dwarf_block); -@@ -1287,48 +1349,14 @@ read_attribute_value (struct attribute * attr, - info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; -- case DW_FORM_data1: -- attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end); -- info_ptr += 1; -- break; -- case DW_FORM_flag: -- attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end); -- info_ptr += 1; -- break; -- case DW_FORM_flag_present: -- attr->u.val = 1; -- break; - case DW_FORM_sdata: - attr->u.sval = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, - TRUE, info_ptr_end); - info_ptr += bytes_read; - break; -- case DW_FORM_udata: -- attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, -- FALSE, info_ptr_end); -- info_ptr += bytes_read; -- break; -- case DW_FORM_ref1: -- attr->u.val = read_1_byte (abfd, info_ptr, info_ptr_end); -- info_ptr += 1; -- break; -- case DW_FORM_ref2: -- attr->u.val = read_2_bytes (abfd, info_ptr, info_ptr_end); -- info_ptr += 2; -- break; -- case DW_FORM_ref4: -- attr->u.val = read_4_bytes (abfd, info_ptr, info_ptr_end); -- info_ptr += 4; -- break; -- case DW_FORM_ref8: -- attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end); -- info_ptr += 8; -- break; -- case DW_FORM_ref_sig8: -- attr->u.val = read_8_bytes (abfd, info_ptr, info_ptr_end); -- info_ptr += 8; -- break; - case DW_FORM_ref_udata: -+ case DW_FORM_udata: -+ case DW_FORM_addrx: - attr->u.val = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, - FALSE, info_ptr_end); - info_ptr += bytes_read; -@@ -1361,6 +1389,7 @@ read_attribute_value (struct attribute * attr, - info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); - attr->u.blk = blk; - break; -+ - default: - _bfd_error_handler (_("DWARF error: invalid or unhandled FORM value: %#x"), - form); diff --git a/poky/meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch b/poky/meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch deleted file mode 100644 index 353b68085..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/0018-Add-DWARF-5-support-in-gold.patch +++ /dev/null @@ -1,1374 +0,0 @@ -From 29dab7648672342418a9d32767e3b3182d9e6a30 Mon Sep 17 00:00:00 2001 -From: Cary Coutant <ccoutant@gmail.com> -Date: Wed, 17 Mar 2021 21:31:15 -0700 -Subject: [PATCH] Add DWARF 5 support in gold. - -elfcpp/ - PR gold/27246 - * dwarf.h (enum DW_LNCT): Add line number table content type codes. - (enum DW_LINE_OPS): Reformat. - (enum DW_LINE_EXTENDED_OPS): Reformat. - (enum DW_CHILDREN): Reformat. - (enum DW_RLE): Add range list entry types. - (enum DW_SECT): Update values for DWARF 5. - -gold/ - PR gold/27246 - * dwarf_reader.cc (Dwarf_abbrev_table::do_get_abbrev): Handle - DW_FORM_implicit_const. - (Dwarf_ranges_table::read_ranges_table): Add version parameter; - Adjust all callers. Look for .debug_rnglists section if DWARF 5. - (Dwarf_ranges_table::read_range_list_v5): New method. - (Dwarf_die::read_attributes): Handle new DWARF 5 DW_FORM codes. - (Dwarf_die::skip_attributes): Likewise. - (Dwarf_info_reader::do_parse): Support DWARF 5 unit header format. - (Dwarf_info_reader::read_3bytes_from_pointer): New method. - (Sized_dwarf_line_info::Sized_dwarf_line_info): Initialize - str_buffer_, str_buffer_start, reloc_map_, line_number_map_. - Look for .debug_line_str section. - (Sized_dwarf_line_info::read_header_prolog): Support DWARF 5 prolog. - (Sized_dwarf_line_info::read_header_tables): Rename to... - (Sized_dwarf_line_info::read_header_tables_v2): ... this. - (Sized_dwarf_line_info::read_header_tables_v5): New method. - (Sized_dwarf_line_info::process_one_opcode): Insert missing "this->". - Change advance_line to signed int64_t. - (Sized_dwarf_line_info::read_lines): Add endptr parameter; adjust - callers. Insert missing "this->". - (Sized_dwarf_line_info::read_line_mappings): Support DWARF 5. - (Sized_dwarf_line_info::do_addr2line): Add debug code. - * dwarf_reader.h (Dwarf_abbrev_table::Attribute): Add implicit_const - field. Adjust constructor. - (Dwarf_abbrev_table::add_sttribute): Add implicit_const parameter. - (Dwarf_ranges_table::read_ranges_table): Add version parameter. - (Dwarf_ranges_table::read_range_list_v5): New method. - (Dwarf_die): Remove unused attr_off field. - (Dwarf_info_reader::Dwarf_info_reader): Initialize unit_type_ field. - (Dwarf_info_reader::is_type_unit): New method. - (Dwarf_info_reader::read_3bytes_from_pointer): New method. - (Dwarf_info_reader::read_range_list): Call read_range_list_v5 for - DWARF 5 range lists. - (Dwarf_info_reader::is_type_unit_): Remove. - (Dwarf_info_reader::unit_type_): New field. - (Sized_dwarf_line_info::~Sized_dwarf_line_info): Delete - str_buffer_start_. - (Sized_dwarf_line_info::read_header_tables): Rename to... - (Sized_dwarf_line_info::read_header_tables_v2): ... this. - (Sized_dwarf_line_info::read_header_tables_v5): New method. - (Sized_dwarf_line_info::read_lines): Add endptr parameter. - (Sized_dwarf_line_info::Dwarf_line_infoHeader): Add address_size field. - (Sized_dwarf_line_info::str_buffer_): New field. - (Sized_dwarf_line_info::str_buffer_end_): New field. - (Sized_dwarf_line_info::str_buffer_start_): New field. - (Sized_dwarf_line_info::end_of_header_length_): New field. - (Sized_dwarf_line_info::end_of_unit_): New field. - -Upstream-Status: Backport [5cde809b7b9 Add DWARF 5 support in gold.] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - elfcpp/dwarf.h | 89 +++++-- - gold/dwarf_reader.cc | 591 +++++++++++++++++++++++++++++++++++++------ - gold/dwarf_reader.h | 103 ++++++-- - 3 files changed, 654 insertions(+), 129 deletions(-) - -diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h -index e24347f8481..c9a9e02369c 100644 ---- a/elfcpp/dwarf.h -+++ b/elfcpp/dwarf.h -@@ -152,35 +152,48 @@ enum DW_EH_PE - DW_EH_PE_indirect = 0x80 - }; - -+// Line number table content type codes. -+ -+enum DW_LNCT -+{ -+ DW_LNCT_path = 0x1, -+ DW_LNCT_directory_index = 0x2, -+ DW_LNCT_timestamp = 0x3, -+ DW_LNCT_size = 0x4, -+ DW_LNCT_MD5 = 0x5, -+ DW_LNCT_lo_user = 0x2000, -+ DW_LNCT_hi_user = 0x3fff -+}; -+ - // Line number opcodes. - - enum DW_LINE_OPS - { -- DW_LNS_extended_op = 0, -- DW_LNS_copy = 1, -- DW_LNS_advance_pc = 2, -- DW_LNS_advance_line = 3, -- DW_LNS_set_file = 4, -- DW_LNS_set_column = 5, -- DW_LNS_negate_stmt = 6, -- DW_LNS_set_basic_block = 7, -- DW_LNS_const_add_pc = 8, -- DW_LNS_fixed_advance_pc = 9, -+ DW_LNS_extended_op = 0x00, -+ DW_LNS_copy = 0x01, -+ DW_LNS_advance_pc = 0x02, -+ DW_LNS_advance_line = 0x03, -+ DW_LNS_set_file = 0x04, -+ DW_LNS_set_column = 0x05, -+ DW_LNS_negate_stmt = 0x06, -+ DW_LNS_set_basic_block = 0x07, -+ DW_LNS_const_add_pc = 0x08, -+ DW_LNS_fixed_advance_pc = 0x09, - // DWARF 3. -- DW_LNS_set_prologue_end = 10, -- DW_LNS_set_epilogue_begin = 11, -- DW_LNS_set_isa = 12 -+ DW_LNS_set_prologue_end = 0x0a, -+ DW_LNS_set_epilogue_begin = 0x0b, -+ DW_LNS_set_isa = 0x0c - }; - - // Line number extended opcodes. - - enum DW_LINE_EXTENDED_OPS - { -- DW_LNE_end_sequence = 1, -- DW_LNE_set_address = 2, -- DW_LNE_define_file = 3, -+ DW_LNE_end_sequence = 0x01, -+ DW_LNE_set_address = 0x02, -+ DW_LNE_define_file = 0x03, - // DWARF4. -- DW_LNE_set_discriminator = 4, -+ DW_LNE_set_discriminator = 0x04, - // HP extensions. - DW_LNE_HP_negate_is_UV_update = 0x11, - DW_LNE_HP_push_context = 0x12, -@@ -191,13 +204,15 @@ enum DW_LINE_EXTENDED_OPS - DW_LNE_HP_negate_post_semantics = 0x17, - DW_LNE_HP_negate_function_exit = 0x18, - DW_LNE_HP_negate_front_end_logical = 0x19, -- DW_LNE_HP_define_proc = 0x20 -+ DW_LNE_HP_define_proc = 0x20, -+ DW_LNE_lo_user = 0x80, -+ DW_LNE_hi_user = 0xff - }; - - enum DW_CHILDREN - { -- DW_CHILDREN_no =0x00, -- DW_CHILDREN_yes =0x01 -+ DW_CHILDREN_no = 0, -+ DW_CHILDREN_yes = 1 - }; - - // Source language names and codes. -@@ -247,20 +262,38 @@ enum DW_LANG - DW_LANG_HP_Assembler = 0x8007 - }; - -+// Range list entry kinds in .debug_rnglists* section. -+ -+enum DW_RLE -+{ -+ DW_RLE_end_of_list = 0x00, -+ DW_RLE_base_addressx = 0x01, -+ DW_RLE_startx_endx = 0x02, -+ DW_RLE_startx_length = 0x03, -+ DW_RLE_offset_pair = 0x04, -+ DW_RLE_base_address = 0x05, -+ DW_RLE_start_end = 0x06, -+ DW_RLE_start_length = 0x07 -+}; -+ - // DWARF section identifiers used in the package format. - // Extensions for Fission. See http://gcc.gnu.org/wiki/DebugFissionDWP. -+// Added (with changes) in DWARF 5. - - enum DW_SECT - { -- DW_SECT_INFO = 1, -- DW_SECT_TYPES = 2, -- DW_SECT_ABBREV = 3, -- DW_SECT_LINE = 4, -- DW_SECT_LOC = 5, -+ DW_SECT_INFO = 1, -+ DW_SECT_ABBREV = 3, -+ DW_SECT_LINE = 4, -+ DW_SECT_LOCLISTS = 5, - DW_SECT_STR_OFFSETS = 6, -- DW_SECT_MACINFO = 7, -- DW_SECT_MACRO = 8, -- DW_SECT_MAX = DW_SECT_MACRO, -+ DW_SECT_MACINFO = 7, -+ DW_SECT_RNGLISTS = 8, -+ DW_SECT_MAX = DW_SECT_RNGLISTS, -+ // These were used only for the experimental Fission support in DWARF 4. -+ DW_SECT_TYPES = 2, -+ DW_SECT_LOC = 5, -+ DW_SECT_MACRO = 8 - }; - - } // End namespace elfcpp. -diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc -index f0e6b89bde2..83a0114ed39 100644 ---- a/gold/dwarf_reader.cc -+++ b/gold/dwarf_reader.cc -@@ -26,6 +26,7 @@ - #include <utility> - #include <vector> - -+#include "debug.h" - #include "elfcpp_swap.h" - #include "dwarf.h" - #include "object.h" -@@ -275,6 +276,14 @@ Dwarf_abbrev_table::do_get_abbrev(unsigned int code) - uint64_t form = read_unsigned_LEB_128(this->buffer_pos_, &len); - this->buffer_pos_ += len; - -+ // For DW_FORM_implicit_const, read the constant. -+ int64_t implicit_const = 0; -+ if (form == elfcpp::DW_FORM_implicit_const) -+ { -+ implicit_const = read_signed_LEB_128(this->buffer_pos_, &len); -+ this->buffer_pos_ += len; -+ } -+ - // A (0,0) pair terminates the list. - if (attr == 0 && form == 0) - break; -@@ -282,7 +291,7 @@ Dwarf_abbrev_table::do_get_abbrev(unsigned int code) - if (attr == elfcpp::DW_AT_sibling) - entry->has_sibling_attribute = true; - -- entry->add_attribute(attr, form); -+ entry->add_attribute(attr, form, implicit_const); - } - - this->store_abbrev(nextcode, entry); -@@ -302,8 +311,16 @@ Dwarf_ranges_table::read_ranges_table( - Relobj* object, - const unsigned char* symtab, - off_t symtab_size, -- unsigned int ranges_shndx) -+ unsigned int ranges_shndx, -+ unsigned int version) - { -+ const std::string section_name(version < 5 -+ ? ".debug_ranges" -+ : ".debug_rnglists"); -+ const std::string compressed_section_name(version < 5 -+ ? ".zdebug_ranges" -+ : ".zdebug_rnglists"); -+ - // If we've already read this abbrev table, return immediately. - if (this->ranges_shndx_ > 0 - && this->ranges_shndx_ == ranges_shndx) -@@ -318,7 +335,7 @@ Dwarf_ranges_table::read_ranges_table( - for (unsigned int i = 1; i < object->shnum(); ++i) - { - std::string name = object->section_name(i); -- if (name == ".debug_ranges" || name == ".zdebug_ranges") -+ if (name == section_name || name == compressed_section_name) - { - ranges_shndx = i; - this->output_section_offset_ = object->output_section_offset(i); -@@ -393,7 +410,7 @@ Dwarf_ranges_table::read_range_list( - { - Dwarf_range_list* ranges; - -- if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx)) -+ if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx, 4)) - return NULL; - - // Correct the offset. For incremental update links, we have a -@@ -459,6 +476,125 @@ Dwarf_ranges_table::read_range_list( - return ranges; - } - -+// Read a DWARF 5 range list from section RANGES_SHNDX at offset RANGES_OFFSET. -+ -+Dwarf_range_list* -+Dwarf_ranges_table::read_range_list_v5( -+ Relobj* object, -+ const unsigned char* symtab, -+ off_t symtab_size, -+ unsigned int addr_size, -+ unsigned int ranges_shndx, -+ off_t offset) -+{ -+ Dwarf_range_list* ranges; -+ -+ if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx, 5)) -+ return NULL; -+ -+ ranges = new Dwarf_range_list(); -+ off_t base = 0; -+ unsigned int shndx0 = 0; -+ -+ // Correct the offset. For incremental update links, we have a -+ // relocated offset that is relative to the output section, but -+ // here we need an offset relative to the input section. -+ offset -= this->output_section_offset_; -+ -+ // Read the range list at OFFSET. -+ const unsigned char* prle = this->ranges_buffer_ + offset; -+ while (prle < this->ranges_buffer_end_) -+ { -+ off_t start; -+ off_t end; -+ unsigned int shndx1 = 0; -+ unsigned int shndx2 = 0; -+ size_t len; -+ -+ // Read the entry type. -+ unsigned int rle_type = *prle++; -+ offset += 1; -+ -+ if (rle_type == elfcpp::DW_RLE_end_of_list) -+ break; -+ -+ switch (rle_type) -+ { -+ case elfcpp::DW_RLE_base_address: -+ if (addr_size == 4) -+ base = this->dwinfo_->read_from_pointer<32>(prle); -+ else -+ base = this->dwinfo_->read_from_pointer<64>(prle); -+ if (this->ranges_reloc_mapper_ != NULL) -+ shndx0 = this->lookup_reloc(offset, &base); -+ prle += addr_size; -+ offset += addr_size; -+ break; -+ -+ case elfcpp::DW_RLE_offset_pair: -+ start = read_unsigned_LEB_128(prle, &len); -+ prle += len; -+ offset += len; -+ end = read_unsigned_LEB_128(prle, &len); -+ prle += len; -+ offset += len; -+ if (shndx0 == 0 || object->is_section_included(shndx0)) -+ ranges->add(shndx0, base + start, base + end); -+ break; -+ -+ case elfcpp::DW_RLE_start_end: -+ if (addr_size == 4) -+ { -+ start = this->dwinfo_->read_from_pointer<32>(prle); -+ end = this->dwinfo_->read_from_pointer<32>(prle + 4); -+ } -+ else -+ { -+ start = this->dwinfo_->read_from_pointer<64>(prle); -+ end = this->dwinfo_->read_from_pointer<64>(prle + 8); -+ } -+ if (this->ranges_reloc_mapper_ != NULL) -+ { -+ shndx1 = this->lookup_reloc(offset, &start); -+ shndx2 = this->lookup_reloc(offset + addr_size, &end); -+ if (shndx1 != shndx2) -+ gold_warning(_("%s: DWARF info may be corrupt; offsets in a " -+ "range list entry are in different sections"), -+ object->name().c_str()); -+ } -+ prle += addr_size * 2; -+ offset += addr_size * 2; -+ if (shndx1 == 0 || object->is_section_included(shndx1)) -+ ranges->add(shndx1, start, end); -+ break; -+ -+ case elfcpp::DW_RLE_start_length: -+ if (addr_size == 4) -+ start = this->dwinfo_->read_from_pointer<32>(prle); -+ else -+ start = this->dwinfo_->read_from_pointer<64>(prle); -+ if (this->ranges_reloc_mapper_ != NULL) -+ shndx1 = this->lookup_reloc(offset, &start); -+ prle += addr_size; -+ offset += addr_size; -+ end = start + read_unsigned_LEB_128(prle, &len); -+ prle += len; -+ offset += len; -+ if (shndx1 == 0 || object->is_section_included(shndx1)) -+ ranges->add(shndx1, start, end); -+ break; -+ -+ default: -+ gold_warning(_("%s: DWARF range list contains " -+ "unsupported entry type (%d)"), -+ object->name().c_str(), rle_type); -+ break; -+ } -+ } -+ -+ return ranges; -+} -+ - // Look for a relocation at offset OFF in the range table, - // and return the section index and offset of the target. - -@@ -709,7 +845,13 @@ Dwarf_die::read_attributes() - case elfcpp::DW_FORM_flag_present: - attr_value.val.intval = 1; - break; -+ case elfcpp::DW_FORM_implicit_const: -+ attr_value.val.intval = -+ this->abbrev_code_->attributes[i].implicit_const; -+ break; - case elfcpp::DW_FORM_strp: -+ case elfcpp::DW_FORM_strp_sup: -+ case elfcpp::DW_FORM_line_strp: - { - off_t str_off; - if (this->dwinfo_->offset_size() == 4) -@@ -722,6 +864,26 @@ Dwarf_die::read_attributes() - attr_value.val.refval = str_off; - break; - } -+ case elfcpp::DW_FORM_strx: -+ case elfcpp::DW_FORM_GNU_str_index: -+ attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len); -+ pattr += len; -+ break; -+ case elfcpp::DW_FORM_strx1: -+ attr_value.val.uintval = *pattr++; -+ break; -+ case elfcpp::DW_FORM_strx2: -+ attr_value.val.uintval = -+ this->dwinfo_->read_from_pointer<16>(&pattr); -+ break; -+ case elfcpp::DW_FORM_strx3: -+ attr_value.val.uintval = -+ this->dwinfo_->read_3bytes_from_pointer(&pattr); -+ break; -+ case elfcpp::DW_FORM_strx4: -+ attr_value.val.uintval = -+ this->dwinfo_->read_from_pointer<32>(&pattr); -+ break; - case elfcpp::DW_FORM_sec_offset: - { - off_t sec_off; -@@ -747,7 +909,6 @@ Dwarf_die::read_attributes() - this->dwinfo_->lookup_reloc(attr_off, &sec_off); - attr_value.aux.shndx = shndx; - attr_value.val.refval = sec_off; -- ref_form = true; - break; - } - case elfcpp::DW_FORM_ref_addr: -@@ -815,6 +976,7 @@ Dwarf_die::read_attributes() - break; - } - case elfcpp::DW_FORM_ref4: -+ case elfcpp::DW_FORM_ref_sup4: - { - off_t sec_off; - sec_off = this->dwinfo_->read_from_pointer<32>(&pattr); -@@ -835,11 +997,20 @@ Dwarf_die::read_attributes() - attr_value.val.intval = sec_off; - break; - } -+ case elfcpp::DW_FORM_data16: -+ { -+ // For now, treat this as a 16-byte block. -+ attr_value.val.blockval = pattr; -+ attr_value.aux.blocklen = 16; -+ pattr += 16; -+ break; -+ } - case elfcpp::DW_FORM_ref_sig8: - attr_value.val.uintval = - this->dwinfo_->read_from_pointer<64>(&pattr); - break; - case elfcpp::DW_FORM_ref8: -+ case elfcpp::DW_FORM_ref_sup8: - { - off_t sec_off; - sec_off = this->dwinfo_->read_from_pointer<64>(&pattr); -@@ -856,11 +1027,29 @@ Dwarf_die::read_attributes() - pattr += len; - break; - case elfcpp::DW_FORM_udata: -+ attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len); -+ pattr += len; -+ break; -+ case elfcpp::DW_FORM_addrx: - case elfcpp::DW_FORM_GNU_addr_index: -- case elfcpp::DW_FORM_GNU_str_index: - attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len); - pattr += len; - break; -+ case elfcpp::DW_FORM_addrx1: -+ attr_value.val.uintval = *pattr++; -+ break; -+ case elfcpp::DW_FORM_addrx2: -+ attr_value.val.uintval = -+ this->dwinfo_->read_from_pointer<16>(&pattr); -+ break; -+ case elfcpp::DW_FORM_addrx3: -+ attr_value.val.uintval = -+ this->dwinfo_->read_3bytes_from_pointer(&pattr); -+ break; -+ case elfcpp::DW_FORM_addrx4: -+ attr_value.val.uintval = -+ this->dwinfo_->read_from_pointer<32>(&pattr); -+ break; - case elfcpp::DW_FORM_sdata: - attr_value.val.intval = read_signed_LEB_128(pattr, &len); - pattr += len; -@@ -870,6 +1059,11 @@ Dwarf_die::read_attributes() - len = strlen(attr_value.val.stringval); - pattr += len + 1; - break; -+ case elfcpp::DW_FORM_loclistx: -+ case elfcpp::DW_FORM_rnglistx: -+ attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len); -+ pattr += len; -+ break; - default: - return false; - } -@@ -954,9 +1148,12 @@ Dwarf_die::skip_attributes() - switch(form) - { - case elfcpp::DW_FORM_flag_present: -+ case elfcpp::DW_FORM_implicit_const: - break; - case elfcpp::DW_FORM_strp: - case elfcpp::DW_FORM_sec_offset: -+ case elfcpp::DW_FORM_strp_sup: -+ case elfcpp::DW_FORM_line_strp: - pattr += this->dwinfo_->offset_size(); - break; - case elfcpp::DW_FORM_addr: -@@ -993,23 +1190,42 @@ Dwarf_die::skip_attributes() - case elfcpp::DW_FORM_data1: - case elfcpp::DW_FORM_ref1: - case elfcpp::DW_FORM_flag: -+ case elfcpp::DW_FORM_strx1: -+ case elfcpp::DW_FORM_addrx1: - pattr += 1; - break; - case elfcpp::DW_FORM_data2: - case elfcpp::DW_FORM_ref2: -+ case elfcpp::DW_FORM_strx2: -+ case elfcpp::DW_FORM_addrx2: - pattr += 2; - break; -+ case elfcpp::DW_FORM_strx3: -+ case elfcpp::DW_FORM_addrx3: -+ pattr += 3; -+ break; - case elfcpp::DW_FORM_data4: - case elfcpp::DW_FORM_ref4: -+ case elfcpp::DW_FORM_ref_sup4: -+ case elfcpp::DW_FORM_strx4: -+ case elfcpp::DW_FORM_addrx4: - pattr += 4; - break; - case elfcpp::DW_FORM_data8: - case elfcpp::DW_FORM_ref8: - case elfcpp::DW_FORM_ref_sig8: -+ case elfcpp::DW_FORM_ref_sup8: - pattr += 8; - break; -+ case elfcpp::DW_FORM_data16: -+ pattr += 16; -+ break; - case elfcpp::DW_FORM_ref_udata: - case elfcpp::DW_FORM_udata: -+ case elfcpp::DW_FORM_addrx: -+ case elfcpp::DW_FORM_strx: -+ case elfcpp::DW_FORM_loclistx: -+ case elfcpp::DW_FORM_rnglistx: - case elfcpp::DW_FORM_GNU_addr_index: - case elfcpp::DW_FORM_GNU_str_index: - read_unsigned_LEB_128(pattr, &len); -@@ -1313,6 +1529,13 @@ Dwarf_info_reader::do_parse() - elfcpp::Swap_unaligned<16, big_endian>::readval(pinfo); - pinfo += 2; - -+ // DWARF 5: Read the unit type (1 byte) and address size (1 byte). -+ if (this->cu_version_ >= 5) -+ { -+ this->unit_type_ = *pinfo++; -+ this->address_size_ = *pinfo++; -+ } -+ - // Read debug_abbrev_offset (4 or 8 bytes). - if (this->offset_size_ == 4) - abbrev_offset = elfcpp::Swap_unaligned<32, big_endian>::readval(pinfo); -@@ -1333,13 +1556,14 @@ Dwarf_info_reader::do_parse() - } - pinfo += this->offset_size_; - -- // Read address_size (1 byte). -- this->address_size_ = *pinfo++; -+ // DWARF 2-4: Read address_size (1 byte). -+ if (this->cu_version_ < 5) -+ this->address_size_ = *pinfo++; - - // For type units, read the two extra fields. - uint64_t signature = 0; - off_t type_offset = 0; -- if (this->is_type_unit_) -+ if (this->is_type_unit()) - { - if (!this->check_buffer(pinfo + 8 + this->offset_size_)) - break; -@@ -1369,7 +1593,7 @@ Dwarf_info_reader::do_parse() - if (root_die.tag() != 0) - { - // Visit the CU or TU. -- if (this->is_type_unit_) -+ if (this->is_type_unit()) - this->visit_type_unit(section_offset + this->cu_offset_, - cu_end - cu_start, type_offset, signature, - &root_die); -@@ -1460,6 +1684,19 @@ Dwarf_info_reader::read_from_pointer(const unsigned char** source) - return return_value; - } - -+// Read a 3-byte integer. Update SOURCE after read. -+inline typename elfcpp::Valtype_base<32>::Valtype -+Dwarf_info_reader::read_3bytes_from_pointer(const unsigned char** source) -+{ -+ typename elfcpp::Valtype_base<32>::Valtype return_value; -+ if (this->object_->is_big_endian()) -+ return_value = ((*source)[0] << 16) | ((*source)[1] << 8) | (*source)[2]; -+ else -+ return_value = ((*source)[2] << 16) | ((*source)[1] << 8) | (*source)[0]; -+ *source += 3; -+ return return_value; -+} -+ - // Look for a relocation at offset ATTR_OFF in the dwarf info, - // and return the section index and offset of the target. - -@@ -1561,27 +1798,40 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info( - Object* object, - unsigned int read_shndx) - : data_valid_(false), buffer_(NULL), buffer_start_(NULL), -+ str_buffer_(NULL), str_buffer_start_(NULL), - reloc_mapper_(NULL), symtab_buffer_(NULL), directories_(), files_(), -- current_header_index_(-1) -+ current_header_index_(-1), reloc_map_(), line_number_map_() - { -- unsigned int debug_shndx; -+ unsigned int debug_line_shndx = 0; -+ unsigned int debug_line_str_shndx = 0; - -- for (debug_shndx = 1; debug_shndx < object->shnum(); ++debug_shndx) -+ for (unsigned int i = 1; i < object->shnum(); ++i) - { -+ section_size_type buffer_size; -+ bool is_new = false; -+ - // FIXME: do this more efficiently: section_name() isn't super-fast -- std::string name = object->section_name(debug_shndx); -+ std::string name = object->section_name(i); - if (name == ".debug_line" || name == ".zdebug_line") - { -- section_size_type buffer_size; -- bool is_new = false; -- this->buffer_ = object->decompressed_section_contents(debug_shndx, -- &buffer_size, -- &is_new); -+ this->buffer_ = -+ object->decompressed_section_contents(i, &buffer_size, &is_new); - if (is_new) - this->buffer_start_ = this->buffer_; - this->buffer_end_ = this->buffer_ + buffer_size; -- break; -+ debug_line_shndx = i; -+ } -+ else if (name == ".debug_line_str" || name == ".zdebug_line_str") -+ { -+ this->str_buffer_ = -+ object->decompressed_section_contents(i, &buffer_size, &is_new); -+ if (is_new) -+ this->str_buffer_start_ = this->str_buffer_; -+ this->str_buffer_end_ = this->str_buffer_ + buffer_size; -+ debug_line_str_shndx = i; - } -+ if (debug_line_shndx > 0 && debug_line_str_shndx > 0) -+ break; - } - if (this->buffer_ == NULL) - return; -@@ -1594,7 +1844,7 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info( - unsigned int reloc_sh_type = object->section_type(i); - if ((reloc_sh_type == elfcpp::SHT_REL - || reloc_sh_type == elfcpp::SHT_RELA) -- && object->section_info(i) == debug_shndx) -+ && object->section_info(i) == debug_line_shndx) - { - reloc_shndx = i; - this->track_relocs_type_ = reloc_sh_type; -@@ -1640,65 +1890,80 @@ Sized_dwarf_line_info<size, big_endian>::read_header_prolog( - uint32_t initial_length = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr); - lineptr += 4; - -- // In DWARF2/3, if the initial length is all 1 bits, then the offset -+ // In DWARF, if the initial length is all 1 bits, then the offset - // size is 8 and we need to read the next 8 bytes for the real length. - if (initial_length == 0xffffffff) - { -- header_.offset_size = 8; -+ this->header_.offset_size = 8; - initial_length = elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr); - lineptr += 8; - } - else -- header_.offset_size = 4; -+ this->header_.offset_size = 4; - -- header_.total_length = initial_length; -+ this->header_.total_length = initial_length; - -- gold_assert(lineptr + header_.total_length <= buffer_end_); -+ this->end_of_unit_ = lineptr + initial_length; -+ gold_assert(this->end_of_unit_ <= buffer_end_); - -- header_.version = elfcpp::Swap_unaligned<16, big_endian>::readval(lineptr); -+ this->header_.version = -+ elfcpp::Swap_unaligned<16, big_endian>::readval(lineptr); - lineptr += 2; - -- // Skip address size and segment selector for DWARF5. -- if (header_.version >= 5) -- lineptr += 2; -+ // We can only read versions 2-5 of the DWARF line number table. -+ // For other versions, just skip the entire line number table. -+ if (this->header_.version < 2 || this->header_.version > 5) -+ return this->end_of_unit_; - -- if (header_.offset_size == 4) -- header_.prologue_length = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr); -+ // DWARF 5 only: address size and segment selector. -+ if (this->header_.version >= 5) -+ { -+ this->header_.address_size = *lineptr; -+ // We ignore the segment selector. -+ lineptr += 2; -+ } -+ -+ if (this->header_.offset_size == 4) -+ this->header_.prologue_length = -+ elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr); - else -- header_.prologue_length = elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr); -- lineptr += header_.offset_size; -+ this->header_.prologue_length = -+ elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr); -+ lineptr += this->header_.offset_size; - -- header_.min_insn_length = *lineptr; -+ this->end_of_header_length_ = lineptr; -+ -+ this->header_.min_insn_length = *lineptr; - lineptr += 1; - -- if (header_.version < 4) -- header_.max_ops_per_insn = 1; -+ if (this->header_.version < 4) -+ this->header_.max_ops_per_insn = 1; - else - { - // DWARF 4 added the maximum_operations_per_instruction field. -- header_.max_ops_per_insn = *lineptr; -+ this->header_.max_ops_per_insn = *lineptr; - lineptr += 1; - // TODO: Add support for values other than 1. -- gold_assert(header_.max_ops_per_insn == 1); -+ gold_assert(this->header_.max_ops_per_insn == 1); - } - -- header_.default_is_stmt = *lineptr; -+ this->header_.default_is_stmt = *lineptr; - lineptr += 1; - -- header_.line_base = *reinterpret_cast<const signed char*>(lineptr); -+ this->header_.line_base = *reinterpret_cast<const signed char*>(lineptr); - lineptr += 1; - -- header_.line_range = *lineptr; -+ this->header_.line_range = *lineptr; - lineptr += 1; - -- header_.opcode_base = *lineptr; -+ this->header_.opcode_base = *lineptr; - lineptr += 1; - -- header_.std_opcode_lengths.resize(header_.opcode_base + 1); -- header_.std_opcode_lengths[0] = 0; -- for (int i = 1; i < header_.opcode_base; i++) -+ this->header_.std_opcode_lengths.resize(this->header_.opcode_base + 1); -+ this->header_.std_opcode_lengths[0] = 0; -+ for (int i = 1; i < this->header_.opcode_base; i++) - { -- header_.std_opcode_lengths[i] = *lineptr; -+ this->header_.std_opcode_lengths[i] = *lineptr; - lineptr += 1; - } - -@@ -1707,10 +1972,11 @@ Sized_dwarf_line_info<size, big_endian>::read_header_prolog( - - // The header for a debug_line section is mildly complicated, because - // the line info is very tightly encoded. -+// This routine is for DWARF versions 2, 3, and 4. - - template<int size, bool big_endian> - const unsigned char* --Sized_dwarf_line_info<size, big_endian>::read_header_tables( -+Sized_dwarf_line_info<size, big_endian>::read_header_tables_v2( - const unsigned char* lineptr) - { - ++this->current_header_index_; -@@ -1775,6 +2041,169 @@ Sized_dwarf_line_info<size, big_endian>::read_header_tables( - return lineptr; - } - -+// This routine is for DWARF version 5. -+ -+template<int size, bool big_endian> -+const unsigned char* -+Sized_dwarf_line_info<size, big_endian>::read_header_tables_v5( -+ const unsigned char* lineptr) -+{ -+ size_t len; -+ -+ ++this->current_header_index_; -+ -+ gold_assert(static_cast<int>(this->directories_.size()) -+ == this->current_header_index_); -+ gold_assert(static_cast<int>(this->files_.size()) -+ == this->current_header_index_); -+ -+ // Read the directory list. -+ unsigned int format_count = *lineptr; -+ lineptr += 1; -+ -+ unsigned int *types = new unsigned int[format_count]; -+ unsigned int *forms = new unsigned int[format_count]; -+ -+ for (unsigned int i = 0; i < format_count; i++) -+ { -+ types[i] = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ forms[i] = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ } -+ -+ uint64_t entry_count = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ this->directories_.push_back(std::vector<std::string>(0)); -+ std::vector<std::string>& dir_list = this->directories_.back(); -+ -+ for (unsigned int j = 0; j < entry_count; j++) -+ { -+ std::string dirname; -+ -+ for (unsigned int i = 0; i < format_count; i++) -+ { -+ if (types[i] == elfcpp::DW_LNCT_path) -+ { -+ if (forms[i] == elfcpp::DW_FORM_string) -+ { -+ dirname = reinterpret_cast<const char*>(lineptr); -+ lineptr += dirname.size() + 1; -+ } -+ else if (forms[i] == elfcpp::DW_FORM_line_strp) -+ { -+ uint64_t offset; -+ if (this->header_.offset_size == 4) -+ offset = -+ elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr); -+ else -+ offset = -+ elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr); -+ typename Reloc_map::const_iterator it -+ = this->reloc_map_.find(lineptr - this->buffer_); -+ if (it != reloc_map_.end()) -+ { -+ if (this->track_relocs_type_ == elfcpp::SHT_RELA) -+ offset = 0; -+ offset += it->second.second; -+ } -+ lineptr += this->header_.offset_size; -+ dirname = reinterpret_cast<const char*>(this->str_buffer_ -+ + offset); -+ } -+ else -+ return lineptr; -+ } -+ else -+ return lineptr; -+ } -+ dir_list.push_back(dirname); -+ } -+ -+ delete[] types; -+ delete[] forms; -+ -+ // Read the filenames list. -+ format_count = *lineptr; -+ lineptr += 1; -+ -+ types = new unsigned int[format_count]; -+ forms = new unsigned int[format_count]; -+ -+ for (unsigned int i = 0; i < format_count; i++) -+ { -+ types[i] = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ forms[i] = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ } -+ -+ entry_count = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ this->files_.push_back( -+ std::vector<std::pair<int, std::string> >(0)); -+ std::vector<std::pair<int, std::string> >& file_list = this->files_.back(); -+ -+ for (unsigned int j = 0; j < entry_count; j++) -+ { -+ const char* path = NULL; -+ int dirindex = 0; -+ -+ for (unsigned int i = 0; i < format_count; i++) -+ { -+ if (types[i] == elfcpp::DW_LNCT_path) -+ { -+ if (forms[i] == elfcpp::DW_FORM_string) -+ { -+ path = reinterpret_cast<const char*>(lineptr); -+ lineptr += strlen(path) + 1; -+ } -+ else if (forms[i] == elfcpp::DW_FORM_line_strp) -+ { -+ uint64_t offset; -+ if (this->header_.offset_size == 4) -+ offset = elfcpp::Swap_unaligned<32, big_endian>::readval(lineptr); -+ else -+ offset = elfcpp::Swap_unaligned<64, big_endian>::readval(lineptr); -+ typename Reloc_map::const_iterator it -+ = this->reloc_map_.find(lineptr - this->buffer_); -+ if (it != reloc_map_.end()) -+ { -+ if (this->track_relocs_type_ == elfcpp::SHT_RELA) -+ offset = 0; -+ offset += it->second.second; -+ } -+ lineptr += this->header_.offset_size; -+ path = reinterpret_cast<const char*>(this->str_buffer_ -+ + offset); -+ } -+ else -+ return lineptr; -+ } -+ else if (types[i] == elfcpp::DW_LNCT_directory_index) -+ { -+ if (forms[i] == elfcpp::DW_FORM_udata) -+ { -+ dirindex = read_unsigned_LEB_128(lineptr, &len); -+ lineptr += len; -+ } -+ else -+ return lineptr; -+ } -+ else -+ return lineptr; -+ } -+ gold_debug(DEBUG_LOCATION, "File %3d: %s", -+ static_cast<int>(file_list.size()), path); -+ file_list.push_back(std::make_pair(dirindex, path)); -+ } -+ -+ delete[] types; -+ delete[] forms; -+ -+ return lineptr; -+} -+ - // Process a single opcode in the .debug.line structure. - - template<int size, bool big_endian> -@@ -1790,15 +2219,15 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( - - // If the opcode is great than the opcode_base, it is a special - // opcode. Most line programs consist mainly of special opcodes. -- if (opcode >= header_.opcode_base) -+ if (opcode >= this->header_.opcode_base) - { -- opcode -= header_.opcode_base; -- const int advance_address = ((opcode / header_.line_range) -- * header_.min_insn_length); -+ opcode -= this->header_.opcode_base; -+ const int advance_address = ((opcode / this->header_.line_range) -+ * this->header_.min_insn_length); - lsm->address += advance_address; - -- const int advance_line = ((opcode % header_.line_range) -- + header_.line_base); -+ const int advance_line = ((opcode % this->header_.line_range) -+ + this->header_.line_base); - lsm->line_num += advance_line; - lsm->basic_block = true; - *len = oplen; -@@ -1818,13 +2247,13 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( - const uint64_t advance_address - = read_unsigned_LEB_128(start, &templen); - oplen += templen; -- lsm->address += header_.min_insn_length * advance_address; -+ lsm->address += this->header_.min_insn_length * advance_address; - } - break; - - case elfcpp::DW_LNS_advance_line: - { -- const uint64_t advance_line = read_signed_LEB_128(start, &templen); -+ const int64_t advance_line = read_signed_LEB_128(start, &templen); - oplen += templen; - lsm->line_num += advance_line; - } -@@ -1865,9 +2294,9 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( - - case elfcpp::DW_LNS_const_add_pc: - { -- const int advance_address = (header_.min_insn_length -- * ((255 - header_.opcode_base) -- / header_.line_range)); -+ const int advance_address = (this->header_.min_insn_length -+ * ((255 - this->header_.opcode_base) -+ / this->header_.line_range)); - lsm->address += advance_address; - } - break; -@@ -1950,7 +2379,7 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( - default: - { - // Ignore unknown opcode silently -- for (int i = 0; i < header_.std_opcode_lengths[opcode]; i++) -+ for (int i = 0; i < this->header_.std_opcode_lengths[opcode]; i++) - { - size_t templen; - read_unsigned_LEB_128(start, &templen); -@@ -1970,28 +2399,24 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( - template<int size, bool big_endian> - unsigned const char* - Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr, -+ unsigned const char* endptr, - unsigned int shndx) - { - struct LineStateMachine lsm; - -- // LENGTHSTART is the place the length field is based on. It is the -- // point in the header after the initial length field. -- const unsigned char* lengthstart = buffer_; -- -- // In 64 bit dwarf, the initial length is 12 bytes, because of the -- // 0xffffffff at the start. -- if (header_.offset_size == 8) -- lengthstart += 12; -- else -- lengthstart += 4; -- -- while (lineptr < lengthstart + header_.total_length) -+ while (lineptr < endptr) - { -- ResetLineStateMachine(&lsm, header_.default_is_stmt); -+ ResetLineStateMachine(&lsm, this->header_.default_is_stmt); - while (!lsm.end_sequence) - { - size_t oplength; -+ -+ if (lineptr >= endptr) -+ break; -+ - bool add_line = this->process_one_opcode(lineptr, &lsm, &oplength); -+ lineptr += oplength; -+ - if (add_line - && (shndx == -1U || lsm.shndx == -1U || shndx == lsm.shndx)) - { -@@ -2012,11 +2437,10 @@ Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr - map.back().last_line_for_offset = false; - map.push_back(entry); - } -- lineptr += oplength; - } - } - -- return lengthstart + header_.total_length; -+ return endptr; - } - - // Read the relocations into a Reloc_map. -@@ -2057,9 +2481,17 @@ Sized_dwarf_line_info<size, big_endian>::read_line_mappings(unsigned int shndx) - { - const unsigned char* lineptr = this->buffer_; - lineptr = this->read_header_prolog(lineptr); -- lineptr = this->read_header_tables(lineptr); -- lineptr = this->read_lines(lineptr, shndx); -- this->buffer_ = lineptr; -+ if (this->header_.version >= 2 && this->header_.version <= 4) -+ { -+ lineptr = this->read_header_tables_v2(lineptr); -+ lineptr = this->read_lines(lineptr, this->end_of_unit_, shndx); -+ } -+ else if (this->header_.version == 5) -+ { -+ lineptr = this->read_header_tables_v5(lineptr); -+ lineptr = this->read_lines(lineptr, this->end_of_unit_, shndx); -+ } -+ this->buffer_ = this->end_of_unit_; - } - - // Sort the lines numbers, so addr2line can use binary search. -@@ -2215,6 +2647,9 @@ Sized_dwarf_line_info<size, big_endian>::do_addr2line( - off_t offset, - std::vector<std::string>* other_lines) - { -+ gold_debug(DEBUG_LOCATION, "do_addr2line: shndx %u offset %08x", -+ shndx, static_cast<int>(offset)); -+ - if (this->data_valid_ == false) - return ""; - -diff --git a/gold/dwarf_reader.h b/gold/dwarf_reader.h -index 80b2231327c..921a1f7c876 100644 ---- a/gold/dwarf_reader.h -+++ b/gold/dwarf_reader.h -@@ -173,11 +173,12 @@ class Dwarf_abbrev_table - // An attribute list entry. - struct Attribute - { -- Attribute(unsigned int a, unsigned int f) -- : attr(a), form(f) -+ Attribute(unsigned int a, unsigned int f, int c) -+ : attr(a), form(f), implicit_const(c) - { } - unsigned int attr; - unsigned int form; -+ int implicit_const; - }; - - // An abbrev code entry. -@@ -190,9 +191,9 @@ class Dwarf_abbrev_table - } - - void -- add_attribute(unsigned int attr, unsigned int form) -+ add_attribute(unsigned int attr, unsigned int form, int implicit_const) - { -- this->attributes.push_back(Attribute(attr, form)); -+ this->attributes.push_back(Attribute(attr, form, implicit_const)); - } - - // The DWARF tag. -@@ -349,14 +350,15 @@ class Dwarf_ranges_table - delete this->ranges_reloc_mapper_; - } - -- // Read the ranges table from an object file. -+ // Fetch the contents of the ranges table from an object file. - bool - read_ranges_table(Relobj* object, - const unsigned char* symtab, - off_t symtab_size, -- unsigned int ranges_shndx); -+ unsigned int ranges_shndx, -+ unsigned int version); - -- // Read the range table from an object file. -+ // Read the DWARF 2/3/4 range table. - Dwarf_range_list* - read_range_list(Relobj* object, - const unsigned char* symtab, -@@ -365,6 +367,15 @@ class Dwarf_ranges_table - unsigned int ranges_shndx, - off_t ranges_offset); - -+ // Read the DWARF 5 rnglists table. -+ Dwarf_range_list* -+ read_range_list_v5(Relobj* object, -+ const unsigned char* symtab, -+ off_t symtab_size, -+ unsigned int address_size, -+ unsigned int ranges_shndx, -+ off_t ranges_offset); -+ - // Look for a relocation at offset OFF in the range table, - // and return the section index and offset of the target. - unsigned int -@@ -490,8 +501,6 @@ class Dwarf_die - unsigned int shndx; - // Block length for block forms. - unsigned int blocklen; -- // Attribute offset for DW_FORM_strp. -- unsigned int attr_off; - } aux; - }; - -@@ -684,6 +693,10 @@ class Dwarf_die - // calls the various visit_xxx() methods for each header. Clients - // should derive a new class from this one and implement the - // visit_compilation_unit() and visit_type_unit() functions. -+// IS_TYPE_UNIT is true if we are reading from a .debug_types section, -+// which is used only in DWARF 4. For DWARF 5, it will be false, -+// and we will determine whether it's a type init when we parse the -+// header. - - class Dwarf_info_reader - { -@@ -695,7 +708,7 @@ class Dwarf_info_reader - unsigned int shndx, - unsigned int reloc_shndx, - unsigned int reloc_type) -- : is_type_unit_(is_type_unit), object_(object), symtab_(symtab), -+ : object_(object), symtab_(symtab), - symtab_size_(symtab_size), shndx_(shndx), reloc_shndx_(reloc_shndx), - reloc_type_(reloc_type), abbrev_shndx_(0), string_shndx_(0), - buffer_(NULL), buffer_end_(NULL), cu_offset_(0), cu_length_(0), -@@ -703,7 +716,12 @@ class Dwarf_info_reader - abbrev_table_(), ranges_table_(this), - reloc_mapper_(NULL), string_buffer_(NULL), string_buffer_end_(NULL), - owns_string_buffer_(false), string_output_section_offset_(0) -- { } -+ { -+ // For DWARF 4, we infer the unit type from the section name. -+ // For DWARF 5, we will read this from the unit header. -+ this->unit_type_ = -+ (is_type_unit ? elfcpp::DW_UT_type : elfcpp::DW_UT_compile); -+ } - - virtual - ~Dwarf_info_reader() -@@ -714,6 +732,13 @@ class Dwarf_info_reader - delete[] this->string_buffer_; - } - -+ bool -+ is_type_unit() const -+ { -+ return (this->unit_type_ == elfcpp::DW_UT_type -+ || this->unit_type_ == elfcpp::DW_UT_split_type); -+ } -+ - // Begin parsing the debug info. This calls visit_compilation_unit() - // or visit_type_unit() for each compilation or type unit found in the - // section, and visit_die() for each top-level DIE. -@@ -745,6 +770,9 @@ class Dwarf_info_reader - inline typename elfcpp::Valtype_base<valsize>::Valtype - read_from_pointer(const unsigned char** source); - -+ inline typename elfcpp::Valtype_base<32>::Valtype -+ read_3bytes_from_pointer(const unsigned char** source); -+ - // Look for a relocation at offset ATTR_OFF in the dwarf info, - // and return the section index and offset of the target. - unsigned int -@@ -818,12 +846,20 @@ class Dwarf_info_reader - Dwarf_range_list* - read_range_list(unsigned int ranges_shndx, off_t ranges_offset) - { -- return this->ranges_table_.read_range_list(this->object_, -- this->symtab_, -- this->symtab_size_, -- this->address_size_, -- ranges_shndx, -- ranges_offset); -+ if (this->cu_version_ < 5) -+ return this->ranges_table_.read_range_list(this->object_, -+ this->symtab_, -+ this->symtab_size_, -+ this->address_size_, -+ ranges_shndx, -+ ranges_offset); -+ else -+ return this->ranges_table_.read_range_list_v5(this->object_, -+ this->symtab_, -+ this->symtab_size_, -+ this->address_size_, -+ ranges_shndx, -+ ranges_offset); - } - - // Return the object. -@@ -873,8 +909,8 @@ class Dwarf_info_reader - bool - do_read_string_table(unsigned int string_shndx); - -- // True if this is a type unit; false for a compilation unit. -- bool is_type_unit_; -+ // The unit type (DW_UT_xxx). -+ unsigned int unit_type_; - // The object containing the .debug_info or .debug_types input section. - Relobj* object_; - // The ELF symbol table. -@@ -1008,6 +1044,8 @@ class Sized_dwarf_line_info : public Dwarf_line_info - { - if (this->buffer_start_ != NULL) - delete[] this->buffer_start_; -+ if (this->str_buffer_start_ != NULL) -+ delete[] this->str_buffer_start_; - } - - private: -@@ -1030,19 +1068,23 @@ class Sized_dwarf_line_info : public Dwarf_line_info - void - read_relocs(); - -- // Reads the DWARF2/3 header for this line info. Each takes as input -+ // Reads the DWARF header for this line info. Each takes as input - // a starting buffer position, and returns the ending position. - const unsigned char* - read_header_prolog(const unsigned char* lineptr); - - const unsigned char* -- read_header_tables(const unsigned char* lineptr); -+ read_header_tables_v2(const unsigned char* lineptr); -+ -+ const unsigned char* -+ read_header_tables_v5(const unsigned char* lineptr); - -- // Reads the DWARF2/3 line information. If shndx is non-negative, -+ // Reads the DWARF line information. If shndx is non-negative, - // discard all line information that doesn't pertain to the given - // section. - const unsigned char* -- read_lines(const unsigned char* lineptr, unsigned int shndx); -+ read_lines(const unsigned char* lineptr, const unsigned char* endptr, -+ unsigned int shndx); - - // Process a single line info opcode at START using the state - // machine at LSM. Return true if we should define a line using the -@@ -1069,6 +1111,7 @@ class Sized_dwarf_line_info : public Dwarf_line_info - { - off_t total_length; - int version; -+ int address_size; - off_t prologue_length; - int min_insn_length; // insn stands for instruction - int max_ops_per_insn; // Added in DWARF-4. -@@ -1089,6 +1132,20 @@ class Sized_dwarf_line_info : public Dwarf_line_info - // of the buffer. - const unsigned char* buffer_start_; - -+ // str_buffer is the buffer for the line table strings. -+ const unsigned char* str_buffer_; -+ const unsigned char* str_buffer_end_; -+ // If the buffer was allocated temporarily, and therefore must be -+ // deallocated in the dtor, this contains a pointer to the start -+ // of the buffer. -+ const unsigned char* str_buffer_start_; -+ -+ // Pointer to the end of the header_length field (aka prologue_length). -+ const unsigned char* end_of_header_length_; -+ -+ // Pointer to the end of the current compilation unit. -+ const unsigned char* end_of_unit_; -+ - // This has relocations that point into buffer. - Sized_elf_reloc_mapper<size, big_endian>* reloc_mapper_; - // The type of the reloc section in track_relocs_--SHT_REL or SHT_RELA. diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch deleted file mode 100644 index d6117b65a..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2021-20197.patch +++ /dev/null @@ -1,388 +0,0 @@ -From d3edaa91d4cf7202ec14342410194841e2f67f12 Mon Sep 17 00:00:00 2001 -From: Alan Modra <amodra@gmail.com> -Date: Fri, 26 Feb 2021 11:30:32 +1030 -Subject: [PATCH] Reinstate various pieces backed out from smart_rename changes - -In the interests of a stable release various last minute smart_rename -patches were backed out of the 2.36 branch. The main reason to -reinstate some of those backed out changes here is to make necessary -followup fixes to commit 8e03235147a9 simple cherry-picks from -mainline. A secondary reason is that ar -M support isn't fixed for -pr26945 without this patch. - - PR 26945 - * ar.c: Don't include libbfd.h. - (write_archive): Replace xmalloc+strcpy with xstrdup. - * arsup.c (temp_name, real_ofd): New static variables. - (ar_open): Use make_tempname and bfd_fdopenw. - (ar_save): Adjust to suit ar_open changes. - * objcopy.c: Don't include libbfd.h. - * rename.c: Rename and reorder variables. - -(cherry picked from commit 95b91a043aeaeb546d2fea556d84a2de1e917770) - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d3edaa91d4cf7202ec14342410194841e2f67f12] -CVE: CVE-2021-20197 -Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com> ---- - binutils/ar.c | 6 +- - binutils/arsup.c | 37 ++++++++---- - binutils/bucomm.h | 3 +- - binutils/objcopy.c | 9 +-- - binutils/rename.c | 148 +++++++++++---------------------------------- - 5 files changed, 67 insertions(+), 136 deletions(-) - -diff --git a/binutils/ar.c b/binutils/ar.c -index 45a34e3a6cf..44df48c5c67 100644 ---- a/binutils/ar.c -+++ b/binutils/ar.c -@@ -25,7 +25,6 @@ - - #include "sysdep.h" - #include "bfd.h" --#include "libbfd.h" - #include "libiberty.h" - #include "progress.h" - #include "getopt.h" -@@ -1255,8 +1254,7 @@ write_archive (bfd *iarch) - bfd *contents_head = iarch->archive_next; - int ofd = -1; - -- old_name = (char *) xmalloc (strlen (bfd_get_filename (iarch)) + 1); -- strcpy (old_name, bfd_get_filename (iarch)); -+ old_name = xstrdup (bfd_get_filename (iarch)); - new_name = make_tempname (old_name, &ofd); - - if (new_name == NULL) -@@ -1308,7 +1306,7 @@ write_archive (bfd *iarch) - /* We don't care if this fails; we might be creating the archive. */ - bfd_close (iarch); - -- if (smart_rename (new_name, old_name, 0) != 0) -+ if (smart_rename (new_name, old_name, NULL) != 0) - xexit (1); - free (old_name); - free (new_name); -diff --git a/binutils/arsup.c b/binutils/arsup.c -index 5403a0c5d74..f7ce8f0bc82 100644 ---- a/binutils/arsup.c -+++ b/binutils/arsup.c -@@ -42,6 +42,8 @@ extern int deterministic; - - static bfd *obfd; - static char *real_name; -+static char *temp_name; -+static int real_ofd; - static FILE *outfile; - - static void -@@ -149,27 +151,24 @@ maybequit (void) - void - ar_open (char *name, int t) - { -- char *tname; -- const char *bname = lbasename (name); -- real_name = name; -+ real_name = xstrdup (name); -+ temp_name = make_tempname (real_name, &real_ofd); - -- /* Prepend tmp- to the beginning, to avoid file-name clashes after -- truncation on filesystems with limited namespaces (DOS). */ -- if (asprintf (&tname, "%.*stmp-%s", (int) (bname - name), name, bname) == -1) -+ if (temp_name == NULL) - { -- fprintf (stderr, _("%s: Can't allocate memory for temp name (%s)\n"), -+ fprintf (stderr, _("%s: Can't open temporary file (%s)\n"), - program_name, strerror(errno)); - maybequit (); - return; - } - -- obfd = bfd_openw (tname, NULL); -+ obfd = bfd_fdopenw (temp_name, NULL, real_ofd); - - if (!obfd) - { - fprintf (stderr, - _("%s: Can't open output archive %s\n"), -- program_name, tname); -+ program_name, temp_name); - - maybequit (); - } -@@ -344,16 +343,30 @@ ar_save (void) - } - else - { -- char *ofilename = xstrdup (bfd_get_filename (obfd)); -+ struct stat target_stat; - - if (deterministic > 0) - obfd->flags |= BFD_DETERMINISTIC_OUTPUT; - - bfd_close (obfd); - -- smart_rename (ofilename, real_name, 0); -+ if (stat (real_name, &target_stat) != 0) -+ { -+ /* The temp file created in ar_open has mode 0600 as per mkstemp. -+ Create the real empty output file here so smart_rename will -+ update the mode according to the process umask. */ -+ obfd = bfd_openw (real_name, NULL); -+ if (obfd != NULL) -+ { -+ bfd_set_format (obfd, bfd_archive); -+ bfd_close (obfd); -+ } -+ } -+ -+ smart_rename (temp_name, real_name, NULL); - obfd = 0; -- free (ofilename); -+ free (temp_name); -+ free (real_name); - } - } - -diff --git a/binutils/bucomm.h b/binutils/bucomm.h -index 91f6a5b228f..aa7e33d8cd1 100644 ---- a/binutils/bucomm.h -+++ b/binutils/bucomm.h -@@ -71,7 +71,8 @@ extern void print_version (const char *); - /* In rename.c. */ - extern void set_times (const char *, const struct stat *); - --extern int smart_rename (const char *, const char *, int); -+extern int smart_rename (const char *, const char *, struct stat *); -+ - - /* In libiberty. */ - void *xmalloc (size_t); -diff --git a/binutils/objcopy.c b/binutils/objcopy.c -index eab3b6db585..73aa8bc2514 100644 ---- a/binutils/objcopy.c -+++ b/binutils/objcopy.c -@@ -20,7 +20,6 @@ - - #include "sysdep.h" - #include "bfd.h" --#include "libbfd.h" - #include "progress.h" - #include "getopt.h" - #include "libiberty.h" -@@ -4861,12 +4860,10 @@ strip_main (int argc, char *argv[]) - output_target, NULL); - if (status == 0) - { -- if (preserve_dates) -- set_times (tmpname, &statbuf); - if (output_file != tmpname) - status = (smart_rename (tmpname, - output_file ? output_file : argv[i], -- preserve_dates) != 0); -+ preserve_dates ? &statbuf : NULL) != 0); - if (status == 0) - status = hold_status; - } -@@ -5931,11 +5928,9 @@ copy_main (int argc, char *argv[]) - output_target, input_arch); - if (status == 0) - { -- if (preserve_dates) -- set_times (tmpname, &statbuf); - if (tmpname != output_filename) - status = (smart_rename (tmpname, input_filename, -- preserve_dates) != 0); -+ preserve_dates ? &statbuf : NULL) != 0); - } - else - unlink_if_ordinary (tmpname); -diff --git a/binutils/rename.c b/binutils/rename.c -index 65ad5bf52c4..72a9323d72c 100644 ---- a/binutils/rename.c -+++ b/binutils/rename.c -@@ -24,14 +24,9 @@ - - #ifdef HAVE_GOOD_UTIME_H - #include <utime.h> --#else /* ! HAVE_GOOD_UTIME_H */ --#ifdef HAVE_UTIMES -+#elif defined HAVE_UTIMES - #include <sys/time.h> --#endif /* HAVE_UTIMES */ --#endif /* ! HAVE_GOOD_UTIME_H */ -- --#if ! defined (_WIN32) || defined (__CYGWIN32__) --static int simple_copy (const char *, const char *); -+#endif - - /* The number of bytes to copy at once. */ - #define COPY_BUF 8192 -@@ -82,7 +77,6 @@ simple_copy (const char *from, const char *to) - } - return 0; - } --#endif /* __CYGWIN32__ or not _WIN32 */ - - /* Set the times of the file DESTINATION to be the same as those in - STATBUF. */ -@@ -91,122 +85,52 @@ void - set_times (const char *destination, const struct stat *statbuf) - { - int result; -- -- { - #ifdef HAVE_GOOD_UTIME_H -- struct utimbuf tb; -- -- tb.actime = statbuf->st_atime; -- tb.modtime = statbuf->st_mtime; -- result = utime (destination, &tb); --#else /* ! HAVE_GOOD_UTIME_H */ --#ifndef HAVE_UTIMES -- long tb[2]; -- -- tb[0] = statbuf->st_atime; -- tb[1] = statbuf->st_mtime; -- result = utime (destination, tb); --#else /* HAVE_UTIMES */ -- struct timeval tv[2]; -- -- tv[0].tv_sec = statbuf->st_atime; -- tv[0].tv_usec = 0; -- tv[1].tv_sec = statbuf->st_mtime; -- tv[1].tv_usec = 0; -- result = utimes (destination, tv); --#endif /* HAVE_UTIMES */ --#endif /* ! HAVE_GOOD_UTIME_H */ -- } -+ struct utimbuf tb; -+ -+ tb.actime = statbuf->st_atime; -+ tb.modtime = statbuf->st_mtime; -+ result = utime (destination, &tb); -+#elif defined HAVE_UTIMES -+ struct timeval tv[2]; -+ -+ tv[0].tv_sec = statbuf->st_atime; -+ tv[0].tv_usec = 0; -+ tv[1].tv_sec = statbuf->st_mtime; -+ tv[1].tv_usec = 0; -+ result = utimes (destination, tv); -+#else -+ long tb[2]; -+ -+ tb[0] = statbuf->st_atime; -+ tb[1] = statbuf->st_mtime; -+ result = utime (destination, tb); -+#endif - - if (result != 0) - non_fatal (_("%s: cannot set time: %s"), destination, strerror (errno)); - } - --#ifndef S_ISLNK --#ifdef S_IFLNK --#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) --#else --#define S_ISLNK(m) 0 --#define lstat stat --#endif --#endif -- --/* Rename FROM to TO, copying if TO is a link. -- Return 0 if ok, -1 if error. */ -+/* Copy FROM to TO. TARGET_STAT has the file status that, if non-NULL, -+ is used to fix up timestamps. Return 0 if ok, -1 if error. -+ At one time this function renamed files, but file permissions are -+ tricky to update given the number of different schemes used by -+ various systems. So now we just copy. */ - - int --smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNUSED) -+smart_rename (const char *from, const char *to, -+ struct stat *target_stat) - { -- bfd_boolean exists; -- struct stat s; -- int ret = 0; -- -- exists = lstat (to, &s) == 0; -- --#if defined (_WIN32) && !defined (__CYGWIN32__) -- /* Win32, unlike unix, will not erase `to' in `rename(from, to)' but -- fail instead. Also, chown is not present. */ -+ int ret; - -- if (exists) -- remove (to); -- -- ret = rename (from, to); -+ ret = simple_copy (from, to); - if (ret != 0) -- { -- /* We have to clean up here. */ -- non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno)); -- unlink (from); -- } --#else -- /* Use rename only if TO is not a symbolic link and has -- only one hard link, and we have permission to write to it. */ -- if (! exists -- || (!S_ISLNK (s.st_mode) -- && S_ISREG (s.st_mode) -- && (s.st_mode & S_IWUSR) -- && s.st_nlink == 1) -- ) -- { -- ret = rename (from, to); -- if (ret == 0) -- { -- if (exists) -- { -- /* Try to preserve the permission bits and ownership of -- TO. First get the mode right except for the setuid -- bit. Then change the ownership. Then fix the setuid -- bit. We do the chmod before the chown because if the -- chown succeeds, and we are a normal user, we won't be -- able to do the chmod afterward. We don't bother to -- fix the setuid bit first because that might introduce -- a fleeting security problem, and because the chown -- will clear the setuid bit anyhow. We only fix the -- setuid bit if the chown succeeds, because we don't -- want to introduce an unexpected setuid file owned by -- the user running objcopy. */ -- chmod (to, s.st_mode & 0777); -- if (chown (to, s.st_uid, s.st_gid) >= 0) -- chmod (to, s.st_mode & 07777); -- } -- } -- else -- { -- /* We have to clean up here. */ -- non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno)); -- unlink (from); -- } -- } -- else -- { -- ret = simple_copy (from, to); -- if (ret != 0) -- non_fatal (_("unable to copy file '%s'; reason: %s"), to, strerror (errno)); -+ non_fatal (_("unable to copy file '%s'; reason: %s"), -+ to, strerror (errno)); - -- if (preserve_dates) -- set_times (to, &s); -- unlink (from); -- } --#endif /* _WIN32 && !__CYGWIN32__ */ -+ if (target_stat != NULL) -+ set_times (to, target_stat); -+ unlink (from); - - return ret; - } --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.36.bb b/poky/meta/recipes-devtools/binutils/binutils_2.37.bb index ee9617de1..ff9377049 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.36.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.37.bb @@ -10,11 +10,11 @@ EXTRA_OECONF += "--with-sysroot=/ \ --with-system-zlib \ " -EXTRA_OEMAKE_append_libc-musl = "\ +EXTRA_OEMAKE:append:libc-musl = "\ gt_cv_func_gnugettext1_libc=yes \ gt_cv_func_gnugettext2_libc=yes \ " -EXTRA_OECONF_class-native = "--enable-targets=all \ +EXTRA_OECONF:class-native = "--enable-targets=all \ --enable-64-bit-bfd \ --enable-install-libiberty \ --enable-install-libbfd \ @@ -29,10 +29,10 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" # gcc9.0 end up mis-compiling libbfd.so with O2 which then crashes on target # So remove -O2 and use -Os as workaround -SELECTED_OPTIMIZATION_remove_mipsarch = "-O2" -SELECTED_OPTIMIZATION_append_mipsarch = " -Os" +SELECTED_OPTIMIZATION:remove:mipsarch = "-O2" +SELECTED_OPTIMIZATION:append:mipsarch = " -Os" -do_install_class-native () { +do_install:class-native () { autotools_do_install # Install the libiberty header @@ -55,19 +55,19 @@ do_install_class-native () { } # libctf races with libbfd -PARALLEL_MAKEINST_class-target = "" -PARALLEL_MAKEINST_class-nativesdk = "" +PARALLEL_MAKEINST:class-target = "" +PARALLEL_MAKEINST:class-nativesdk = "" # Split out libbfd-*.so and libopcodes-*.so so including perf doesn't include # extra stuff PACKAGE_BEFORE_PN += "libbfd libopcodes" -FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -FILES_libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" +FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" +FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" -SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " +SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " -USE_ALTERNATIVES_FOR_class-nativesdk = "" -FILES_${PN}_append_class-nativesdk = " ${bindir}" +USE_ALTERNATIVES_FOR:class-nativesdk = "" +FILES:${PN}:append:class-nativesdk = " ${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/bison/bison_3.7.6.bb b/poky/meta/recipes-devtools/bison/bison_3.7.6.bb index a8d57f274..c85ae0497 100644 --- a/poky/meta/recipes-devtools/bison/bison_3.7.6.bb +++ b/poky/meta/recipes-devtools/bison/bison_3.7.6.bb @@ -21,7 +21,7 @@ inherit autotools gettext texinfo CACHED_CONFIGUREVARS = "ac_cv_path_M4=m4" PACKAGECONFIG ??= "readline ${@ 'textstyle' if d.getVar('USE_NLS') == 'yes' else ''}" -PACKAGECONFIG_class-native ??= "" +PACKAGECONFIG:class-native ??= "" # Make readline and textstyle optional. There are recipie for these, but leave them # disabled for the native recipe. This prevents host contamination of the native tool. @@ -38,15 +38,15 @@ CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', ' # The automatic m4 path detection gets confused, so force the right value acpaths = "-I ./m4" -do_compile_prepend() { +do_compile:prepend() { for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done } -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}/${bindir}/bison \ BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_wrapper ${D}/${bindir}/bison \ BISON_PKGDATADIR=${datadir}/bison } diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index f6a77b460..b1d359ec3 100644 --- a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -101,14 +101,14 @@ SRCREV = "868a2afab9da34f32c007d773b77253c93104636" inherit systemd update-rc.d python3native update-alternatives -ALTERNATIVE_${PN} = "bootchartd" +ALTERNATIVE:${PN} = "bootchartd" ALTERNATIVE_LINK_NAME[bootchartd] = "${base_sbindir}/bootchartd" ALTERNATIVE_PRIORITY = "100" # The only reason to build bootchart2-native is for a native pybootchartgui. BBCLASSEXTEND = "native" -SYSTEMD_SERVICE_${PN} = "bootchart2.service bootchart2-done.service bootchart2-done.timer" +SYSTEMD_SERVICE:${PN} = "bootchart2.service bootchart2-done.service bootchart2-done.timer" UPDATERCPN = "bootchartd-stop-initscript" INITSCRIPT_NAME = "bootchartd_stop.sh" @@ -116,7 +116,7 @@ INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' -do_compile_prepend () { +do_compile:prepend () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" export LIBDIR="${base_libdir}" @@ -145,19 +145,19 @@ do_install () { } PACKAGES =+ "pybootchartgui" -FILES_pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui" -RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-shell python3-compression python3-codecs" -RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" -RDEPENDS_${PN}_class-target += "lsb-release" -DEPENDS_append_class-native = " python3-pycairo-native" +FILES:pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui" +RDEPENDS:pybootchartgui = "python3-pycairo python3-compression python3-image python3-shell python3-compression python3-codecs" +RDEPENDS:${PN}:class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" +RDEPENDS:${PN}:class-target += "lsb-release" +DEPENDS:append:class-native = " python3-pycairo-native" PACKAGES =+ "bootchartd-stop-initscript" -FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d" -RDEPENDS_bootchartd-stop-initscript = "${PN}" +FILES:bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d" +RDEPENDS:bootchartd-stop-initscript = "${PN}" -FILES_${PN} += "${base_libdir}/bootchart/bootchart-collector" -FILES_${PN} += "${base_libdir}/bootchart/tmpfs" -FILES_${PN} += "${libdir}" -FILES_${PN}-doc += "${datadir}/docs" +FILES:${PN} += "${base_libdir}/bootchart/bootchart-collector" +FILES:${PN} += "${base_libdir}/bootchart/tmpfs" +FILES:${PN} += "${libdir}" +FILES:${PN}-doc += "${datadir}/docs" -RCONFLICTS_${PN} = "bootchart" +RCONFLICTS:${PN} = "bootchart" diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb index fa33cad7b..5f8621faf 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ " SECTION = "base" DEPENDS = "lzo util-linux zlib" -DEPENDS_append_class-target = " udev" +DEPENDS:append:class-target = " udev" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ @@ -49,25 +49,25 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'distutils3-base', '', d CLEANBROKEN = "1" EXTRA_OECONF = "--enable-largefile" -EXTRA_OECONF_append_libc-musl = " --disable-backtrace " +EXTRA_OECONF:append:libc-musl = " --disable-backtrace " EXTRA_PYTHON_CFLAGS = "${DEBUG_PREFIX_MAP}" -EXTRA_PYTHON_CFLAGS_class-native = "" +EXTRA_PYTHON_CFLAGS:class-native = "" EXTRA_PYTHON_LDFLAGS = "${LDFLAGS}" EXTRA_OEMAKE = "V=1 'EXTRA_PYTHON_CFLAGS=${EXTRA_PYTHON_CFLAGS}' 'EXTRA_PYTHON_LDFLAGS=${EXTRA_PYTHON_LDFLAGS}'" -do_configure_prepend() { +do_configure:prepend() { # Upstream doesn't ship this and autoreconf won't install it as automake isn't used. mkdir -p ${S}/config cp -f $(automake --print-libdir)/install-sh ${S}/config/ } -do_install_append() { +do_install:append() { if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then oe_runmake 'DESTDIR=${D}' 'PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}' install_python fi } -RDEPENDS_${PN} = "libgcc" +RDEPENDS:${PN} = "libgcc" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb b/poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb index f12366b4e..de734e841 100644 --- a/poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb +++ b/poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb @@ -16,9 +16,9 @@ inherit autotools # We don't have a staged chrpath-native for ensuring our binary is # relocatable, so use the one we've just built -CHRPATH_BIN_class-native = "${B}/chrpath" +CHRPATH_BIN:class-native = "${B}/chrpath" -PROVIDES_append_class-native = " chrpath-replacement-native" +PROVIDES:append:class-native = " chrpath-replacement-native" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.20.5.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.21.1.bb index 335097d38..335097d38 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.20.5.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.21.1.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index c557a5552..7f0aff811 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0" +SRC_URI[sha256sum] = "fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.20.5.bb b/poky/meta/recipes-devtools/cmake/cmake_3.21.1.bb index 64c92b89f..36c6357dd 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.20.5.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.21.1.bb @@ -4,7 +4,7 @@ inherit cmake bash-completion DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" -SRC_URI_append_class-nativesdk = " \ +SRC_URI:append:class-nativesdk = " \ file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh \ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ @@ -36,7 +36,7 @@ EXTRA_OECMAKE=" \ -DKWSYS_LFS_WORKS=1 \ " -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { mkdir -p ${D}${datadir}/cmake install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ @@ -44,10 +44,10 @@ do_install_append_class-nativesdk() { install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh } -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" -FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal ${datadir}/emacs ${datadir}/vim" -FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" -FILES_${PN}-dev = "" +FILES:${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal ${datadir}/emacs ${datadir}/vim" +FILES:${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}" +FILES:${PN}-dev = "" BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb index 206c27c04..500b508d7 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb @@ -13,7 +13,7 @@ SRCREV = "cb74969736bdea86465e85feeceb895ff7a42610" S = "${WORKDIR}/git" DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm" -DEPENDS_append_class-native = " file-replacement-native" +DEPENDS:append:class-native = " file-replacement-native" inherit cmake pkgconfig bash-completion distutils3-base @@ -22,7 +22,7 @@ EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIR BBCLASSEXTEND = "native nativesdk" # Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}/${bindir}/createrepo_c \ RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc @@ -30,11 +30,11 @@ do_install_append_class-native() { MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_wrapper ${D}/${bindir}/createrepo_c \ RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ - MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + MAGIC=${datadir}/misc/magic.mgc create_wrapper ${D}/${bindir}/modifyrepo_c \ - MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + MAGIC=${datadir}/misc/magic.mgc rm -rf ${D}/etc } diff --git a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb index ce35b806b..bcc56e550 100644 --- a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb +++ b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "devel" DEPENDS += "expect-native" -RDEPENDS_${PN} = "expect" +RDEPENDS:${PN} = "expect" inherit autotools diff --git a/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb b/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb index 3487666b9..da9a38335 100644 --- a/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb +++ b/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils_0.26.bb @@ -19,7 +19,7 @@ EXTRA_OECONF += "ac_cv_prog_EMACS=no" BBCLASSEXTEND = "native nativesdk" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir}/emacs } diff --git a/poky/meta/recipes-devtools/devel-config/distcc-config.bb b/poky/meta/recipes-devtools/devel-config/distcc-config.bb index db9e8bbcc..698fd3585 100644 --- a/poky/meta/recipes-devtools/devel-config/distcc-config.bb +++ b/poky/meta/recipes-devtools/devel-config/distcc-config.bb @@ -20,4 +20,4 @@ do_install() { install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ } -RDEPENDS_${PN} = "distcc" +RDEPENDS:${PN} = "distcc" diff --git a/poky/meta/recipes-devtools/devel-config/nfs-export-root.bb b/poky/meta/recipes-devtools/devel-config/nfs-export-root.bb index 56375a47b..0aaec36b4 100644 --- a/poky/meta/recipes-devtools/devel-config/nfs-export-root.bb +++ b/poky/meta/recipes-devtools/devel-config/nfs-export-root.bb @@ -14,4 +14,4 @@ do_install() { install -m 0644 exports ${D}${sysconfdir}/ } -RDEPENDS_${PN} = "packagegroup-core-nfs-server" +RDEPENDS:${PN} = "packagegroup-core-nfs-server" diff --git a/poky/meta/recipes-devtools/distcc/distcc_3.4.bb b/poky/meta/recipes-devtools/distcc/distcc_3.4.bb index 3bab6d53e..d4fc0356e 100644 --- a/poky/meta/recipes-devtools/distcc/distcc_3.4.bb +++ b/poky/meta/recipes-devtools/distcc/distcc_3.4.bb @@ -13,7 +13,7 @@ PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" # use system popt by default PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" -RRECOMMENDS_${PN}-server = "avahi-daemon" +RRECOMMENDS:${PN}-server = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ file://default \ @@ -33,7 +33,7 @@ EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server" USERADD_PACKAGES = "${PN}-server" -USERADD_PARAM_${PN}-server = "--system \ +USERADD_PARAM:${PN}-server = "--system \ --home /dev/null \ --no-create-home \ --gid nogroup \ @@ -43,7 +43,7 @@ UPDATERCPN = "${PN}-server" INITSCRIPT_NAME = "distcc" SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "distcc.service" +SYSTEMD_SERVICE:${PN}-server = "distcc.service" do_install() { # Improve reproducibility: compress w/o timestamps @@ -57,10 +57,10 @@ do_install() { sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service } -FILES_${PN}-server = "${sysconfdir} \ +FILES:${PN}-server = "${sysconfdir} \ ${bindir}/distccd \ ${sbindir}" -FILES_${PN}-distmon-gnome = "${bindir}/distccmon-gnome \ +FILES:${PN}-distmon-gnome = "${bindir}/distccmon-gnome \ ${datadir}/applications \ ${datadir}/pixmaps" diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.8.0.bb b/poky/meta/recipes-devtools/dnf/dnf_4.8.0.bb index 44c440593..f51d74797 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.8.0.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.8.0.bb @@ -32,7 +32,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} - BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-core \ python3-codecs \ python3-netclient \ @@ -55,32 +55,32 @@ RDEPENDS_${PN} += " \ python3-gpg \ " -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN}:class-native = "" -RRECOMMENDS_${PN}_class-target += "gnupg" +RRECOMMENDS:${PN}:class-target += "gnupg" # Create a symlink called 'dnf' as 'make install' does not do it, but # .spec file in dnf source tree does (and then Fedora and dnf documentation # says that dnf binary is plain 'dnf'). -do_install_append() { +do_install:append() { lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic } # Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}/${bindir}/dnf \ RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ RPM_NO_CHROOT_FOR_SCRIPTS=1 } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_wrapper ${D}/${bindir}/dnf \ RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ RPM_NO_CHROOT_FOR_SCRIPTS=1 } -SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ +SYSTEMD_SERVICE:${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic.service dnf-automatic.timer \ dnf-automatic-download.service dnf-automatic-download.timer \ dnf-automatic-install.service dnf-automatic-install.timer \ diff --git a/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 6452c8d99..2bec1442a 100644 --- a/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -49,4 +49,4 @@ do_install () { XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" inherit xmlcatalog -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" diff --git a/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb index c5d3a2480..beda0abe9 100644 --- a/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb +++ b/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb @@ -42,9 +42,9 @@ do_install () { install -v -m644 README RELEASE-NOTES* NEWS* ${D}${docdir}/${BPN} } -RDEPENDS_${PN} += "perl" -FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" -FILES_${PN}-doc = "${datadir}/doc/*" +RDEPENDS:${PN} += "perl" +FILES:${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" +FILES:${PN}-doc = "${datadir}/doc/*" XMLCATALOGS = "${datadir}/xml/docbook/xsl-stylesheets-${PV}/catalog.xml" diff --git a/poky/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb b/poky/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb index 7476c043c..bdebfc190 100644 --- a/poky/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb +++ b/poky/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb @@ -24,5 +24,5 @@ CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" BBCLASSEXTEND = "native nativesdk" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "mkfs.vfat" +ALTERNATIVE:${PN} = "mkfs.vfat" ALTERNATIVE_LINK_NAME[mkfs.vfat] = "${sbindir}/mkfs.vfat" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg.inc b/poky/meta/recipes-devtools/dpkg/dpkg.inc index 7acfb4161..b6807b004 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg.inc +++ b/poky/meta/recipes-devtools/dpkg/dpkg.inc @@ -5,18 +5,18 @@ DESCRIPTION = "The primary interface for the dpkg suite is the dselect program. SECTION = "base" DEPENDS = "zlib bzip2 perl ncurses" -DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" -RDEPENDS_${PN}_class-native = "" +DEPENDS:class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" +RDEPENDS:${PN}:class-native = "" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" inherit autotools gettext perlnative pkgconfig perl-version update-alternatives -PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" +PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" -PERL_LIBDIR_class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" +PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" EXTRA_OECONF = "\ --disable-dselect \ @@ -27,8 +27,8 @@ EXTRA_OECONF = "\ TAR=tar \ " -EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" -EXTRA_OECONF_append_class-nativesdk = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" +EXTRA_OECONF:append:class-target = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" +EXTRA_OECONF:append:class-nativesdk = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" PACKAGECONFIG = "liblzma" PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" @@ -37,7 +37,7 @@ PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" #autotools.bbclass default AUTOTOOLS_AUXDIR is ${S}, we need to under ${S}/build-aux AUTOTOOLS_AUXDIR = "${S}/build-aux" -do_configure_prepend () { +do_configure:prepend () { mkdir -p ${AUTOTOOLS_AUXDIR} # autotools_do_configure updates po/Makefile.in.in, we also need # update dselect/po and scripts/po @@ -45,7 +45,7 @@ do_configure_prepend () { cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/scripts/po/ } -do_install_append () { +do_install:append () { if [ "${PN}" = "dpkg-native" ]; then # update-alternatives doesn't have an offline mode rm ${D}${bindir}/update-alternatives @@ -56,19 +56,19 @@ do_install_append () { } PROV = "virtual/update-alternatives" -PROV_class-native = "" -PROV_class-nativesdk = "" +PROV:class-native = "" +PROV:class-nativesdk = "" PROVIDES += "${PROV}" PACKAGES =+ "update-alternatives-dpkg" -FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" -RPROVIDES_update-alternatives-dpkg += "update-alternatives" +FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" +RPROVIDES:update-alternatives-dpkg += "update-alternatives" PACKAGES += "${PN}-perl" -FILES_${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}" +FILES:${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}" -RDEPENDS_${PN}-perl += "perl-module-carp perl-module-constant \ +RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \ perl-module-cwd perl-module-digest \ perl-module-digest-md5 perl-module-errno \ perl-module-exporter perl-module-fcntl \ @@ -92,13 +92,13 @@ RDEPENDS_${PN}-perl += "perl-module-carp perl-module-constant \ # the bitbake version. # PACKAGES =+ "${PN}-start-stop" -FILES_${PN}-start-stop = "${sbindir}/start-stop-daemon.${BPN}" -ALTERNATIVE_${PN}-start-stop = "start-stop-daemon" +FILES:${PN}-start-stop = "${sbindir}/start-stop-daemon.${BPN}" +ALTERNATIVE:${PN}-start-stop = "start-stop-daemon" ALTERNATIVE_LINK_NAME[start-stop-daemon] = "${sbindir}/start-stop-daemon" ALTERNATIVE_PRIORITY = "100" EXTRA_RDPENDS = "ldconfig" -EXTRA_RDPENDS_libc-musl = "" -RDEPENDS_${PN} += "${PN}-start-stop ${EXTRA_RDPENDS}" +EXTRA_RDPENDS:libc-musl = "" +RDEPENDS:${PN} += "${PN}-start-stop ${EXTRA_RDPENDS}" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb index 18ca0e310..34b6bfe0a 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb @@ -18,7 +18,7 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20. file://0014-arch-Add-support-for-ARCv2-CPU.patch \ " -SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" +SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" SRCREV = "2177b782b16e77e97c9643961a5ae3c639bcc4a3" diff --git a/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb b/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb index 56b52d6a4..1a05a1a38 100644 --- a/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb +++ b/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://../dwarfsrcfiles.c;md5=31483894e453a77acbb67847565f1b SRC_URI = "file://dwarfsrcfiles.c" BBCLASSEXTEND = "native" DEPENDS = "elfutils" -DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS:append:libc-musl = " argp-standalone" do_compile () { ${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ../dwarfsrcfiles.c -lelf -ldw } -do_compile_libc-musl () { +do_compile:libc-musl () { ${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ../dwarfsrcfiles.c -lelf -ldw -largp } diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index 2f113c5e8..c80b93c80 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -4,11 +4,11 @@ fixing, configuring , and debugging ext2 filesystems." HOMEPAGE = "http://e2fsprogs.sourceforge.net/" LICENSE = "GPLv2 & LGPLv2 & BSD & MIT" -LICENSE_e2fsprogs-dumpe2fs = "GPLv2" -LICENSE_e2fsprogs-e2fsck = "GPLv2" -LICENSE_e2fsprogs-mke2fs = "GPLv2" -LICENSE_e2fsprogs-tune2fs = "GPLv2" -LICENSE_e2fsprogs-badblocks = "GPLv2" +LICENSE:e2fsprogs-dumpe2fs = "GPLv2" +LICENSE:e2fsprogs-e2fsck = "GPLv2" +LICENSE:e2fsprogs-mke2fs = "GPLv2" +LICENSE:e2fsprogs-tune2fs = "GPLv2" +LICENSE:e2fsprogs-badblocks = "GPLv2" LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \ file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \ diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb index fc022f37d..d68d131e0 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb @@ -8,7 +8,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch \ " -SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ +SRC_URI:append:class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ file://quiet-debugfs.patch \ " @@ -21,14 +21,14 @@ EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ --disable-libblkid --enable-verbose-makecmds \ --with-crond-dir=no" -EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" +EXTRA_OECONF:darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" PACKAGECONFIG ??= "" PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse' # make locale rules sometimes fire, sometimes don't as git doesn't preserve # file mktime. Touch the files introducing non-determinism to the build -do_compile_prepend (){ +do_compile:prepend (){ find ${S}/po -type f -name "*.po" -exec touch {} + } @@ -68,57 +68,57 @@ e2fsprogs_conf_fixup () { done } -do_install_append_class-native() { +do_install:append:class-native() { e2fsprogs_conf_fixup } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { e2fsprogs_conf_fixup } -do_install_append_class-target() { +do_install:append:class-target() { mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.e2fsprogs mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.e2fsprogs mv ${D}${base_sbindir}/tune2fs ${D}${base_sbindir}/tune2fs.e2fsprogs } -RDEPENDS_e2fsprogs = "e2fsprogs-badblocks e2fsprogs-dumpe2fs" -RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" +RDEPENDS:e2fsprogs = "e2fsprogs-badblocks e2fsprogs-dumpe2fs" +RRECOMMENDS:e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" PACKAGES =+ "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-e2scrub e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs" PACKAGES =+ "libcomerr libss libe2p libext2fs" -FILES_e2fsprogs-dumpe2fs = "${base_sbindir}/dumpe2fs" -FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" -FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" -FILES_e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*" -FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" -FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label" -FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" -FILES_libcomerr = "${base_libdir}/libcom_err.so.*" -FILES_libss = "${base_libdir}/libss.so.*" -FILES_libe2p = "${base_libdir}/libe2p.so.*" -FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" -FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" - -ALTERNATIVE_${PN} = "chattr" +FILES:e2fsprogs-dumpe2fs = "${base_sbindir}/dumpe2fs" +FILES:e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" +FILES:e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" +FILES:e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*" +FILES:e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" +FILES:e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label" +FILES:e2fsprogs-badblocks = "${base_sbindir}/badblocks" +FILES:libcomerr = "${base_libdir}/libcom_err.so.*" +FILES:libss = "${base_libdir}/libss.so.*" +FILES:libe2p = "${base_libdir}/libe2p.so.*" +FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" +FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" + +ALTERNATIVE:${PN} = "chattr" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" -ALTERNATIVE_${PN}-doc = "fsck.8" +ALTERNATIVE:${PN}-doc = "fsck.8" ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" -ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2" +ALTERNATIVE:${PN}-mke2fs = "mke2fs mkfs.ext2" ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs" ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2" -ALTERNATIVE_${PN}-tune2fs = "tune2fs" +ALTERNATIVE:${PN}-tune2fs = "tune2fs" ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs" -RDEPENDS_e2fsprogs-e2scrub = "bash" -RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed" -RDEPENDS_${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs" +RDEPENDS:e2fsprogs-e2scrub = "bash" +RDEPENDS:${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed" +RDEPENDS:${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs" do_compile_ptest() { oe_runmake -C ${B}/tests diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.185.bb index b1ffbc18b..5031ab97e 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.185.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.185.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \ " DEPENDS = "zlib virtual/libintl" -DEPENDS_append_libc-musl = " argp-standalone fts musl-obstack " +DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack " # The Debian patches below are from: # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ @@ -22,8 +22,9 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ + file://glibc-2.34-fix.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://0002-musl-libs.patch \ file://0003-musl-utils.patch \ file://0004-Fix-error-on-musl.patch \ @@ -36,7 +37,7 @@ inherit autotools gettext ptest pkgconfig EXTRA_OECONF = "--program-prefix=eu-" DEPENDS_BZIP2 = "bzip2-replacement-native" -DEPENDS_BZIP2_class-target = "bzip2" +DEPENDS_BZIP2:class-target = "bzip2" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'debuginfod', 'debuginfod libdebuginfod', '', d)}" PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}" @@ -44,11 +45,11 @@ PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd" -RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar" +RDEPENDS:${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar" -EXTRA_OECONF_append_class-target = " --disable-tests-rpath" +EXTRA_OECONF:append:class-target = " --disable-tests-rpath" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" do_compile_ptest() { cd ${B}/tests @@ -92,8 +93,8 @@ do_install_ptest() { fi } -EXTRA_OEMAKE_class-native = "" -EXTRA_OEMAKE_class-nativesdk = "" +EXTRA_OEMAKE:class-native = "" +EXTRA_OEMAKE:class-nativesdk = "" BBCLASSEXTEND = "native nativesdk" @@ -105,14 +106,14 @@ PACKAGES =+ "${PN}-binutils libelf libasm libdw libdebuginfod" # "The license is now GPLv2/LGPLv3+ for the libraries and GPLv3+ for stand-alone # programs. There is now also a formal CONTRIBUTING document describing how to # submit patches." -LICENSE_${PN}-binutils = "GPLv3+" -LICENSE_${PN} = "GPLv3+" -LICENSE_libelf = "GPLv2 | LGPLv3+" -LICENSE_libasm = "GPLv2 | LGPLv3+" -LICENSE_libdw = "GPLv2 | LGPLv3+" -LICENSE_libdebuginfod = "GPLv2+ | LGPLv3+" - -FILES_${PN}-binutils = "\ +LICENSE:${PN}-binutils = "GPLv3+" +LICENSE:${PN} = "GPLv3+" +LICENSE:libelf = "GPLv2 | LGPLv3+" +LICENSE:libasm = "GPLv2 | LGPLv3+" +LICENSE:libdw = "GPLv2 | LGPLv3+" +LICENSE:libdebuginfod = "GPLv2+ | LGPLv3+" + +FILES:${PN}-binutils = "\ ${bindir}/eu-addr2line \ ${bindir}/eu-ld \ ${bindir}/eu-nm \ @@ -120,19 +121,19 @@ FILES_${PN}-binutils = "\ ${bindir}/eu-size \ ${bindir}/eu-strip" -FILES_libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*" -FILES_libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*" -FILES_libdw = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*" -FILES_libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" +FILES:libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*" +FILES:libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*" +FILES:libdw = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*" +FILES:libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" # Some packages have the version preceeding the .so instead properly # versioned .so.<version>, so we need to reorder and repackage. #FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" #FILES_SOLIBSDEV = "${libdir}/libasm.so ${libdir}/libdw.so ${libdir}/libelf.so" # The package contains symlinks that trip up insane -INSANE_SKIP_${MLPREFIX}libdw = "dev-so" +INSANE_SKIP:${MLPREFIX}libdw = "dev-so" # The nlist binary in the tests uses explicitly minimal compiler flags -INSANE_SKIP_${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "ldflags" # avoid stripping some generated binaries otherwise some of the tests such as test-nlist, # run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail @@ -161,4 +162,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/backends/libebl_x86_64.so \ " -PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1 libdebuginfod.so.1" +PRIVATE_LIBS:${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1 libdebuginfod.so.1" diff --git a/poky/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch b/poky/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch new file mode 100644 index 000000000..9509fb4e7 --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/glibc-2.34-fix.patch @@ -0,0 +1,138 @@ +glibc 2.34 calls pthread_kill from the raise function. Before raise +directly called the (tg)kill syscall. So allow pthread_kill to be the +first frame in a backtrace where raise is expected. Also change some +asserts to fprintf plus abort to make it more clear why the testcase +fails. + +https://sourceware.org/bugzilla/show_bug.cgi?id=28190 + +Signed-off-by: Mark Wielaard <mark@klomp.org> +Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2021q3/004019.html] +--- + tests/ChangeLog | 6 +++++ + tests/backtrace.c | 62 +++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 61 insertions(+), 7 deletions(-) + +Index: elfutils-0.185/tests/ChangeLog +=================================================================== +--- elfutils-0.185.orig/tests/ChangeLog ++++ elfutils-0.185/tests/ChangeLog +@@ -1,3 +1,9 @@ ++2021-08-04 Mark Wielaard <mark@klomp.org> ++ ++ PR28190 ++ * backtrace.c (callback_verify): Check for pthread_kill as first ++ frame. Change asserts to fprintf plus abort. ++ + 2021-05-14 Frank Ch. Eigler <fche@redhat.com> + + PR27859 +Index: elfutils-0.185/tests/backtrace.c +=================================================================== +--- elfutils-0.185.orig/tests/backtrace.c ++++ elfutils-0.185/tests/backtrace.c +@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned fra + static bool reduce_frameno = false; + if (reduce_frameno) + frameno--; ++ static bool pthread_kill_seen = false; ++ if (pthread_kill_seen) ++ frameno--; + if (! use_raise_jmp_patching && frameno >= 2) + frameno += 2; + const char *symname2 = NULL; +@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned fra + && (strcmp (symname, "__kernel_vsyscall") == 0 + || strcmp (symname, "__libc_do_syscall") == 0)) + reduce_frameno = true; ++ else if (! pthread_kill_seen && symname ++ && strstr (symname, "pthread_kill") != NULL) ++ pthread_kill_seen = true; + else +- assert (symname && strcmp (symname, "raise") == 0); ++ { ++ if (!symname || strcmp (symname, "raise") != 0) ++ { ++ fprintf (stderr, ++ "case 0: expected symname 'raise' got '%s'\n", symname); ++ abort (); ++ } ++ } + break; + case 1: +- assert (symname != NULL && strcmp (symname, "sigusr2") == 0); ++ if (symname == NULL || strcmp (symname, "sigusr2") != 0) ++ { ++ fprintf (stderr, ++ "case 1: expected symname 'sigusr2' got '%s'\n", symname); ++ abort (); ++ } + break; + case 2: // x86_64 only + /* __restore_rt - glibc maybe does not have to have this symbol. */ +@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned fra + if (use_raise_jmp_patching) + { + /* Verify we trapped on the very first instruction of jmp. */ +- assert (symname != NULL && strcmp (symname, "jmp") == 0); ++ if (symname == NULL || strcmp (symname, "jmp") != 0) ++ { ++ fprintf (stderr, ++ "case 3: expected symname 'raise' got '%s'\n", symname); ++ abort (); ++ } + mod = dwfl_addrmodule (dwfl, pc - 1); + if (mod) + symname2 = dwfl_module_addrname (mod, pc - 1); +- assert (symname2 == NULL || strcmp (symname2, "jmp") != 0); ++ if (symname2 == NULL || strcmp (symname2, "jmp") != 0) ++ { ++ fprintf (stderr, ++ "case 3: expected symname2 'jmp' got '%s'\n", symname2); ++ abort (); ++ } + break; + } + FALLTHROUGH; +@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned fra + duplicate_sigusr2 = true; + break; + } +- assert (symname != NULL && strcmp (symname, "stdarg") == 0); ++ if (symname == NULL || strcmp (symname, "stdarg") != 0) ++ { ++ fprintf (stderr, ++ "case 4: expected symname 'stdarg' got '%s'\n", symname); ++ abort (); ++ } + break; + case 5: + /* Verify we trapped on the very last instruction of child. */ +- assert (symname != NULL && strcmp (symname, "backtracegen") == 0); ++ if (symname == NULL || strcmp (symname, "backtracegen") != 0) ++ { ++ fprintf (stderr, ++ "case 5: expected symname 'backtracegen' got '%s'\n", ++ symname); ++ abort (); ++ } + mod = dwfl_addrmodule (dwfl, pc); + if (mod) + symname2 = dwfl_module_addrname (mod, pc); +@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned fra + // instructions or even inserts some padding instructions at the end + // (which apparently happens on ppc64). + if (use_raise_jmp_patching) +- assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0); ++ { ++ if (symname2 != NULL && strcmp (symname2, "backtracegen") == 0) ++ { ++ fprintf (stderr, ++ "use_raise_jmp_patching didn't expect symname2 " ++ "'backtracegen'\n"); ++ abort (); ++ } ++ } + break; + } + } diff --git a/poky/meta/recipes-devtools/expect/expect_5.45.4.bb b/poky/meta/recipes-devtools/expect/expect_5.45.4.bb index 39ae6151f..e27b0d9d7 100644 --- a/poky/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/poky/meta/recipes-devtools/expect/expect_5.45.4.bb @@ -14,7 +14,7 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" DEPENDS += "tcl" -RDEPENDS_${PN} = "tcl" +RDEPENDS:${PN} = "tcl" inherit autotools update-alternatives @@ -35,7 +35,7 @@ UPSTREAM_CHECK_REGEX = "/Expect/(?P<pver>(\d+[\.\-_]*)+)/" S = "${WORKDIR}/${BPN}${PV}" -do_install_append() { +do_install:append() { install -d ${D}${libdir} install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/ install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/ @@ -47,7 +47,7 @@ do_install_append() { # Apparently the public Tcl headers are only in /usr/include/tcl8.6 # when building for the target and nativesdk. TCL_INCLUDE_PATH = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6" -TCL_INCLUDE_PATH_class-native = "" +TCL_INCLUDE_PATH:class-native = "" EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ --enable-shared \ @@ -57,12 +57,12 @@ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ " EXTRA_OEMAKE_install = " 'SCRIPTS=' " -ALTERNATIVE_${PN} = "mkpasswd" +ALTERNATIVE:${PN} = "mkpasswd" ALTERNATIVE_LINK_NAME[mkpasswd] = "${bindir}/mkpasswd" # Use lower priority than busybox's mkpasswd (created when built with CONFIG_CRYPTPW) ALTERNATIVE_PRIORITY[mkpasswd] = "40" -FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ +FILES:${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ ${includedir}/expect.h \ ${includedir}/expect_tcl.h \ ${includedir}/expect_comm.h \ @@ -70,7 +70,7 @@ FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ ${includedir}/*.h \ " -FILES_${PN} += "${libdir}/libexpect${PV}.so \ +FILES:${PN} += "${libdir}/libexpect${PV}.so \ ${libdir}/expect${PV}/* \ " diff --git a/poky/meta/recipes-devtools/file/file_5.40.bb b/poky/meta/recipes-devtools/file/file_5.40.bb index ec79839bd..32b61f4f3 100644 --- a/poky/meta/recipes-devtools/file/file_5.40.bb +++ b/poky/meta/recipes-devtools/file/file_5.40.bb @@ -9,7 +9,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b" DEPENDS = "file-replacement-native" -DEPENDS_class-native = "bzip2-replacement-native" +DEPENDS:class-native = "bzip2-replacement-native" SRC_URI = "git://github.com/file/file.git" @@ -25,30 +25,30 @@ PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib" EXTRA_OECONF += "--disable-libseccomp" -ALTERNATIVE_${PN} = "file" +ALTERNATIVE:${PN} = "file" ALTERNATIVE_LINK_NAME[file] = "${bindir}/file" -EXTRA_OEMAKE_append_class-target = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" -EXTRA_OEMAKE_append_class-nativesdk = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" +EXTRA_OEMAKE:append:class-target = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" +EXTRA_OEMAKE:append:class-nativesdk = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" -FILES_${PN} += "${datadir}/misc/*.mgc" +FILES:${PN} += "${datadir}/misc/*.mgc" -do_compile_append_class-native() { +do_compile:append:class-native() { oe_runmake check } -do_install_append_class-native() { +do_install:append:class-native() { create_cmdline_wrapper ${D}/${bindir}/file \ --magic-file ${datadir}/misc/magic.mgc } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_cmdline_wrapper ${D}/${bindir}/file \ --magic-file ${datadir}/misc/magic.mgc } BBCLASSEXTEND = "native nativesdk" -PROVIDES_append_class-native = " file-replacement-native" +PROVIDES:append:class-native = " file-replacement-native" # Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who # depends on file-replacement-native. -bindir_append_class-native = "/file-native" +bindir:append:class-native = "/file-native" diff --git a/poky/meta/recipes-devtools/flex/flex_2.6.4.bb b/poky/meta/recipes-devtools/flex/flex_2.6.4.bb index 54e7e0172..56f5b742e 100644 --- a/poky/meta/recipes-devtools/flex/flex_2.6.4.bb +++ b/poky/meta/recipes-devtools/flex/flex_2.6.4.bb @@ -4,7 +4,7 @@ lexical patterns in text." HOMEPAGE = "http://sourceforge.net/projects/flex/" SECTION = "devel" LICENSE = "BSD-3-Clause & LGPL-2.0+" -LICENSE_${PN}-libfl = "BSD-3-Clause" +LICENSE:${PN}-libfl = "BSD-3-Clause" DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native flex-native', '', d)}" BBCLASSEXTEND = "native nativesdk" @@ -31,26 +31,26 @@ UPSTREAM_CHECK_REGEX = "flex-(?P<pver>\d+(\.\d+)+)\.tar" inherit autotools gettext texinfo ptest M4 = "${bindir}/m4" -M4_class-native = "${STAGING_BINDIR_NATIVE}/m4" +M4:class-native = "${STAGING_BINDIR_NATIVE}/m4" EXTRA_OECONF += "ac_cv_path_M4=${M4} ac_cv_func_reallocarray=no" EXTRA_OEMAKE += "m4=${STAGING_BINDIR_NATIVE}/m4" EXTRA_OEMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', 'FLEX=${STAGING_BINDIR_NATIVE}/flex', '', d)}" -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}/${bindir}/flex M4=${M4} } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_wrapper ${D}/${bindir}/flex M4=${M4} } PACKAGES =+ "${PN}-libfl" -FILES_${PN}-libfl = "${libdir}/libfl.so.* ${libdir}/libfl_pic.so.*" +FILES:${PN}-libfl = "${libdir}/libfl.so.* ${libdir}/libfl_pic.so.*" -RDEPENDS_${PN} += "m4" -RDEPENDS_${PN}-ptest += "bash gawk make" +RDEPENDS:${PN} += "m4" +RDEPENDS:${PN}-ptest += "bash gawk make" do_compile_ptest() { oe_runmake -C ${B}/tests -f ${B}/tests/Makefile top_builddir=${B} INCLUDES=-I${S}/src buildtests diff --git a/poky/meta/recipes-devtools/gcc/gcc-11.1.inc b/poky/meta/recipes-devtools/gcc/gcc-11.2.inc index c21242af5..9fd30f52a 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-11.1.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-11.2.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "11.1.0" +PV = "11.2.0" # BINV should be incremented to a revision after a minor gcc release -BINV = "11.1.1" +BINV = "11.2.0" FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" @@ -27,7 +27,6 @@ LIC_FILES_CHKSUM = "\ #BASEURI ?= "https://github.com/gcc-mirror/gcc/archive/${RELEASE}.zip;downloadfilename=gcc-${PV}-${RELEASE}.zip" BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz \ - http://downloads.yoctoproject.org/mirror/sources/gcc-11.1.0-9ee61d2b51df012c659359873637cc2162ecccf3.patch;apply=yes;name=backports \ " SRC_URI = "\ ${BASEURI} \ @@ -68,13 +67,9 @@ SRC_URI = "\ file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ file://0036-mingw32-Enable-operation_not_supported.patch \ file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \ - file://0001-libstdc-Fix-installation-of-python-hooks-PR-99453.patch \ - file://0038-arc-Update-64bit-move-split-patterns.patch \ - file://0039-arc-Fix-u-maddhisi-patterns.patch \ - file://0040-arc-Update-doloop_end-patterns.patch \ + file://0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch \ " -SRC_URI[sha256sum] = "4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf" -SRC_URI[backports.sha256sum] = "69274bebd6c069a13443d4af61070e854740a639ec4d66eedf3e80070363587b" +SRC_URI[sha256sum] = "d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" @@ -87,7 +82,7 @@ FORTRAN = "" JAVA = "" SSP ?= "--disable-libssp" -SSP_mingw32 = "--enable-libssp" +SSP:mingw32 = "--enable-libssp" EXTRA_OECONF_BASE = "\ ${SSP} \ diff --git a/poky/meta/recipes-devtools/gcc/gcc-common.inc b/poky/meta/recipes-devtools/gcc/gcc-common.inc index 629fa26df..74190644e 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-common.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-common.inc @@ -12,7 +12,7 @@ inherit autotools gettext texinfo BPN = "gcc" COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir" -COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" +COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" python extract_stashed_builddir () { src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") @@ -83,7 +83,7 @@ def get_tune_parameters(tune, d): get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS" -DEBIANNAME_${MLPREFIX}libgcc = "libgcc1" +DEBIANNAME:${MLPREFIX}libgcc = "libgcc1" MIRRORS =+ "\ ${GNU_MIRROR}/gcc ftp://gcc.gnu.org/pub/gcc/releases/ \n \ diff --git a/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc index dc7f458b2..e4cdb73f0 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -45,27 +45,27 @@ EXTRA_OECONF = "\ # glibc version is a minimum controlling whether features are enabled. # Doesn't need to track glibc exactly -EXTRA_OECONF_append_libc-glibc = " --with-glibc-version=2.28 " +EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 " # Set this here since GCC configure won't auto-detect and enable # initfini-arry when cross compiling. -EXTRA_OECONF_append = " --enable-initfini-array" +EXTRA_OECONF:append = " --enable-initfini-array" export gcc_cv_collect2_libs = 'none required' # We need to set gcc_cv_collect2_libs else there is cross-compilation badness # in the config.log files (which might not get generated until do_compile # hence being missed by the insane do_configure check). -EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" +EXTRA_OECONF:append:linux = " --enable-__cxa_atexit" -EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6" -EXTRA_OECONF_append_mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" -EXTRA_OECONF_append_mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" -EXTRA_OECONF_append_mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" +EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6" +EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" +EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" +EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" EXTRA_OECONF_GCC_FLOAT ??= "" CPPFLAGS = "" @@ -74,7 +74,7 @@ SYSTEMHEADERS = "${target_includedir}" SYSTEMLIBS = "${target_base_libdir}/" SYSTEMLIBS1 = "${target_libdir}/" -do_configure_prepend () { +do_configure:prepend () { # teach gcc to find correct target includedir when checking libc ssp support mkdir -p ${B}/gcc echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 1872faee1..495dd9070 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -65,7 +65,7 @@ do_compile () { PACKAGES = "${PN}-dbg ${PN} ${PN}-doc" -FILES_${PN} = "\ +FILES:${PN} = "\ ${exec_prefix}/bin/* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ @@ -81,9 +81,9 @@ FILES_${PN} = "\ ${prefix}/${TARGET_SYS}/lib/* \ ${prefix}/${TARGET_SYS}${target_includedir}/* \ " -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" -FILES_${PN}-doc = "\ +FILES:${PN}-doc = "\ ${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ @@ -173,16 +173,16 @@ do_install () { ELFUTILS = "nativesdk-elfutils" DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" -RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" +RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" SYSTEMHEADERS = "${target_includedir}/" SYSTEMLIBS = "${target_base_libdir}/" SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" -EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = " --without-headers --with-newlib" -EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" +EXTRA_OECONF:remove:elf = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove:eabi = "--with-sysroot=/not/exist" +EXTRA_OECONF:append:elf = " --without-headers --with-newlib" +EXTRA_OECONF:append:eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_11.2.bb index bf53c5cd7..bf53c5cd7 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_11.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross.inc b/poky/meta/recipes-devtools/gcc/gcc-cross.inc index dca4036ab..3ffa1f0c4 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-cross.inc @@ -22,7 +22,7 @@ require gcc-configure-common.inc LINKER_HASH_STYLE ?= "sysv" EXTRA_OECONF += "--enable-poison-system-directories=error" -EXTRA_OECONF_append_sh4 = " \ +EXTRA_OECONF:append:sh4 = " \ --with-multilib-list= \ --enable-incomplete-targets \ " @@ -31,9 +31,9 @@ EXTRA_OECONF += "\ --with-system-zlib \ " -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" -EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix" +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix" +EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \ @@ -44,7 +44,7 @@ EXTRA_OECONF_PATHS = "\ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" -do_configure_prepend () { +do_configure:prepend () { install -d ${RECIPE_SYSROOT}${target_includedir} touch ${RECIPE_SYSROOT}${target_includedir}/limits.h } diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc-cross_11.2.bb index b43cca0c5..b43cca0c5 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-cross_11.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-crosssdk_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc-crosssdk_11.2.bb index 40a6c4fef..40a6c4fef 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-crosssdk_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-crosssdk_11.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 31b8619be..e90580d1c 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc @@ -170,7 +170,7 @@ python gcc_multilib_setup() { header_config_files = gcc_header_config_files[target_arch] ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE'] - mltunes = [('DEFAULTTUNE_virtclass-multilib-%s' % ml) for ml in multilibs] + mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs] if mlprefix: mlindex = 0 for ml in multilibs: diff --git a/poky/meta/recipes-devtools/gcc/gcc-runtime.inc b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc index 59d9a2468..4839a6687 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -6,7 +6,7 @@ SUMMARY = "Runtime libraries from GCC" # All gcc-runtime packages are now covered by the runtime exception. LICENSE = "GPL-3.0-with-GCC-exception" -CXXFLAGS_remove = "-fvisibility-inlines-hidden" +CXXFLAGS:remove = "-fvisibility-inlines-hidden" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \ @@ -14,37 +14,37 @@ EXTRA_OECONF_PATHS = "\ --with-build-sysroot=${STAGING_DIR_TARGET} \ " -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" -EXTRA_OECONF_append = " --cache-file=${B}/config.cache" -EXTRA_OECONF_append_libc-newlib = " --with-newlib" +EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF:append = " --cache-file=${B}/config.cache" +EXTRA_OECONF:append:libc-newlib = " --with-newlib" # Disable ifuncs for libatomic on arm conflicts -march/-mcpu -EXTRA_OECONF_append_arm = " libat_cv_have_ifunc=no " -EXTRA_OECONF_append_armeb = " libat_cv_have_ifunc=no " +EXTRA_OECONF:append:arm = " libat_cv_have_ifunc=no " +EXTRA_OECONF:append:armeb = " libat_cv_have_ifunc=no " -DISABLE_STATIC_class-nativesdk ?= "" +DISABLE_STATIC:class-nativesdk ?= "" # Newlib does not support symbol versioning on libsdtcc++ -SYMVERS_CONF_libc-newlib = "" +SYMVERS_CONF:libc-newlib = "" # Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" RUNTIMELIBITM = "libitm" -RUNTIMELIBITM_arc = "" -RUNTIMELIBITM_mipsarch = "" -RUNTIMELIBITM_nios2 = "" -RUNTIMELIBITM_microblaze = "" -RUNTIMELIBITM_riscv32 = "" -RUNTIMELIBITM_riscv64 = "" +RUNTIMELIBITM:arc = "" +RUNTIMELIBITM:mipsarch = "" +RUNTIMELIBITM:nios2 = "" +RUNTIMELIBITM:microblaze = "" +RUNTIMELIBITM:riscv32 = "" +RUNTIMELIBITM:riscv64 = "" RUNTIMELIBSSP ?= "" -RUNTIMELIBSSP_mingw32 ?= "libssp" +RUNTIMELIBSSP:mingw32 ?= "libssp" RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ " # Only build libstdc++ for newlib -RUNTIMETARGET_libc-newlib = "libstdc++-v3" +RUNTIMETARGET:libc-newlib = "libstdc++-v3" # libiberty # libgfortran needs separate recipe due to libquadmath dependency @@ -52,7 +52,7 @@ RUNTIMETARGET_libc-newlib = "libstdc++-v3" # Relative path to be repaced into debug info REL_S = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" -DEBUG_PREFIX_MAP_class-target = " \ +DEBUG_PREFIX_MAP:class-target = " \ -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \ -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \ -fdebug-prefix-map=${S}=${REL_S} \ @@ -109,7 +109,7 @@ do_install () { fi } -do_install_append_class-target () { +do_install:append:class-target () { if [ "${TARGET_OS}" = "linux-gnuspe" ]; then ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux fi @@ -186,67 +186,67 @@ PACKAGES = "\ libitm-staticdev \ " # The base package doesn't exist, so we clear the recommends. -RRECOMMENDS_${PN}-dbg = "" +RRECOMMENDS:${PN}-dbg = "" # include python debugging scripts -FILES_${PN}-dbg += "\ +FILES:${PN}-dbg += "\ ${libdir}/libstdc++.*-gdb.py \ ${datadir}/gcc-${BINV}/python/libstdcxx \ " -FILES_libg2c = "${target_libdir}/libg2c.so.*" -SUMMARY_libg2c = "Companion runtime library for g77" -FILES_libg2c-dev = "\ +FILES:libg2c = "${target_libdir}/libg2c.so.*" +SUMMARY:libg2c = "Companion runtime library for g77" +FILES:libg2c-dev = "\ ${libdir}/libg2c.so \ ${libdir}/libg2c.a \ ${libdir}/libfrtbegin.a \ " -SUMMARY_libg2c-dev = "Companion runtime library for g77 - development files" +SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files" -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -SUMMARY_libstdc++ = "GNU standard C++ library" -FILES_libstdc++-dev = "\ +FILES:libstdc++ = "${libdir}/libstdc++.so.*" +SUMMARY:libstdc++ = "GNU standard C++ library" +FILES:libstdc++-dev = "\ ${includedir}/c++/ \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++*.la \ ${libdir}/libsupc++.la \ " -SUMMARY_libstdc++-dev = "GNU standard C++ library - development files" -FILES_libstdc++-staticdev = "\ +SUMMARY:libstdc++-dev = "GNU standard C++ library - development files" +FILES:libstdc++-staticdev = "\ ${libdir}/libstdc++*.a \ ${libdir}/libsupc++.a \ " -SUMMARY_libstdc++-staticdev = "GNU standard C++ library - static development files" +SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files" -FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" -SUMMARY_libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files" +FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" +SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files" -FILES_libssp = "${libdir}/libssp.so.*" -SUMMARY_libssp = "GNU stack smashing protection library" -FILES_libssp-dev = "\ +FILES:libssp = "${libdir}/libssp.so.*" +SUMMARY:libssp = "GNU stack smashing protection library" +FILES:libssp-dev = "\ ${libdir}/libssp*.so \ ${libdir}/libssp*_nonshared.a \ ${libdir}/libssp*.la \ ${libdir}/${TARGET_SYS}/${BINV}/include/ssp \ " -SUMMARY_libssp-dev = "GNU stack smashing protection library - development files" -FILES_libssp-staticdev = "${libdir}/libssp*.a" -SUMMARY_libssp-staticdev = "GNU stack smashing protection library - static development files" +SUMMARY:libssp-dev = "GNU stack smashing protection library - development files" +FILES:libssp-staticdev = "${libdir}/libssp*.a" +SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files" -FILES_libquadmath = "${libdir}/libquadmath*.so.*" -SUMMARY_libquadmath = "GNU quad-precision math library" -FILES_libquadmath-dev = "\ +FILES:libquadmath = "${libdir}/libquadmath*.so.*" +SUMMARY:libquadmath = "GNU quad-precision math library" +FILES:libquadmath-dev = "\ ${libdir}/${TARGET_SYS}/${BINV}/include/quadmath* \ ${libdir}/libquadmath*.so \ ${libdir}/libquadmath.la \ " -SUMMARY_libquadmath-dev = "GNU quad-precision math library - development files" -FILES_libquadmath-staticdev = "${libdir}/libquadmath.a" -SUMMARY_libquadmath-staticdev = "GNU quad-precision math library - static development files" +SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files" +FILES:libquadmath-staticdev = "${libdir}/libquadmath.a" +SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files" -FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" -SUMMARY_libgomp = "GNU OpenMP parallel programming library" -FILES_libgomp-dev = "\ +FILES:libgomp = "${libdir}/libgomp*${SOLIBS}" +SUMMARY:libgomp = "GNU OpenMP parallel programming library" +FILES:libgomp-dev = "\ ${libdir}/libgomp*${SOLIBSDEV} \ ${libdir}/libgomp*.la \ ${libdir}/libgomp.spec \ @@ -254,34 +254,34 @@ FILES_libgomp-dev = "\ ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \ ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \ " -SUMMARY_libgomp-dev = "GNU OpenMP parallel programming library - development files" -FILES_libgomp-staticdev = "${libdir}/libgomp*.a" -SUMMARY_libgomp-staticdev = "GNU OpenMP parallel programming library - static development files" +SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files" +FILES:libgomp-staticdev = "${libdir}/libgomp*.a" +SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files" -FILES_libatomic = "${libdir}/libatomic.so.*" -SUMMARY_libatomic = "GNU C++11 atomics support library" -FILES_libatomic-dev = "\ +FILES:libatomic = "${libdir}/libatomic.so.*" +SUMMARY:libatomic = "GNU C++11 atomics support library" +FILES:libatomic-dev = "\ ${libdir}/libatomic.so \ ${libdir}/libatomic.la \ " -SUMMARY_libatomic-dev = "GNU C++11 atomics support library - development files" -FILES_libatomic-staticdev = "${libdir}/libatomic.a" -SUMMARY_libatomic-staticdev = "GNU C++11 atomics support library - static development files" +SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files" +FILES:libatomic-staticdev = "${libdir}/libatomic.a" +SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files" -FILES_libitm = "${libdir}/libitm.so.*" -SUMMARY_libitm = "GNU transactional memory support library" -FILES_libitm-dev = "\ +FILES:libitm = "${libdir}/libitm.so.*" +SUMMARY:libitm = "GNU transactional memory support library" +FILES:libitm-dev = "\ ${libdir}/libitm.so \ ${libdir}/libitm.la \ ${libdir}/libitm.spec \ " -SUMMARY_libitm-dev = "GNU transactional memory support library - development files" -FILES_libitm-staticdev = "${libdir}/libitm.a" -SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files" +SUMMARY:libitm-dev = "GNU transactional memory support library - development files" +FILES:libitm-staticdev = "${libdir}/libitm.a" +SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files" require gcc-testsuite.inc -EXTRA_OEMAKE_prepend_task-check = "${PARALLEL_MAKE} " +EXTRA_OEMAKE:prepend:task-check = "${PARALLEL_MAKE} " MAKE_CHECK_TARGETS ??= "check-gcc ${@" ".join("check-target-" + i for i in d.getVar("RUNTIMETARGET").split())}" # prettyprinters and xmethods require gdb tooling diff --git a/poky/meta/recipes-devtools/gcc/gcc-runtime_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb index dd430b57e..dd430b57e 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-runtime_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc index 59e91daae..9881afa83 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc @@ -47,11 +47,11 @@ do_install () { } INHIBIT_DEFAULT_DEPS = "1" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc" # used to fix ../../../../../../../../../work-shared/gcc-8.3.0-r0/gcc-8.3.0/libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized] -DEBUG_OPTIMIZATION_append = " -Wno-error" +DEBUG_OPTIMIZATION:append = " -Wno-error" BBCLASSEXTEND = "nativesdk" @@ -60,19 +60,19 @@ PACKAGES += "libasan libubsan liblsan libtsan" PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev" PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev" -RDEPENDS_libasan += "libstdc++" -RDEPENDS_libubsan += "libstdc++" -RDEPENDS_liblsan += "libstdc++" -RDEPENDS_libtsan += "libstdc++" -RDEPENDS_libasan-dev += "${PN}" -RDEPENDS_libubsan-dev += "${PN}" -RDEPENDS_liblsan-dev += "${PN}" -RDEPENDS_libtsan-dev += "${PN}" -RRECOMMENDS_${PN} += "libasan libubsan" -RRECOMMENDS_${PN}_append_x86 = " liblsan" -RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan" -RRECOMMENDS_${PN}_append_powerpc64 = " liblsan libtsan" -RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan" +RDEPENDS:libasan += "libstdc++" +RDEPENDS:libubsan += "libstdc++" +RDEPENDS:liblsan += "libstdc++" +RDEPENDS:libtsan += "libstdc++" +RDEPENDS:libasan-dev += "${PN}" +RDEPENDS:libubsan-dev += "${PN}" +RDEPENDS:liblsan-dev += "${PN}" +RDEPENDS:libtsan-dev += "${PN}" +RRECOMMENDS:${PN} += "libasan libubsan" +RRECOMMENDS:${PN}:append:x86 = " liblsan" +RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan" +RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan" +RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan" do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" @@ -81,40 +81,40 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlib # Only x86, powerpc, sparc, s390, arm, and aarch64 are supported COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux' # musl is currently broken entirely -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' -FILES_libasan += "${libdir}/libasan.so.* ${libdir}/libhwasan.so.*" -FILES_libasan-dev += "\ +FILES:libasan += "${libdir}/libasan.so.* ${libdir}/libhwasan.so.*" +FILES:libasan-dev += "\ ${libdir}/libasan_preinit.o \ ${libdir}/libasan.so \ ${libdir}/libhwasan.so \ ${libdir}/libasan.la \ " -FILES_libasan-staticdev += "${libdir}/libasan.a \ +FILES:libasan-staticdev += "${libdir}/libasan.a \ ${libdir}/libhwasan.a \ " -FILES_libubsan += "${libdir}/libubsan.so.*" -FILES_libubsan-dev += "\ +FILES:libubsan += "${libdir}/libubsan.so.*" +FILES:libubsan-dev += "\ ${libdir}/libubsan.so \ ${libdir}/libubsan.la \ " -FILES_libubsan-staticdev += "${libdir}/libubsan.a" +FILES:libubsan-staticdev += "${libdir}/libubsan.a" -FILES_liblsan += "${libdir}/liblsan.so.*" -FILES_liblsan-dev += "\ +FILES:liblsan += "${libdir}/liblsan.so.*" +FILES:liblsan-dev += "\ ${libdir}/liblsan.so \ ${libdir}/liblsan.la \ ${libdir}/liblsan_preinit.o \ " -FILES_liblsan-staticdev += "${libdir}/liblsan.a" +FILES:liblsan-staticdev += "${libdir}/liblsan.a" -FILES_libtsan += "${libdir}/libtsan.so.*" -FILES_libtsan-dev += "\ +FILES:libtsan += "${libdir}/libtsan.so.*" +FILES:libtsan-dev += "\ ${libdir}/libtsan.so \ ${libdir}/libtsan.la \ ${libdir}/libtsan_*.o \ " -FILES_libtsan-staticdev += "${libdir}/libtsan.a" +FILES:libtsan-staticdev += "${libdir}/libtsan.a" -FILES_${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" +FILES:${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" diff --git a/poky/meta/recipes-devtools/gcc/gcc-sanitizers_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc-sanitizers_11.2.bb index f3c705811..8bda2ccad 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-sanitizers_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-sanitizers_11.2.bb @@ -3,5 +3,5 @@ require gcc-sanitizers.inc # Building with thumb enabled on armv4t armv5t fails with # sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8' -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" diff --git a/poky/meta/recipes-devtools/gcc/gcc-source_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc-source_11.2.bb index b890fa33e..b890fa33e 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-source_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc-source_11.2.bb diff --git a/poky/meta/recipes-devtools/gcc/gcc-target.inc b/poky/meta/recipes-devtools/gcc/gcc-target.inc index 0ee3e83d4..bf55e692e 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-target.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-target.inc @@ -5,7 +5,7 @@ EXTRA_OECONF_PATHS = "\ --with-build-sysroot=${STAGING_DIR_TARGET} \ " -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu" # Configure gcc running on the target to default to an architecture which will # be compatible with that of gcc-runtime (which is cross compiled to be target @@ -15,11 +15,11 @@ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" ARMFPARCHEXT ?= "" -EXTRA_OECONF_append_armv6_class-target = " --with-arch=armv6${ARMFPARCHEXT}" -EXTRA_OECONF_append_armv7a_class-target = " --with-arch=armv7-a${ARMFPARCHEXT}" -EXTRA_OECONF_append_armv7ve_class-target = " --with-arch=armv7ve${ARMFPARCHEXT}" -EXTRA_OECONF_append_arc_class-target = " --with-cpu=${TUNE_PKGARCH}" -EXTRA_OECONF_append_x86-64_class-target = " --with-arch=native" +EXTRA_OECONF:append:armv6:class-target = " --with-arch=armv6${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}" +EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}" +EXTRA_OECONF:append:x86-64:class-target = " --with-arch=native" # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is # set in subdir gcc, so subdir libcc1 can't use it, export it here to @@ -40,7 +40,7 @@ PACKAGES = "\ ${PN}-dbg \ " -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir}/${TARGET_PREFIX}gcc* \ ${bindir}/${TARGET_PREFIX}lto* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \ @@ -56,85 +56,85 @@ FILES_${PN} = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ ${libdir}/bfd-plugins/*.so \ " -INSANE_SKIP_${PN} += "dev-so" -RRECOMMENDS_${PN} += "\ +INSANE_SKIP:${PN} += "dev-so" +RRECOMMENDS:${PN} += "\ libssp \ libssp-dev \ " -RDEPENDS_${PN} += "cpp" +RDEPENDS:${PN} += "cpp" -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ " -FILES_${PN}-symlinks = "\ +FILES:${PN}-symlinks = "\ ${bindir}/cc \ ${bindir}/gcc \ ${bindir}/gccbug \ " -FILES_${PN}-plugins = "\ +FILES:${PN}-plugins = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ " -ALLOW_EMPTY_${PN}-plugins = "1" +ALLOW_EMPTY:${PN}-plugins = "1" -FILES_g77 = "\ +FILES:g77 = "\ ${bindir}/${TARGET_PREFIX}g77 \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ " -FILES_g77-symlinks = "\ +FILES:g77-symlinks = "\ ${bindir}/g77 \ ${bindir}/f77 \ " -RRECOMMENDS_g77 = "\ +RRECOMMENDS:g77 = "\ libg2c \ libg2c-dev \ " -FILES_gfortran = "\ +FILES:gfortran = "\ ${bindir}/${TARGET_PREFIX}gfortran \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ " -RRECOMMENDS_gfortran = "\ +RRECOMMENDS:gfortran = "\ libquadmath \ libquadmath-dev \ " -FILES_gfortran-symlinks = "\ +FILES:gfortran-symlinks = "\ ${bindir}/gfortran \ ${bindir}/f95" -FILES_cpp = "\ +FILES:cpp = "\ ${bindir}/${TARGET_PREFIX}cpp* \ ${base_libdir}/cpp \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" -FILES_cpp-symlinks = "${bindir}/cpp" +FILES:cpp-symlinks = "${bindir}/cpp" -FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \ +FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \ ${bindir}/${TARGET_PREFIX}gcov-tool* \ " -FILES_gcov-symlinks = "${bindir}/gcov \ +FILES:gcov-symlinks = "${bindir}/gcov \ ${bindir}/gcov-tool \ " -FILES_g++ = "\ +FILES:g++ = "\ ${bindir}/${TARGET_PREFIX}g++* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ " -FILES_g++-symlinks = "\ +FILES:g++-symlinks = "\ ${bindir}/c++ \ ${bindir}/g++ \ " -RRECOMMENDS_g++ = "\ +RRECOMMENDS:g++ = "\ libstdc++ \ libstdc++-dev \ libatomic \ libatomic-dev \ " -FILES_${PN}-doc = "\ +FILES:${PN}-doc = "\ ${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ @@ -221,7 +221,7 @@ do_install () { chown -R root:root ${D} } -do_install_append () { +do_install:append () { # # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header # files and places the modified files into diff --git a/poky/meta/recipes-devtools/gcc/gcc/0001-libstdc-Fix-installation-of-python-hooks-PR-99453.patch b/poky/meta/recipes-devtools/gcc/gcc/0001-libstdc-Fix-installation-of-python-hooks-PR-99453.patch deleted file mode 100644 index d82f533cb..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc/0001-libstdc-Fix-installation-of-python-hooks-PR-99453.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From ad4c21f0f59b52357019148ec94d767aa2acd8f2 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely <jwakely@redhat.com> -Date: Tue, 1 Jun 2021 11:00:16 +0100 -Subject: [PATCH] libstdc++: Fix installation of python hooks [PR 99453] - -When no shared library is installed, the new code to determine the name -of the -gdb.py file yields an empty string. Use the name of the static -library in that case. - -libstdc++-v3/ChangeLog: - - PR libstdc++/99453 - * python/Makefile.am: Use archive name for printer hook if no - dynamic library name is available. - * python/Makefile.in: Regenerate. - -(cherry picked from commit 9f7bc160b4a0f27dce248d1226e3ae7104b0e67b) ---- - libstdc++-v3/python/Makefile.am | 4 ++++ - libstdc++-v3/python/Makefile.in | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am -index 0c2b207b86e..8efefa5725c 100644 ---- a/libstdc++-v3/python/Makefile.am -+++ b/libstdc++-v3/python/Makefile.am -@@ -48,5 +48,9 @@ install-data-local: gdb.py - ## the correct name. - @libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ - $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ -+ if [ -z "$$libname" ]; then \ -+ libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ -+ $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ -+ fi; \ - echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ - $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py -diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in -index 2efe0b96a19..9904a9197de 100644 ---- a/libstdc++-v3/python/Makefile.in -+++ b/libstdc++-v3/python/Makefile.in -@@ -609,6 +609,10 @@ install-data-local: gdb.py - @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) - @libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ - $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ -+ if [ -z "$$libname" ]; then \ -+ libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ -+ $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ -+ fi; \ - echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ - $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py - --- -2.25.1 - diff --git a/poky/meta/recipes-devtools/gcc/gcc/0038-arc-Update-64bit-move-split-patterns.patch b/poky/meta/recipes-devtools/gcc/gcc/0038-arc-Update-64bit-move-split-patterns.patch deleted file mode 100644 index 37fe95d71..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc/0038-arc-Update-64bit-move-split-patterns.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 0061fabeb9393c362601486105202cfe837a5a68 Mon Sep 17 00:00:00 2001 -From: Claudiu Zissulescu <claziss@synopsys.com> -Date: Wed, 9 Jun 2021 12:12:57 +0300 -Subject: [PATCH] arc: Update 64bit move split patterns. - -ARCv2HS can use a limited number of instructions to implement 64bit -moves. The VADD2 is used as a 64bit move, the LDD/STD are 64 bit loads -and stores. All those instructions are not baseline, hence we need to -provide alternatives when they are not available or cannot be generate -due to instruction restriction. - -This patch is cleaning up those move patterns, and updates splits -instruction lengths. - -This is a backport from mainline gcc. - -gcc/ -2021-06-09 Claudiu Zissulescu <claziss@synopsys.com> - - * config/arc/arc-protos.h (arc_split_move_p): New prototype. - * config/arc/arc.c (arc_split_move_p): New function. - (arc_split_move): Clean up. - * config/arc/arc.md (movdi_insn): Clean up, use arc_split_move_p. - (movdf_insn): Likewise. - * config/arc/simdext.md (mov<VWH>_insn): Likewise. - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=0061fabeb9393c362601486105202cfe837a5a68] - -Signed-off-by: Claudiu Zissulescu <claziss@synopsys.com> -(cherry picked from commit c0ba7a8af5366c37241f20e8be41e362f7260389) -Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> ---- - gcc/config/arc/arc-protos.h | 1 + - gcc/config/arc/arc.c | 44 ++++++++++++---------- - gcc/config/arc/arc.md | 91 +++++++++------------------------------------ - gcc/config/arc/simdext.md | 38 ++++--------------- - 4 files changed, 52 insertions(+), 122 deletions(-) - -diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h -index 1f56a0d82e4..62d7e45d29d 100644 ---- a/gcc/config/arc/arc-protos.h -+++ b/gcc/config/arc/arc-protos.h -@@ -50,6 +50,7 @@ extern void arc_split_ior (rtx *); - extern bool arc_check_mov_const (HOST_WIDE_INT ); - extern bool arc_split_mov_const (rtx *); - extern bool arc_can_use_return_insn (void); -+extern bool arc_split_move_p (rtx *); - #endif /* RTX_CODE */ - - extern bool arc_ccfsm_branch_deleted_p (void); -diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c -index 3201c3fefd7..db541bc11f5 100644 ---- a/gcc/config/arc/arc.c -+++ b/gcc/config/arc/arc.c -@@ -10129,6 +10129,31 @@ arc_process_double_reg_moves (rtx *operands) - return true; - } - -+ -+/* Check if we need to split a 64bit move. We do not need to split it if we can -+ use vadd2 or ldd/std instructions. */ -+ -+bool -+arc_split_move_p (rtx *operands) -+{ -+ machine_mode mode = GET_MODE (operands[0]); -+ -+ if (TARGET_LL64 -+ && ((memory_operand (operands[0], mode) -+ && (even_register_operand (operands[1], mode) -+ || satisfies_constraint_Cm3 (operands[1]))) -+ || (memory_operand (operands[1], mode) -+ && even_register_operand (operands[0], mode)))) -+ return false; -+ -+ if (TARGET_PLUS_QMACW -+ && even_register_operand (operands[0], mode) -+ && even_register_operand (operands[1], mode)) -+ return false; -+ -+ return true; -+} -+ - /* operands 0..1 are the operands of a 64 bit move instruction. - split it into two moves with operands 2/3 and 4/5. */ - -@@ -10146,25 +10171,6 @@ arc_split_move (rtx *operands) - return; - } - -- if (TARGET_LL64 -- && ((memory_operand (operands[0], mode) -- && (even_register_operand (operands[1], mode) -- || satisfies_constraint_Cm3 (operands[1]))) -- || (memory_operand (operands[1], mode) -- && even_register_operand (operands[0], mode)))) -- { -- emit_move_insn (operands[0], operands[1]); -- return; -- } -- -- if (TARGET_PLUS_QMACW -- && even_register_operand (operands[0], mode) -- && even_register_operand (operands[1], mode)) -- { -- emit_move_insn (operands[0], operands[1]); -- return; -- } -- - if (TARGET_PLUS_QMACW - && GET_CODE (operands[1]) == CONST_VECTOR) - { -diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md -index 7a52551eef5..91a838a38e4 100644 ---- a/gcc/config/arc/arc.md -+++ b/gcc/config/arc/arc.md -@@ -1329,47 +1329,20 @@ core_3, archs4x, archs4xd, archs4xd_slow" - "register_operand (operands[0], DImode) - || register_operand (operands[1], DImode) - || (satisfies_constraint_Cm3 (operands[1]) -- && memory_operand (operands[0], DImode))" -- "* --{ -- switch (which_alternative) -- { -- default: -- return \"#\"; -- -- case 0: -- if (TARGET_PLUS_QMACW -- && even_register_operand (operands[0], DImode) -- && even_register_operand (operands[1], DImode)) -- return \"vadd2%?\\t%0,%1,0\"; -- return \"#\"; -- -- case 2: -- if (TARGET_LL64 -- && memory_operand (operands[1], DImode) -- && even_register_operand (operands[0], DImode)) -- return \"ldd%U1%V1 %0,%1%&\"; -- return \"#\"; -- -- case 3: -- if (TARGET_LL64 -- && memory_operand (operands[0], DImode) -- && (even_register_operand (operands[1], DImode) -- || satisfies_constraint_Cm3 (operands[1]))) -- return \"std%U0%V0 %1,%0\"; -- return \"#\"; -- } --}" -- "&& reload_completed" -+ && memory_operand (operands[0], DImode))" -+ "@ -+ vadd2\\t%0,%1,0 -+ # -+ ldd%U1%V1\\t%0,%1 -+ std%U0%V0\\t%1,%0" -+ "&& reload_completed && arc_split_move_p (operands)" - [(const_int 0)] - { - arc_split_move (operands); - DONE; - } - [(set_attr "type" "move,move,load,store") -- ;; ??? The ld/st values could be 4 if it's [reg,bignum]. -- (set_attr "length" "8,16,*,*")]) -- -+ (set_attr "length" "8,16,16,16")]) - - ;; Floating point move insns. - -@@ -1408,50 +1381,22 @@ core_3, archs4x, archs4xd, archs4xd_slow" - (define_insn_and_split "*movdf_insn" - [(set (match_operand:DF 0 "move_dest_operand" "=D,r,r,r,r,m") - (match_operand:DF 1 "move_double_src_operand" "r,D,r,E,m,r"))] -- "register_operand (operands[0], DFmode) -- || register_operand (operands[1], DFmode)" -- "* --{ -- switch (which_alternative) -- { -- default: -- return \"#\"; -- -- case 2: -- if (TARGET_PLUS_QMACW -- && even_register_operand (operands[0], DFmode) -- && even_register_operand (operands[1], DFmode)) -- return \"vadd2%?\\t%0,%1,0\"; -- return \"#\"; -- -- case 4: -- if (TARGET_LL64 -- && ((even_register_operand (operands[0], DFmode) -- && memory_operand (operands[1], DFmode)) -- || (memory_operand (operands[0], DFmode) -- && even_register_operand (operands[1], DFmode)))) -- return \"ldd%U1%V1 %0,%1%&\"; -- return \"#\"; -- -- case 5: -- if (TARGET_LL64 -- && ((even_register_operand (operands[0], DFmode) -- && memory_operand (operands[1], DFmode)) -- || (memory_operand (operands[0], DFmode) -- && even_register_operand (operands[1], DFmode)))) -- return \"std%U0%V0 %1,%0\"; -- return \"#\"; -- } --}" -- "reload_completed" -+ "(register_operand (operands[0], DFmode) -+ || register_operand (operands[1], DFmode))" -+ "@ -+ # -+ # -+ vadd2\\t%0,%1,0 -+ # -+ ldd%U1%V1\\t%0,%1 -+ std%U0%V0\\t%1,%0" -+ "&& reload_completed && arc_split_move_p (operands)" - [(const_int 0)] - { - arc_split_move (operands); - DONE; - } - [(set_attr "type" "move,move,move,move,load,store") -- (set_attr "predicable" "no,no,no,yes,no,no") -- ;; ??? The ld/st values could be 16 if it's [reg,bignum]. - (set_attr "length" "4,16,8,16,16,16")]) - - (define_insn_and_split "*movdf_insn_nolrsr" -diff --git a/gcc/config/arc/simdext.md b/gcc/config/arc/simdext.md -index f0900757452..36f41a5c3d0 100644 ---- a/gcc/config/arc/simdext.md -+++ b/gcc/config/arc/simdext.md -@@ -1402,41 +1402,19 @@ - (match_operand:VWH 1 "general_operand" "i,r,m,r"))] - "(register_operand (operands[0], <MODE>mode) - || register_operand (operands[1], <MODE>mode))" -- "* --{ -- switch (which_alternative) -- { -- default: -- return \"#\"; -- -- case 1: -- if (TARGET_PLUS_QMACW -- && even_register_operand (operands[0], <MODE>mode) -- && even_register_operand (operands[1], <MODE>mode)) -- return \"vadd2%?\\t%0,%1,0\"; -- return \"#\"; -- -- case 2: -- if (TARGET_LL64) -- return \"ldd%U1%V1 %0,%1\"; -- return \"#\"; -- -- case 3: -- if (TARGET_LL64) -- return \"std%U0%V0 %1,%0\"; -- return \"#\"; -- } --}" -- "reload_completed" -+ "@ -+ # -+ vadd2\\t%0,%1,0 -+ ldd%U1%V1\\t%0,%1 -+ std%U0%V0\\t%1,%0" -+ "&& reload_completed && arc_split_move_p (operands)" - [(const_int 0)] - { - arc_split_move (operands); - DONE; - } -- [(set_attr "type" "move,multi,load,store") -- (set_attr "predicable" "no,no,no,no") -- (set_attr "iscompact" "false,false,false,false") -- ]) -+ [(set_attr "type" "move,move,load,store") -+ (set_attr "length" "16,8,16,16")]) - - (define_expand "movmisalign<mode>" - [(set (match_operand:VWH 0 "general_operand" "") --- -2.16.2 - diff --git a/poky/meta/recipes-devtools/gcc/gcc/0039-arc-Fix-u-maddhisi-patterns.patch b/poky/meta/recipes-devtools/gcc/gcc/0039-arc-Fix-u-maddhisi-patterns.patch deleted file mode 100644 index 9c5a2b8b3..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc/0039-arc-Fix-u-maddhisi-patterns.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 4186b7e93be73f8d68dc0fcc00a4cc8cc83e99a8 Mon Sep 17 00:00:00 2001 -From: Claudiu Zissulescu <claziss@synopsys.com> -Date: Wed, 9 Jun 2021 12:12:57 +0300 -Subject: [PATCH] arc: Fix (u)maddhisi patterns - -Rework the (u)maddhisi4 patterns and use VMAC2H(U) instruction instead -of the 64bit MAC(U) instruction. -This fixes the next execute.exp failures: - arith-rand-ll.c -O2 execution test - arith-rand-ll.c -O3 execution test - pr78726.c -O2 execution test - pr78726.c -O3 execution test - -gcc/ -2021-06-09 Claudiu Zissulescu <claziss@synopsys.com> - - * config/arc/arc.md (maddhisi4): Use VMAC2H instruction. - (machi): New pattern. - (umaddhisi4): Use VMAC2HU instruction. - (umachi): New pattern. - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=4186b7e93be73f8d68dc0fcc00a4cc8cc83e99a8] - -Signed-off-by: Claudiu Zissulescu <claziss@synopsys.com> -(cherry picked from commit dd4778a59b4693777c732075021375e19eee6a76) -Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> ---- - gcc/config/arc/arc.md | 66 ++++++++++++++++++++++++++++++++------------------- - 1 file changed, 41 insertions(+), 25 deletions(-) - -diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md -index 91a838a38e4..2a7e087ff72 100644 ---- a/gcc/config/arc/arc.md -+++ b/gcc/config/arc/arc.md -@@ -6053,48 +6053,64 @@ core_3, archs4x, archs4xd, archs4xd_slow" - - ;; MAC and DMPY instructions - --; Use MAC instruction to emulate 16bit mac. -+; Use VMAC2H(U) instruction to emulate scalar 16bit mac. - (define_expand "maddhisi4" - [(match_operand:SI 0 "register_operand" "") - (match_operand:HI 1 "register_operand" "") - (match_operand:HI 2 "extend_operand" "") - (match_operand:SI 3 "register_operand" "")] -- "TARGET_PLUS_DMPY" -+ "TARGET_PLUS_MACD" - "{ -- rtx acc_reg = gen_rtx_REG (DImode, ACC_REG_FIRST); -- rtx tmp1 = gen_reg_rtx (SImode); -- rtx tmp2 = gen_reg_rtx (SImode); -- rtx accl = gen_lowpart (SImode, acc_reg); -- -- emit_move_insn (accl, operands[3]); -- emit_insn (gen_rtx_SET (tmp1, gen_rtx_SIGN_EXTEND (SImode, operands[1]))); -- emit_insn (gen_rtx_SET (tmp2, gen_rtx_SIGN_EXTEND (SImode, operands[2]))); -- emit_insn (gen_mac (tmp1, tmp2)); -- emit_move_insn (operands[0], accl); -+ rtx acc_reg = gen_rtx_REG (SImode, ACC_REG_FIRST); -+ -+ emit_move_insn (acc_reg, operands[3]); -+ emit_insn (gen_machi (operands[1], operands[2])); -+ emit_move_insn (operands[0], acc_reg); - DONE; - }") - --; The same for the unsigned variant, but using MACU instruction. -+(define_insn "machi" -+ [(set (reg:SI ARCV2_ACC) -+ (plus:SI -+ (mult:SI (sign_extend:SI (match_operand:HI 0 "register_operand" "%r")) -+ (sign_extend:SI (match_operand:HI 1 "register_operand" "r"))) -+ (reg:SI ARCV2_ACC)))] -+ "TARGET_PLUS_MACD" -+ "vmac2h\\t0,%0,%1" -+ [(set_attr "length" "4") -+ (set_attr "type" "multi") -+ (set_attr "predicable" "no") -+ (set_attr "cond" "nocond")]) -+ -+; The same for the unsigned variant, but using VMAC2HU instruction. - (define_expand "umaddhisi4" - [(match_operand:SI 0 "register_operand" "") - (match_operand:HI 1 "register_operand" "") -- (match_operand:HI 2 "extend_operand" "") -+ (match_operand:HI 2 "register_operand" "") - (match_operand:SI 3 "register_operand" "")] -- "TARGET_PLUS_DMPY" -+ "TARGET_PLUS_MACD" - "{ -- rtx acc_reg = gen_rtx_REG (DImode, ACC_REG_FIRST); -- rtx tmp1 = gen_reg_rtx (SImode); -- rtx tmp2 = gen_reg_rtx (SImode); -- rtx accl = gen_lowpart (SImode, acc_reg); -- -- emit_move_insn (accl, operands[3]); -- emit_insn (gen_rtx_SET (tmp1, gen_rtx_ZERO_EXTEND (SImode, operands[1]))); -- emit_insn (gen_rtx_SET (tmp2, gen_rtx_ZERO_EXTEND (SImode, operands[2]))); -- emit_insn (gen_macu (tmp1, tmp2)); -- emit_move_insn (operands[0], accl); -+ rtx acc_reg = gen_rtx_REG (SImode, ACC_REG_FIRST); -+ -+ emit_move_insn (acc_reg, operands[3]); -+ emit_insn (gen_umachi (operands[1], operands[2])); -+ emit_move_insn (operands[0], acc_reg); - DONE; - }") - -+(define_insn "umachi" -+ [(set (reg:SI ARCV2_ACC) -+ (plus:SI -+ (mult:SI (zero_extend:SI (match_operand:HI 0 "register_operand" "%r")) -+ (zero_extend:SI (match_operand:HI 1 "register_operand" "r"))) -+ (reg:SI ARCV2_ACC)))] -+ "TARGET_PLUS_MACD" -+ "vmac2hu\\t0,%0,%1" -+ [(set_attr "length" "4") -+ (set_attr "type" "multi") -+ (set_attr "predicable" "no") -+ (set_attr "cond" "nocond")]) -+ - (define_expand "maddsidi4" - [(match_operand:DI 0 "register_operand" "") - (match_operand:SI 1 "register_operand" "") --- -2.16.2 - diff --git a/poky/meta/recipes-devtools/gcc/gcc/0040-arc-Update-doloop_end-patterns.patch b/poky/meta/recipes-devtools/gcc/gcc/0040-arc-Update-doloop_end-patterns.patch deleted file mode 100644 index 5f0bf8df8..000000000 --- a/poky/meta/recipes-devtools/gcc/gcc/0040-arc-Update-doloop_end-patterns.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 5a9b6a004f89fdd95b0470e1324dc4dee8c41d24 Mon Sep 17 00:00:00 2001 -From: Claudiu Zissulescu <claziss@synopsys.com> -Date: Wed, 9 Jun 2021 12:12:57 +0300 -Subject: [PATCH] arc: Update doloop_end patterns - -ARC processor can use LP instruction to implement zero overlay loops. -The current inplementation doesn't handle the unlikely situation when -the loop iterator is located in memory. Refurbish the loop_end insn -pattern into a define_insn_and_split pattern. - -gcc/ -2021-07-09 Claudiu Zissulescu <claziss@synopsys.com> - - * config/arc/arc.md (loop_end): Change it to - define_insn_and_split. - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=5a9b6a004f89fdd95b0470e1324dc4dee8c41d24] - -Signed-off-by: Claudiu Zissulescu <claziss@synopsys.com> -(cherry picked from commit 174e75a210753b68de0f2c398a13ace0f512e35b) -Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> ---- - gcc/config/arc/arc.md | 46 ++++++++++++++++++++-------------------------- - 1 file changed, 20 insertions(+), 26 deletions(-) - -diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md -index 2a7e087ff72..d704044c13f 100644 ---- a/gcc/config/arc/arc.md -+++ b/gcc/config/arc/arc.md -@@ -4986,7 +4986,7 @@ core_3, archs4x, archs4xd, archs4xd_slow" - (define_expand "doloop_end" - [(parallel [(set (pc) - (if_then_else -- (ne (match_operand 0 "" "") -+ (ne (match_operand 0 "nonimmediate_operand") - (const_int 1)) - (label_ref (match_operand 1 "" "")) - (pc))) -@@ -5012,44 +5012,38 @@ core_3, archs4x, archs4xd, archs4xd_slow" - - ;; if by any chance the lp_count is not used, then use an 'r' - ;; register, instead of going to memory. --(define_insn "loop_end" -- [(set (pc) -- (if_then_else (ne (match_operand:SI 2 "nonimmediate_operand" "0,m") -- (const_int 1)) -- (label_ref (match_operand 1 "" "")) -- (pc))) -- (set (match_operand:SI 0 "nonimmediate_operand" "=r,m") -- (plus (match_dup 2) (const_int -1))) -- (unspec [(const_int 0)] UNSPEC_ARC_LP) -- (clobber (match_scratch:SI 3 "=X,&r"))] -- "" -- "; ZOL_END, begins @%l1" -- [(set_attr "length" "0") -- (set_attr "predicable" "no") -- (set_attr "type" "loop_end")]) -- - ;; split pattern for the very slim chance when the loop register is - ;; memory. --(define_split -+(define_insn_and_split "loop_end" - [(set (pc) -- (if_then_else (ne (match_operand:SI 0 "memory_operand") -+ (if_then_else (ne (match_operand:SI 0 "nonimmediate_operand" "+r,!m") - (const_int 1)) -- (label_ref (match_operand 1 "")) -+ (label_ref (match_operand 1 "" "")) - (pc))) - (set (match_dup 0) (plus (match_dup 0) (const_int -1))) - (unspec [(const_int 0)] UNSPEC_ARC_LP) -- (clobber (match_scratch:SI 2))] -- "memory_operand (operands[0], SImode)" -+ (clobber (match_scratch:SI 2 "=X,&r"))] -+ "" -+ "@ -+ ; ZOL_END, begins @%l1 -+ #" -+ "reload_completed && memory_operand (operands[0], Pmode)" - [(set (match_dup 2) (match_dup 0)) -- (set (match_dup 2) (plus:SI (match_dup 2) (const_int -1))) -+ (parallel -+ [(set (reg:CC_ZN CC_REG) -+ (compare:CC_ZN (plus:SI (match_dup 2) (const_int -1)) -+ (const_int 0))) -+ (set (match_dup 2) (plus:SI (match_dup 2) (const_int -1)))]) - (set (match_dup 0) (match_dup 2)) -- (set (reg:CC CC_REG) (compare:CC (match_dup 2) (const_int 0))) - (set (pc) -- (if_then_else (ne (reg:CC CC_REG) -+ (if_then_else (ne (reg:CC_ZN CC_REG) - (const_int 0)) - (label_ref (match_dup 1)) - (pc)))] -- "") -+ "" -+ [(set_attr "length" "0,24") -+ (set_attr "predicable" "no") -+ (set_attr "type" "loop_end")]) - - (define_insn "loop_fail" - [(set (reg:SI LP_COUNT) --- -2.16.2 - diff --git a/poky/meta/recipes-devtools/gcc/gcc/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch b/poky/meta/recipes-devtools/gcc/gcc/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch new file mode 100644 index 000000000..c8dcd74b9 --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch @@ -0,0 +1,95 @@ +From 7cc2df084b7977653a9b59cbc34a9ad500ae619c Mon Sep 17 00:00:00 2001 +From: Richard Biener <rguenther@suse.de> +Date: Tue, 20 Jul 2021 11:00:33 +0200 +Subject: [PATCH] debug/101473 - apply debug prefix maps before checksumming DIEs + +The following makes sure to apply the debug prefix maps to filenames +before checksumming DIEs to create the global symbol for the CU DIE +used by LTO to link the late debug to the early debug. This avoids +binary differences (in said symbol) when compiling with toolchains +installed under a different path and that compensated with appropriate +-fdebug-prefix-map options. + +The easiest and most scalable way is to record both the unmapped +and the remapped filename in the dwarf_file_data so the remapping +process takes place at a single point and only once (otherwise it +creates GC garbage at each point doing that). + +2021-07-20 Richard Biener <rguenther@suse.de> + + PR debug/101473 + * dwarf2out.h (dwarf_file_data): Add key member. + * dwarf2out.c (dwarf_file_hasher::equal): Compare key. + (dwarf_file_hasher::hash): Hash key. + (lookup_filename): Remap the filename and store it in the + filename member of dwarf_file_data when creating a new + dwarf_file_data. + (file_name_acquire): Do not remap the filename again. + (maybe_emit_file): Likewise. + +[YOCTO #14481] + +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=7cc2df084b7977653a9b59cbc34a9ad500ae619c] + +The upstream patch was modified to compensate for the definition of +"struct dwarf_file_data" being in dwarf2out.c rather than dwarf2out.h in +this version of gcc. + +Signed-off-by: Tony Battersby <tonyb@cybernetics.com> +--- +diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c +--- a/gcc/dwarf2out.c 2021-04-27 06:00:13.000000000 -0400 ++++ b/gcc/dwarf2out.c 2021-07-23 16:40:06.141886167 -0400 +@@ -1283,6 +1283,7 @@ dwarf2out_switch_text_section (void) + + /* Data about a single source file. */ + struct GTY((for_user)) dwarf_file_data { ++ const char * key; + const char * filename; + int emitted_number; + }; +@@ -12334,7 +12335,7 @@ file_name_acquire (dwarf_file_data **slo + + fi = fnad->files + fnad->used_files++; + +- f = remap_debug_filename (d->filename); ++ f = d->filename; + + /* Skip all leading "./". */ + while (f[0] == '.' && IS_DIR_SEPARATOR (f[1])) +@@ -27231,13 +27232,13 @@ dwarf2out_ignore_block (const_tree block + bool + dwarf_file_hasher::equal (dwarf_file_data *p1, const char *p2) + { +- return filename_cmp (p1->filename, p2) == 0; ++ return filename_cmp (p1->key, p2) == 0; + } + + hashval_t + dwarf_file_hasher::hash (dwarf_file_data *p) + { +- return htab_hash_string (p->filename); ++ return htab_hash_string (p->key); + } + + /* Lookup FILE_NAME (in the list of filenames that we know about here in +@@ -27267,7 +27268,8 @@ lookup_filename (const char *file_name) + return *slot; + + created = ggc_alloc<dwarf_file_data> (); +- created->filename = file_name; ++ created->key = file_name; ++ created->filename = remap_debug_filename (file_name); + created->emitted_number = 0; + *slot = created; + return created; +@@ -27293,8 +27295,7 @@ maybe_emit_file (struct dwarf_file_data + if (output_asm_line_debug_info ()) + { + fprintf (asm_out_file, "\t.file %u ", fd->emitted_number); +- output_quoted_string (asm_out_file, +- remap_debug_filename (fd->filename)); ++ output_quoted_string (asm_out_file, fd->filename); + fputc ('\n', asm_out_file); + } + } diff --git a/poky/meta/recipes-devtools/gcc/gcc_11.1.bb b/poky/meta/recipes-devtools/gcc/gcc_11.2.bb index 7d9359058..255fe552b 100644 --- a/poky/meta/recipes-devtools/gcc/gcc_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/gcc_11.2.bb @@ -4,11 +4,11 @@ require gcc-target.inc # Building with thumb enabled on armv4t armv5t fails with # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -ARMFPARCHEXT_armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" -ARMFPARCHEXT_armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" -ARMFPARCHEXT_armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-devtools/gcc/libgcc-common.inc b/poky/meta/recipes-devtools/gcc/libgcc-common.inc index d959566c3..d48dc8b82 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/poky/meta/recipes-devtools/gcc/libgcc-common.inc @@ -44,16 +44,16 @@ do_install () { rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include } -do_install_append_libc-baremetal () { +do_install:append:libc-baremetal () { rmdir ${D}${base_libdir} } -do_install_append_libc-newlib () { +do_install:append:libc-newlib () { rmdir ${D}${base_libdir} } # No rpm package is actually created but -dev depends on it, avoid dnf error -RDEPENDS_${PN}-dev_libc-baremetal = "" -RDEPENDS_${PN}-dev_libc-newlib = "" +RDEPENDS:${PN}-dev:libc-baremetal = "" +RDEPENDS:${PN}-dev:libc-newlib = "" BBCLASSEXTEND = "nativesdk" @@ -98,9 +98,9 @@ fakeroot python do_multilib_install() { for ml in multilibs.split(): - tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml) + tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml) if not tune: - bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) + bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml) continue tune_parameters = get_tune_parameters(tune, d) diff --git a/poky/meta/recipes-devtools/gcc/libgcc-initial.inc b/poky/meta/recipes-devtools/gcc/libgcc-initial.inc index 06bf224f7..8251e3c28 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc-initial.inc +++ b/poky/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -42,17 +42,17 @@ inherit nopackages # We really only want this built by things that need it, not any recrdeptask deltask do_build -do_configure_prepend () { +do_configure:prepend () { install -d ${STAGING_INCDIR} touch ${STAGING_INCDIR}/limits.h sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile } -do_configure_append () { +do_configure:append () { sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile } -do_install_append () { +do_install:append () { ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a } diff --git a/poky/meta/recipes-devtools/gcc/libgcc-initial_11.1.bb b/poky/meta/recipes-devtools/gcc/libgcc-initial_11.2.bb index 0c698c26e..a259082b4 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc-initial_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgcc-initial_11.2.bb @@ -2,4 +2,4 @@ require recipes-devtools/gcc/gcc-${PV}.inc require libgcc-initial.inc # Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/poky/meta/recipes-devtools/gcc/libgcc.inc b/poky/meta/recipes-devtools/gcc/libgcc.inc index 6d48ec980..84a2d930d 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc.inc +++ b/poky/meta/recipes-devtools/gcc/libgcc.inc @@ -2,7 +2,7 @@ require libgcc-common.inc DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc" -do_install_append_class-target () { +do_install:append:class-target () { if [ "${TCLIBC}" != "glibc" ]; then case "${TARGET_OS}" in "linux-musl" | "linux-*spe") extra_target_os="linux";; @@ -32,12 +32,12 @@ PACKAGES = "\ # All libgcc source is marked with the exception. # -LICENSE_${PN} = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" +LICENSE:${PN} = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${base_libdir}/libgcc*.so \ ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ ${libdir}/${TARGET_SYS}/${BINV}* \ @@ -49,5 +49,5 @@ do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" -INSANE_SKIP_${PN}-dev = "staticdev" +INSANE_SKIP:${PN}-dev = "staticdev" diff --git a/poky/meta/recipes-devtools/gcc/libgcc_11.1.bb b/poky/meta/recipes-devtools/gcc/libgcc_11.2.bb index ea210a113..f88963b0a 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgcc_11.2.bb @@ -2,4 +2,4 @@ require recipes-devtools/gcc/gcc-${PV}.inc require libgcc.inc # Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/poky/meta/recipes-devtools/gcc/libgfortran.inc b/poky/meta/recipes-devtools/gcc/libgfortran.inc index 7543585e6..344ec5e21 100644 --- a/poky/meta/recipes-devtools/gcc/libgfortran.inc +++ b/poky/meta/recipes-devtools/gcc/libgfortran.inc @@ -54,12 +54,12 @@ PACKAGES = "\ libgfortran-staticdev \ " -LICENSE_${PN} = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" +LICENSE:${PN} = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" -FILES_${PN} = "${libdir}/libgfortran.so.*" -FILES_${PN}-dev = "\ +FILES:${PN} = "${libdir}/libgfortran.so.*" +FILES:${PN}-dev = "\ ${libdir}/libgfortran*.so \ ${libdir}/libgfortran.spec \ ${libdir}/libgfortran.la \ @@ -68,9 +68,9 @@ FILES_${PN}-dev = "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ \ " -FILES_${PN}-staticdev = "${libdir}/libgfortran.a" +FILES:${PN}-staticdev = "${libdir}/libgfortran.a" -INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" +INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev" do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" diff --git a/poky/meta/recipes-devtools/gcc/libgfortran_11.1.bb b/poky/meta/recipes-devtools/gcc/libgfortran_11.2.bb index 71dd8b4bd..71dd8b4bd 100644 --- a/poky/meta/recipes-devtools/gcc/libgfortran_11.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgfortran_11.2.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb-common.inc b/poky/meta/recipes-devtools/gdb/gdb-common.inc index a2a6364da..0fe7b4e5b 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-common.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-common.inc @@ -5,10 +5,10 @@ SECTION = "devel" DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" LTTNGUST = "lttng-ust" -LTTNGUST_arc = "" -LTTNGUST_aarch64 = "" -LTTNGUST_mipsarch = "" -LTTNGUST_sh4 = "" +LTTNGUST:arc = "" +LTTNGUST:aarch64 = "" +LTTNGUST:mipsarch = "" +LTTNGUST:sh4 = "" inherit autotools texinfo @@ -52,14 +52,14 @@ do_configure () { # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the # right bits installed by binutils. Same for bfd.info -- also from binutils. -do_install_append() { +do_install:append() { rm -rf ${D}${libdir} rm -rf ${D}${includedir} rm -rf ${D}${datadir}/locale rm -f ${D}${infodir}/bfd.info } -RRECOMMENDS_gdb_append_linux = " glibc-thread-db " -RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " -RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db " -RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS:gdb:append:linux = " glibc-thread-db " +RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db " +RRECOMMENDS:gdbserver:append:linux = " glibc-thread-db " +RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db " diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index edb05b6f1..670534fb5 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -21,7 +21,7 @@ PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk- SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" -do_configure_prepend() { +do_configure:prepend() { cat > ${WORKDIR}/python << EOF #! /bin/sh case "\$2" in @@ -37,7 +37,7 @@ EOF # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the # right bits installed by binutils. -do_install_append() { +do_install:append() { rm -rf ${D}${exec_prefix}/lib cross_canadian_bindirlinks } diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross.inc b/poky/meta/recipes-devtools/gdb/gdb-cross.inc index f8a113da8..6ba3eae6f 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-cross.inc @@ -10,7 +10,7 @@ PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native" -do_compile_prepend() { +do_compile:prepend() { export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" } diff --git a/poky/meta/recipes-devtools/gdb/gdb.inc b/poky/meta/recipes-devtools/gdb/gdb.inc index aa845b5c4..2b0ae1655 100644 --- a/poky/meta/recipes-devtools/gdb/gdb.inc +++ b/poky/meta/recipes-devtools/gdb/gdb.inc @@ -2,10 +2,10 @@ require gdb-common.inc inherit gettext -#LDFLAGS_append = " -s" -#export CFLAGS_append=" -L${STAGING_LIBDIR}" +#LDFLAGS:append = " -s" +#export CFLAGS:append=" -L${STAGING_LIBDIR}" # cross-canadian must not see this PACKAGES =+ "gdbserver" -FILES_gdbserver = "${bindir}/gdbserver" +FILES:gdbserver = "${bindir}/gdbserver" diff --git a/poky/meta/recipes-devtools/gdb/gdb_10.2.bb b/poky/meta/recipes-devtools/gdb/gdb_10.2.bb index d70757a15..e73e3a2c5 100644 --- a/poky/meta/recipes-devtools/gdb/gdb_10.2.bb +++ b/poky/meta/recipes-devtools/gdb/gdb_10.2.bb @@ -3,7 +3,7 @@ require gdb-${PV}.inc inherit python3-dir -EXTRA_OEMAKE_append_libc-musl = "\ +EXTRA_OEMAKE:append:libc-musl = "\ gt_cv_func_gnugettext1_libc=yes \ gt_cv_func_gnugettext2_libc=yes \ gl_cv_func_working_strerror=yes \ @@ -11,7 +11,7 @@ EXTRA_OEMAKE_append_libc-musl = "\ gl_cv_func_gettimeofday_clobber=no \ " -do_configure_prepend() { +do_configure:prepend() { if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then cat > ${WORKDIR}/python << EOF #!/bin/sh diff --git a/poky/meta/recipes-devtools/git/git.inc b/poky/meta/recipes-devtools/git/git.inc index 146983a91..9dd2cf454 100644 --- a/poky/meta/recipes-devtools/git/git.inc +++ b/poky/meta/recipes-devtools/git/git.inc @@ -5,7 +5,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" DEPENDS = "openssl curl zlib expat" -PROVIDES_append_class-native = " git-replacement-native" +PROVIDES:append:class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ @@ -26,16 +26,16 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ --without-iconv \ " -EXTRA_OECONF_append_class-nativesdk = " --with-gitconfig=/etc/gitconfig " +EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig " # Needs brokensep as this doesn't use automake inherit autotools-brokensep perlnative bash-completion EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" -EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" +EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" -do_compile_prepend () { +do_compile:prepend () { # Remove perl/perl.mak to fix the out-of-date perl.mak error # during rebuild rm -f perl/perl.mak @@ -79,24 +79,24 @@ perl_native_fixup () { REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" -do_install_append_class-target () { +do_install:append:class-target () { perl_native_fixup } -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}${bindir}/git \ GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_wrapper ${D}${bindir}/git \ GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} perl_native_fixup } -FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/" +FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" PERLTOOLS = " \ ${bindir}/git-cvsserver \ @@ -116,25 +116,25 @@ PERLTOOLS = " \ # Git tools requiring perl PACKAGES =+ "${PN}-perltools" -FILES_${PN}-perltools += " \ +FILES:${PN}-perltools += " \ ${PERLTOOLS} \ ${libdir}/perl \ ${datadir}/perl5 \ " -RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" +RDEPENDS:${PN}-perltools = "${PN} perl perl-module-file-path findutils" # git-tk package with gitk and git-gui PACKAGES =+ "${PN}-tk" #RDEPENDS_${PN}-tk = "${PN} tk tcl" #EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" -FILES_${PN}-tk = " \ +FILES:${PN}-tk = " \ ${bindir}/gitk \ ${datadir}/gitk \ " PACKAGES =+ "gitweb" -FILES_gitweb = "${datadir}/gitweb/" -RDEPENDS_gitweb = "perl" +FILES:gitweb = "${datadir}/gitweb/" +RDEPENDS:gitweb = "perl" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/glide/glide_0.13.3.bb b/poky/meta/recipes-devtools/glide/glide_0.13.3.bb index 6eb87df7c..e943dc176 100644 --- a/poky/meta/recipes-devtools/glide/glide_0.13.3.bb +++ b/poky/meta/recipes-devtools/glide/glide_0.13.3.bb @@ -14,15 +14,15 @@ inherit go # tool build to fail. export GO111MODULE = "off" -RDEPENDS_${PN}-dev += "bash" -RDEPENDS_${PN}-ptest += "bash" +RDEPENDS:${PN}-dev += "bash" +RDEPENDS:${PN}-ptest += "bash" BBCLASSEXTEND = "native nativesdk" # for x86 ends with textrel in ${PN} # http://errors.yoctoproject.org/Errors/Details/185631/ # ERROR: QA Issue: ELF binary '/work/i586-oe-linux/glide/0.13.1-r0/packages-split/glide/usr/bin/glide' has relocations in .text [textrel] -INSANE_SKIP_${PN} += "textrel" +INSANE_SKIP:${PN} += "textrel" # for aarch64 ends with textrel in ${PN}-ptest # http://errors.yoctoproject.org/Errors/Details/185633/ @@ -37,7 +37,7 @@ INSANE_SKIP_${PN} += "textrel" # ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/util/util.test' has relocations in .text # ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/action/action.test' has relocations in .text # ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/cache/cache.test' has relocations in .text [textrel] -INSANE_SKIP_${PN}-ptest += "textrel" +INSANE_SKIP:${PN}-ptest += "textrel" # fails to run task compile_ptest_base on mips -PTEST_ENABLED_mipsarch = "0" +PTEST_ENABLED:mipsarch = "0" diff --git a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 420363415..34b425031 100644 --- a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -3,14 +3,14 @@ DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a direc HOMEPAGE = "https://git.savannah.gnu.org/cgit/config.git" SECTION = "devel" LICENSE = "GPL-3.0-with-autoconf-exception" -LIC_FILES_CHKSUM = "file://config.guess;beginline=7;endline=27;md5=b75d42f59f706ea56d6a8e00216fca6a" +LIC_FILES_CHKSUM = "file://config.guess;beginline=9;endline=29;md5=b75d42f59f706ea56d6a8e00216fca6a" -DEPENDS_class-native = "hostperl-runtime-native" +DEPENDS:class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "4550d2f15b3a7ce2451c1f29500b9339430c877f" -PV = "20210620+git${SRCPV}" +SRCREV = "805517123cbfe33d17c989a18e78c5789fab0437" +PV = "20210722+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" @@ -36,6 +36,6 @@ do_install () { } PACKAGES = "${PN}" -FILES_${PN} = "${bindir} ${datadir}/gnu-config" +FILES:${PN} = "${bindir} ${datadir}/gnu-config" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/go/go-1.16.5.inc b/poky/meta/recipes-devtools/go/go-1.16.5.inc index bd928e44f..545aa0c82 100644 --- a/poky/meta/recipes-devtools/go/go-1.16.5.inc +++ b/poky/meta/recipes-devtools/go/go-1.16.5.inc @@ -2,7 +2,7 @@ require go-common.inc GO_BASEVERSION = "1.16" PV = "1.16.5" -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" diff --git a/poky/meta/recipes-devtools/go/go-common.inc b/poky/meta/recipes-devtools/go/go-common.inc index 39a681a71..dfccebdb8 100644 --- a/poky/meta/recipes-devtools/go/go-common.inc +++ b/poky/meta/recipes-devtools/go/go-common.inc @@ -37,6 +37,6 @@ export GO386 ?= "${TARGET_GO386}" export GOMIPS ?= "${TARGET_GOMIPS}" export GOROOT_FINAL ?= "${libdir}/go" -do_compile_prepend() { +do_compile:prepend() { BUILD_CC=${BUILD_CC} } diff --git a/poky/meta/recipes-devtools/go/go-native_1.16.5.bb b/poky/meta/recipes-devtools/go/go-native_1.16.5.bb index f14892cdb..ffe4ef352 100644 --- a/poky/meta/recipes-devtools/go/go-native_1.16.5.bb +++ b/poky/meta/recipes-devtools/go/go-native_1.16.5.bb @@ -5,7 +5,7 @@ require go-${PV}.inc inherit native -SRC_URI_append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" +SRC_URI:append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" export GOOS = "${BUILD_GOOS}" diff --git a/poky/meta/recipes-devtools/go/go-runtime.inc b/poky/meta/recipes-devtools/go/go-runtime.inc index 21179a83a..617e6b541 100644 --- a/poky/meta/recipes-devtools/go/go-runtime.inc +++ b/poky/meta/recipes-devtools/go/go-runtime.inc @@ -1,5 +1,5 @@ DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" -DEPENDS_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" +DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" export CGO_CFLAGS = "${CFLAGS}" @@ -15,7 +15,7 @@ do_configure() { : } -do_configure_libc-musl() { +do_configure:libc-musl() { rm -f ${S}/src/runtime/race/*.syso } @@ -55,9 +55,9 @@ do_install() { } -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*${SOLIBSDEV}" -FILES_${PN}-dev = "${libdir}/go/src ${libdir}/go/pkg/include \ +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} = "${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*${SOLIBSDEV}" +FILES:${PN}-dev = "${libdir}/go/src ${libdir}/go/pkg/include \ ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*.shlibname \ ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*.shlibname \ ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*.shlibname \ @@ -73,12 +73,12 @@ FILES_${PN}-dev = "${libdir}/go/src ${libdir}/go/pkg/include \ ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*/*/*/*.a \ ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*/*/*/*/*.a \ " -FILES_${PN}-staticdev = "${libdir}/go/pkg/${TARGET_GOTUPLE}" +FILES:${PN}-staticdev = "${libdir}/go/pkg/${TARGET_GOTUPLE}" # Go sources include some scripts and pre-built binaries for # multiple architectures. The static .a files for dynamically-linked # runtime are also required in -dev. -INSANE_SKIP_${PN}-dev = "staticdev file-rdeps arch" +INSANE_SKIP:${PN}-dev = "staticdev file-rdeps arch" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/poky/meta/recipes-devtools/go/go-target.inc b/poky/meta/recipes-devtools/go/go-target.inc index 8e4424703..47b4411d5 100644 --- a/poky/meta/recipes-devtools/go/go-target.inc +++ b/poky/meta/recipes-devtools/go/go-target.inc @@ -1,12 +1,12 @@ DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" -DEPENDS_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" +DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" export GOCACHE = "${B}/.cache" GO_LDFLAGS = "" -GO_LDFLAGS_class-nativesdk = "-linkmode external" +GO_LDFLAGS:class-nativesdk = "-linkmode external" export GO_LDFLAGS -CC_append_class-nativesdk = " ${SECURITY_NOPIE_CFLAGS}" +CC:append:class-nativesdk = " ${SECURITY_NOPIE_CFLAGS}" do_configure[noexec] = "1" @@ -38,8 +38,8 @@ do_install() { } PACKAGES = "${PN} ${PN}-dev" -FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" -RDEPENDS_${PN} = "go-runtime" -INSANE_SKIP_${PN} = "ldflags" +FILES:${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" +RDEPENDS:${PN} = "go-runtime" +INSANE_SKIP:${PN} = "ldflags" BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-devtools/go/go_1.16.5.bb b/poky/meta/recipes-devtools/go/go_1.16.5.bb index 4e9e0ebec..34dc89bb0 100644 --- a/poky/meta/recipes-devtools/go/go_1.16.5.bb +++ b/poky/meta/recipes-devtools/go/go_1.16.5.bb @@ -12,6 +12,6 @@ export CXX_FOR_TARGET = "g++" # variants. python() { if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): - d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") + d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") } diff --git a/poky/meta/recipes-devtools/help2man/help2man_1.48.3.bb b/poky/meta/recipes-devtools/help2man/help2man_1.48.3.bb index a612c0896..d24e6c446 100644 --- a/poky/meta/recipes-devtools/help2man/help2man_1.48.3.bb +++ b/poky/meta/recipes-devtools/help2man/help2man_1.48.3.bb @@ -16,7 +16,7 @@ EXTRA_AUTORECONF += "--exclude=aclocal" EXTRA_OECONF = "--disable-nls" -do_install_append () { +do_install:append () { # Make sure we use /usr/bin/env perl sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man } diff --git a/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.2.bb b/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.3.bb index 9842d1f13..51e4e5d8e 100644 --- a/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.2.bb +++ b/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.3.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "7de18ed890e111fa54ab7ea896804d5faa4d1f0462a258aad9fbb7a8cc6b60cc" +SRC_URI[sha256sum] = "eec464e42301d93586cbeca3845ed61bff40f560670e5b35baec57301d438148" inherit update-alternatives @@ -22,20 +22,20 @@ do_install() { } PACKAGES =+ "${PN}-misc" -FILES_${PN}-misc = "${sbindir}/i2c-stub-from-dump \ +FILES:${PN}-misc = "${sbindir}/i2c-stub-from-dump \ ${bindir}/ddcmon \ ${bindir}/decode-edid \ ${bindir}/decode-dimms \ ${bindir}/decode-vaio \ " -RDEPENDS_${PN}-misc = "${PN} perl perl-module-posix \ +RDEPENDS:${PN}-misc = "${PN} perl perl-module-posix \ perl-module-constant perl-module-file-basename \ perl-module-fcntl perl-module-strict perl-module-vars \ perl-module-carp \ " ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "i2cdetect i2cdump i2cget i2cset i2ctransfer" +ALTERNATIVE:${PN} = "i2cdetect i2cdump i2cget i2cset i2ctransfer" ALTERNATIVE_LINK_NAME[i2cdetect] = "${sbindir}/i2cdetect" ALTERNATIVE_LINK_NAME[i2cdump] = "${sbindir}/i2cdump" ALTERNATIVE_LINK_NAME[i2cget] = "${sbindir}/i2cget" diff --git a/poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb index 61b8487c7..27014226b 100644 --- a/poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb +++ b/poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb @@ -36,4 +36,4 @@ do_install() { BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}_class-nativesdk = "patchelf" +RDEPENDS:${PN}:class-nativesdk = "patchelf" diff --git a/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb b/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb index ce4d73caf..034a0047d 100644 --- a/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb +++ b/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb @@ -34,6 +34,6 @@ do_install() { } PACKAGES = "${PN}" -FILES_${PN} = "${SDKPATHNATIVE}" -RDEPENDS_${PN} += "nativesdk-icecc-create-env" +FILES:${PN} = "${SDKPATHNATIVE}" +RDEPENDS:${PN} += "nativesdk-icecc-create-env" diff --git a/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb index 592dbb92e..77be30758 100644 --- a/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb +++ b/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb @@ -17,23 +17,23 @@ SRC_URI[sha256sum] = "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334 UPSTREAM_CHECK_URI = "https://launchpad.net/intltool/trunk/" DEPENDS = "libxml-parser-perl-native" -RDEPENDS_${PN} = "gettext-dev libxml-parser-perl" -DEPENDS_class-native = "libxml-parser-perl-native gettext-native" +RDEPENDS:${PN} = "gettext-dev libxml-parser-perl" +DEPENDS:class-native = "libxml-parser-perl-native gettext-native" inherit autotools pkgconfig perlnative export PERL = "${bindir}/env perl" -PERL_class-native = "/usr/bin/env nativeperl" -PERL_class-nativesdk = "/usr/bin/env perl" +PERL:class-native = "/usr/bin/env nativeperl" +PERL:class-nativesdk = "/usr/bin/env perl" # gettext is assumed to exist on the host -RDEPENDS_${PN}_class-native = "libxml-parser-perl-native" -RRECOMMENDS_${PN} = "perl-modules" -RRECOMMENDS_${PN}_class-native = "" +RDEPENDS:${PN}:class-native = "libxml-parser-perl-native" +RRECOMMENDS:${PN} = "perl-modules" +RRECOMMENDS:${PN}:class-native = "" -FILES_${PN}-dev = "" -FILES_${PN} += "${datadir}/aclocal" +FILES:${PN}-dev = "" +FILES:${PN} += "${datadir}/aclocal" -INSANE_SKIP_${PN} += "dev-deps" +INSANE_SKIP:${PN} += "dev-deps" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/jquery/jquery_3.6.0.bb b/poky/meta/recipes-devtools/jquery/jquery_3.6.0.bb index 03792730f..33b177d1d 100644 --- a/poky/meta/recipes-devtools/jquery/jquery_3.6.0.bb +++ b/poky/meta/recipes-devtools/jquery/jquery_3.6.0.bb @@ -34,6 +34,6 @@ do_install() { } PACKAGES = "${PN}" -FILES_${PN} = "${datadir}" +FILES:${PN} = "${datadir}" BBCLASSEXTEND += "native nativesdk" diff --git a/poky/meta/recipes-devtools/json-c/json-c_0.15.bb b/poky/meta/recipes-devtools/json-c/json-c_0.15.bb index 2968590dd..863463ca5 100644 --- a/poky/meta/recipes-devtools/json-c/json-c_0.15.bb +++ b/poky/meta/recipes-devtools/json-c/json-c_0.15.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f023 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+" -RPROVIDES_${PN} = "libjson" +RPROVIDES:${PN} = "libjson" inherit cmake diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb index 6ffeb945b..282c28e2c 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb @@ -30,8 +30,8 @@ EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DWITH_ZCHUNK=OFF \ -DWITH_HTML=OFF \ " -EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" -EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" +EXTRA_OECMAKE:append:class-native = " -DWITH_GIR=OFF" +EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" diff --git a/poky/meta/recipes-devtools/libedit/libedit_20210522-3.1.bb b/poky/meta/recipes-devtools/libedit/libedit_20210522-3.1.bb index 43e6f2244..72392dd19 100644 --- a/poky/meta/recipes-devtools/libedit/libedit_20210522-3.1.bb +++ b/poky/meta/recipes-devtools/libedit/libedit_20210522-3.1.bb @@ -20,5 +20,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN}-doc = "history.3" +ALTERNATIVE:${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" diff --git a/poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc index e9225e140..c1cbceb51 100644 --- a/poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc +++ b/poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc @@ -28,7 +28,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" -do_compile_prepend () { +do_compile:prepend () { # Sometimes this file doesn't get rebuilt, force the issue rm -f ${S}/build-aux/ltmain.sh make build-aux/ltmain.sh @@ -43,9 +43,9 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep" DEPENDS = "libtool-native" PACKAGES =+ "libltdl" -FILES_${PN} += "${datadir}/aclocal" +FILES:${PN} += "${datadir}/aclocal" -FILES_${PN}-dev_remove = "${datadir}/aclocal" -FILES_libltdl = "${libdir}/libltdl${SOLIBS}" +FILES:${PN}-dev:remove = "${datadir}/aclocal" +FILES:libltdl = "${libdir}/libltdl${SOLIBS}" export CONFIG_SHELL="/bin/bash" diff --git a/poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb index 02c6e152f..4a43867b3 100644 --- a/poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb +++ b/poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb @@ -8,7 +8,7 @@ datadir = "${STAGING_DIR_TARGET}${target_datadir}" inherit nopackages -do_configure_prepend () { +do_configure:prepend () { # Remove any existing libtool m4 since old stale versions would break # any upgrade rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 diff --git a/poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb index 4c5218ade..3b20ce3e6 100644 --- a/poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb +++ b/poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb @@ -8,7 +8,7 @@ inherit native EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" -do_configure_prepend () { +do_configure:prepend () { # Remove any existing libtool m4 since old stale versions would break # any upgrade rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 diff --git a/poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb index a5715faaa..95bbc875f 100644 --- a/poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb +++ b/poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb @@ -2,7 +2,7 @@ require libtool-${PV}.inc SRC_URI += "file://multilib.patch file://debian-no_hostname.patch" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" # # We want the results of libtool-cross preserved - don't stage anything ourselves. @@ -13,9 +13,9 @@ SYSROOT_DIRS_BLACKLIST += " \ ${datadir}/libtool/build-aux \ " -ACLOCALEXTRAPATH_class-target = "" +ACLOCALEXTRAPATH:class-target = "" -do_install_append () { +do_install:append () { sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ -e "s@${DEBUG_PREFIX_MAP}@@g" \ -e 's@${STAGING_DIR_HOST}@@g' \ diff --git a/poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb index 508eade32..e3ad6721f 100644 --- a/poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb +++ b/poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb @@ -8,9 +8,9 @@ SRC_URI += "file://fixinstall.patch" inherit nativesdk S = "${WORKDIR}/libtool-${PV}" -FILES_${PN} += "${datadir}/libtool/*" +FILES:${PN} += "${datadir}/libtool/*" -do_configure_prepend () { +do_configure:prepend () { # Remove any existing libtool m4 since old stale versions would break # any upgrade rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index de79adc41..416708065 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -10,16 +10,16 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" -RDEPENDS_${PN}_append_class-target = " ncurses-terminfo" +RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "12.0.0" +PV = "12.0.1" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" @@ -27,7 +27,7 @@ LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "fa0971b87fb2c9d14d1bba2551e61f02f18f329b" +SRCREV = "fed41342a82f5a3a9201819a82bf7a48313e296b" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ @@ -62,8 +62,8 @@ def get_llvm_host_arch(bb, d): # LLVM_TARGETS ?= "AMDGPU;${@get_llvm_host_arch(bb, d)}" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv4t = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv4t = "arm" EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_EXPENSIVE_CHECKS=OFF \ @@ -79,19 +79,19 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ -G Ninja" -EXTRA_OECMAKE_append_class-target = "\ +EXTRA_OECMAKE:append:class-target = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " -EXTRA_OECMAKE_append_class-nativesdk = "\ +EXTRA_OECMAKE:append:class-nativesdk = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " -do_configure_prepend() { +do_configure:prepend() { # Fix paths in llvm-config sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp @@ -99,7 +99,7 @@ do_configure_prepend() { } # patch out build host paths for reproducibility -do_compile_prepend_class-target() { +do_compile:prepend:class-target() { sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-config/BuildVariables.inc } @@ -107,7 +107,7 @@ do_compile() { ninja -v ${PARALLEL_MAKE} } -do_compile_class-native() { +do_compile:class-native() { ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen } @@ -142,7 +142,7 @@ do_install() { rm -rf ${D}${libdir}/${LLVM_DIR}/libLTO.so } -do_install_class-native() { +do_install:class-native() { install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} install -D -m 0755 ${B}/lib/libLLVM-${MAJOR_VERSION}.so ${D}${libdir}/libLLVM-${MAJOR_VERSION}.so @@ -150,39 +150,39 @@ do_install_class-native() { PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto" -RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liboptremarks" +RRECOMMENDS:${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liboptremarks" -FILES_${PN}-bugpointpasses = "\ +FILES:${PN}-bugpointpasses = "\ ${libdir}/${LLVM_DIR}/BugpointPasses.so \ " -FILES_${PN}-libllvm = "\ +FILES:${PN}-libllvm = "\ ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.so \ ${libdir}/libLLVM-${MAJOR_VERSION}.so \ " -FILES_${PN}-liblto += "\ +FILES:${PN}-liblto += "\ ${libdir}/${LLVM_DIR}/libLTO.so.* \ " -FILES_${PN}-liboptremarks += "\ +FILES:${PN}-liboptremarks += "\ ${libdir}/${LLVM_DIR}/libRemarks.so.* \ " -FILES_${PN}-llvmhello = "\ +FILES:${PN}-llvmhello = "\ ${libdir}/${LLVM_DIR}/LLVMHello.so \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/${LLVM_DIR}/llvm-config \ ${libdir}/${LLVM_DIR}/libRemarks.so \ ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ " -FILES_${PN}-staticdev += "\ +FILES:${PN}-staticdev += "\ ${libdir}/${LLVM_DIR}/*.a \ " -INSANE_SKIP_${PN}-libllvm += "dev-so" +INSANE_SKIP:${PN}-libllvm += "dev-so" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/m4/m4-1.4.19.inc b/poky/meta/recipes-devtools/m4/m4-1.4.19.inc index 5f3d59226..0516e4955 100644 --- a/poky/meta/recipes-devtools/m4/m4-1.4.19.inc +++ b/poky/meta/recipes-devtools/m4/m4-1.4.19.inc @@ -9,7 +9,7 @@ inherit autotools texinfo ptest gettext SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ file://ac_config_links.patch \ " -SRC_URI_append_class-target = " file://run-ptest \ +SRC_URI:append:class-target = " file://run-ptest \ file://serial-tests-config.patch \ " @@ -51,11 +51,11 @@ do_install_ptest() { } -RDEPENDS_${PN}-ptest += "make coreutils diffutils" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest += "make coreutils diffutils" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ locale-base-fr-fr.iso-8859-1 \ " -INSANE_SKIP_${PN}-ptest += "ldflags" -INSANE_SKIP_${PN}-ptest += "rpaths" +INSANE_SKIP:${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "rpaths" diff --git a/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb index 5910f4bc7..79746260d 100644 --- a/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb +++ b/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb @@ -8,7 +8,7 @@ SRC_URI = "file://makedevs.c \ S = "${WORKDIR}" -FILES_${PN}_append_class-nativesdk = " ${datadir}" +FILES:${PN}:append:class-nativesdk = " ${datadir}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c @@ -19,7 +19,7 @@ do_install() { install -m 0755 ${S}/makedevs ${D}${base_sbindir}/makedevs } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { install -d ${D}${datadir} install -m 644 ${COREBASE}/meta/files/device_table-minimal.txt ${D}${datadir}/ } diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 7ddfccf2d..f1746d209 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -24,11 +24,11 @@ UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar" inherit setuptools3 -RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" +RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources" -FILES_${PN} += "${datadir}/polkit-1" +FILES:${PN} += "${datadir}/polkit-1" -do_install_append () { +do_install:append () { # As per the same issue in the python recipe itself: # Unfortunately the following pyc files are non-deterministc due to 'frozenset' # being written without strict ordering, even with PYTHONHASHSEED = 0 diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb index 74e1a7104..0e76cc78f 100644 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb +++ b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb @@ -13,7 +13,7 @@ SRC_URI += "file://meson-setup.py \ # 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() { +do_install:append() { install -d ${D}${datadir}/meson cat >${D}${datadir}/meson/meson.cross.template <<EOF [binaries] @@ -47,10 +47,10 @@ EOF install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson } -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ nativesdk-ninja \ nativesdk-python3 \ nativesdk-python3-setuptools \ " -FILES_${PN} += "${datadir}/meson ${SDKPATHNATIVE}" +FILES:${PN} += "${datadir}/meson ${SDKPATHNATIVE}" diff --git a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb index bdd0bf7f1..661db4665 100644 --- a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -14,9 +14,9 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" -CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" -CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -CFLAGS_append_mipsarchn32 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:mipsarchn32 = " -D__SANE_USERSPACE_TYPES__" do_install() { install -d ${D}${bindir} diff --git a/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb index 105a68dad..057ae806a 100644 --- a/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -9,19 +9,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ inherit autotools pkgconfig update-alternatives DEPENDS = "zlib e2fsprogs util-linux" -RDEPENDS_mtd-utils-tests += "bash" +RDEPENDS:mtd-utils-tests += "bash" -PV = "2.1.2" +PV = "2.1.3" -SRCREV = "7b986779342021bda87c04da3bf729718736d8ab" +SRCREV = "42ea7cd48d2b3c306d59bb6c530d79f8c25bf9f5" SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://add-exclusion-to-mkfs-jffs2-git-2.patch \ " S = "${WORKDIR}/git" -EXTRA_OECONF += "--enable-install-tests" - # xattr support creates an additional compile-time dependency on acl because # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr # regardless whether acl is enabled or disabled in the distro should be okay. @@ -33,15 +31,15 @@ PACKAGECONFIG[jffs] = "--with-jffs,--without-jffs" PACKAGECONFIG[ubifs] = "--with-ubifs,--without-ubifs" PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" -CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" +CPPFLAGS:append:riscv64 = " -pthread -D_REENTRANT" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" # Use higher priority than corresponding BusyBox-provided applets ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "flashcp flash_eraseall flash_lock flash_unlock nanddump nandwrite" -ALTERNATIVE_${PN}-ubifs = "ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol" +ALTERNATIVE:${PN} = "flashcp flash_eraseall flash_lock flash_unlock nanddump nandwrite" +ALTERNATIVE:${PN}-ubifs = "ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol" ALTERNATIVE_LINK_NAME[nandwrite] = "${sbindir}/nandwrite" ALTERNATIVE_LINK_NAME[nanddump] = "${sbindir}/nanddump" @@ -65,10 +63,10 @@ PACKAGES =+ "mtd-utils-misc mtd-utils-tests" PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "jffs", "mtd-utils-jffs2", "", d)}" PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "ubifs", "mtd-utils-ubifs", "", d)}" -FILES_mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/jffs2reader ${sbindir}/sumtool" -FILES_mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*" -FILES_mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image" -FILES_mtd-utils-tests = "${libexecdir}/mtd-utils/*" +FILES:mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/jffs2reader ${sbindir}/sumtool" +FILES:mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*" +FILES:mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image" +FILES:mtd-utils-tests = "${libexecdir}/mtd-utils/*" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 81d76d060..c78f73d25 100644 --- a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,4 +1,4 @@ -From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 +From bd2ec723326b6d57350da73b444dd43e923011e8 Mon Sep 17 00:00:00 2001 From: Ed Bartosh <ed.bartosh@linux.intel.com> Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs. @@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index bb13682..9186c77 100644 +index 173eae0..0654cc1 100644 --- a/config.c +++ b/config.c @@ -836,14 +836,6 @@ void read_config(void) diff --git a/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch deleted file mode 100644 index 9cb3e39f5..000000000 --- a/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable building with X11 support. - -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in ---- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700 -+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800 -@@ -146,7 +146,7 @@ - CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) - LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ - ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) --X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS) -+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS) - X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) - - all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5 diff --git a/poky/meta/recipes-devtools/mtools/mtools_4.0.32.bb b/poky/meta/recipes-devtools/mtools/mtools_4.0.34.bb index 501875037..e64015c13 100644 --- a/poky/meta/recipes-devtools/mtools/mtools_4.0.32.bb +++ b/poky/meta/recipes-devtools/mtools/mtools_4.0.34.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS += "virtual/libiconv" -RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850" -RRECOMMENDS_${PN}_libc-glibc = "\ +RDEPENDS:${PN}:libc-glibc = "glibc-gconv-ibm850" +RRECOMMENDS:${PN}:libc-glibc = "\ glibc-gconv-ibm437 \ glibc-gconv-ibm737 \ glibc-gconv-ibm775 \ @@ -24,15 +24,14 @@ RRECOMMENDS_${PN}_libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" +SRC_URI[sha256sum] = "ada543eb1b0ffe5440d4ee42634309ea1e286d7ebb80c99ba50db5cb2c360cab" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \ - file://no-x11.gplv3.patch \ file://clang_UNUSED.patch \ " -SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" +SRC_URI:append:class-native = " file://disable-hardcoded-configs.patch" inherit autotools texinfo @@ -43,7 +42,7 @@ BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG ??= "" PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd" -do_install_prepend () { +do_install:prepend () { # Create bindir to fix parallel installation issues mkdir -p ${D}/${bindir} mkdir -p ${D}/${datadir} diff --git a/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb b/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb index 43088baf7..edc17aeeb 100644 --- a/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb +++ b/poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \ SRC_URI[sha256sum] = "3c4b8339e5ab54b1bcb2316101f8985a5da50a3f9e504d43fa6f35668bee2fd0" -EXTRA_AUTORECONF_append = " -I autoconf/m4" +EXTRA_AUTORECONF:append = " -I autoconf/m4" inherit autotools-brokensep diff --git a/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb index 2a39b2d21..c908bcb73 100644 --- a/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb +++ b/poky/meta/recipes-devtools/ninja/ninja_1.10.2.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" do_configure[noexec] = "1" -do_compile_class-native() { +do_compile:class-native() { python3 ./configure.py --bootstrap } diff --git a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.5.bb b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.5.bb index 93d291110..a2bcc7f66 100644 --- a/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.5.bb +++ b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.5.bb @@ -1,5 +1,5 @@ SUMMARY = "Additional utilities for the opkg package manager" -SUMMARY_update-alternatives-opkg = "Utility for managing the alternatives system" +SUMMARY:update-alternatives-opkg = "Utility for managing the alternatives system" SECTION = "base" HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" LICENSE = "GPLv2+" @@ -17,13 +17,13 @@ SRC_URI[sha256sum] = "528635e674addea5c2b3a3268404ad04a952c4f410d17c3d754f5dd552 TARGET_CC_ARCH += "${LDFLAGS}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" inherit perlnative # For native builds we use the host Python PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" -PYTHONRDEPS_class-native = "" +PYTHONRDEPS:class-native = "" PACKAGECONFIG = "python update-alternatives" PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" @@ -36,7 +36,7 @@ do_install() { fi } -do_install_append_class-target() { +do_install:append:class-target() { if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm fi @@ -48,15 +48,15 @@ do_install_append_class-target() { # These are empty and will pull python3-dev into images where it wouldn't # have been otherwise, so don't generate them. -PACKAGES_remove = "${PN}-dev ${PN}-staticdev" +PACKAGES:remove = "${PN}-dev ${PN}-staticdev" PACKAGES =+ "update-alternatives-opkg" -FILES_update-alternatives-opkg = "${bindir}/update-alternatives" -RPROVIDES_update-alternatives-opkg = "update-alternatives update-alternatives-cworth" -RREPLACES_update-alternatives-opkg = "update-alternatives-cworth" -RCONFLICTS_update-alternatives-opkg = "update-alternatives-cworth" +FILES:update-alternatives-opkg = "${bindir}/update-alternatives" +RPROVIDES:update-alternatives-opkg = "update-alternatives update-alternatives-cworth" +RREPLACES:update-alternatives-opkg = "update-alternatives-cworth" +RCONFLICTS:update-alternatives-opkg = "update-alternatives-cworth" -pkg_postrm_update-alternatives-opkg() { +pkg_postrm:update-alternatives-opkg() { rm -rf $D${nonarch_libdir}/opkg/alternatives rmdir $D${nonarch_libdir}/opkg || true } diff --git a/poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb index 0c2dbc9e3..dc17de2e8 100644 --- a/poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb +++ b/poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb @@ -26,10 +26,10 @@ do_install () { install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/ } -FILES_${PN} = "${sysconfdir}/opkg/ " +FILES:${PN} = "${sysconfdir}/opkg/ " -CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf" +CONFFILES:${PN} += "${sysconfdir}/opkg/arch.conf" -RREPLACES_${PN} = "opkg-config-base" -RCONFLICTS_${PN} = "opkg-config-base" -RPROVIDES_${PN} = "opkg-config-base" +RREPLACES:${PN} = "opkg-config-base" +RCONFLICTS:${PN} = "opkg-config-base" +RPROVIDES:${PN} = "opkg-config-base" diff --git a/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb index 07e240254..84aeb9806 100644 --- a/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb +++ b/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 # Distro-specific keys can be added to this package in two ways: # # 1) In a .bbappend, add .gpg and/or .asc files to SRC_URI and install them to -# ${D}${datadir}/opkg/keyrings/ in a do_install_append function. These +# ${D}${datadir}/opkg/keyrings/ in a do_install:append function. These # files should not be named 'key-$name.gpg' to ensure they don't conflict # with keys exported as per (2). # @@ -30,12 +30,12 @@ do_install () { done } -FILES_${PN} = "${datadir}/opkg/keyrings" +FILES:${PN} = "${datadir}/opkg/keyrings" # We need 'opkg-key' to run the postinst script -RDEPENDS_${PN} = "opkg" +RDEPENDS:${PN} = "opkg" -pkg_postinst_ontarget_${PN} () { +pkg_postinst_ontarget:${PN} () { if test -x ${bindir}/opkg-key then ${bindir}/opkg-key populate diff --git a/poky/meta/recipes-devtools/opkg/opkg_0.4.5.bb b/poky/meta/recipes-devtools/opkg/opkg_0.4.5.bb index 56d6211ae..ef18ccf63 100644 --- a/poky/meta/recipes-devtools/opkg/opkg_0.4.5.bb +++ b/poky/meta/recipes-devtools/opkg/opkg_0.4.5.bb @@ -1,5 +1,5 @@ SUMMARY = "Open Package Manager" -SUMMARY_libopkg = "Open Package Manager library" +SUMMARY:libopkg = "Open Package Manager library" SECTION = "base" HOMEPAGE = "http://code.google.com/p/opkg/" DESCRIPTION = "Opkg is a lightweight package management system based on Ipkg." @@ -44,9 +44,9 @@ PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" EXTRA_OECONF += " --disable-pathfinder" -EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" +EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/opkg install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf @@ -60,7 +60,7 @@ do_install_ptest () { sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile } -WARN_QA_append += "openssl-deprecation" +WARN_QA:append += "openssl-deprecation" QAPKGTEST[openssl-deprecation] = "package_qa_check_openssl_deprecation" def package_qa_check_openssl_deprecation (package, d, messages): sane = True @@ -73,16 +73,16 @@ def package_qa_check_openssl_deprecation (package, d, messages): return sane -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}-ptest += "make binutils python3-core python3-compression" -RREPLACES_${PN} = "opkg-nogpg opkg-collateral" -RCONFLICTS_${PN} = "opkg-collateral" -RPROVIDES_${PN} = "opkg-collateral" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-nativesdk = "" +RDEPENDS:${PN}-ptest += "make binutils python3-core python3-compression" +RREPLACES:${PN} = "opkg-nogpg opkg-collateral" +RCONFLICTS:${PN} = "opkg-collateral" +RPROVIDES:${PN} = "opkg-collateral" -FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" +FILES:libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" BBCLASSEXTEND = "native nativesdk" -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" +CONFFILES:${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/poky/meta/recipes-devtools/orc/orc_0.4.32.bb b/poky/meta/recipes-devtools/orc/orc_0.4.32.bb index 0b63716f9..829255f11 100644 --- a/poky/meta/recipes-devtools/orc/orc_0.4.32.bb +++ b/poky/meta/recipes-devtools/orc/orc_0.4.32.bb @@ -17,14 +17,14 @@ BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "orc-examples" PACKAGES_DYNAMIC += "^liborc-.*" -FILES_orc-examples = "${libdir}/orc/*" -FILES_${PN} = "${bindir}/*" +FILES:orc-examples = "${libdir}/orc/*" +FILES:${PN} = "${bindir}/*" -python populate_packages_prepend () { +python populate_packages:prepend () { libdir = d.expand('${libdir}') do_split_packages(d, libdir, r'^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) } -do_compile_prepend_class-native () { +do_compile:prepend:class-native () { sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c } diff --git a/poky/meta/recipes-devtools/patch/patch.inc b/poky/meta/recipes-devtools/patch/patch.inc index cbfb8cfcf..a12d426b2 100644 --- a/poky/meta/recipes-devtools/patch/patch.inc +++ b/poky/meta/recipes-devtools/patch/patch.inc @@ -10,5 +10,5 @@ S = "${WORKDIR}/patch-${PV}" inherit autotools update-alternatives -ALTERNATIVE_${PN} = "patch" +ALTERNATIVE:${PN} = "patch" ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb index 1997af0c2..b4f986e33 100644 --- a/poky/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -23,6 +23,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," -PROVIDES_append_class-native = " patch-replacement-native" +PROVIDES:append:class-native = " patch-replacement-native" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb b/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb index b19692b2f..2759ef8a5 100644 --- a/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +++ b/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb @@ -31,7 +31,7 @@ do_configure () { do_compile () { } -do_install_class-native() { +do_install:class-native() { mkdir -p ${D}/${datadir}/perl-cross/ cp -rf ${S}/* ${D}/${datadir}/perl-cross/ } diff --git a/poky/meta/recipes-devtools/perl/files/perl-rdepends.txt b/poky/meta/recipes-devtools/perl/files/perl-rdepends.txt index f20fc44b5..dd23dc222 100644 --- a/poky/meta/recipes-devtools/perl/files/perl-rdepends.txt +++ b/poky/meta/recipes-devtools/perl/files/perl-rdepends.txt @@ -1,2025 +1,2025 @@ # Some additional dependencies that the above doesn't manage to figure out -RDEPENDS_perl-module-file-spec += "perl-module-file-spec-unix" -RDEPENDS_perl-module-math-bigint += "perl-module-math-bigint-calc" -RDEPENDS_perl-module-thread-queue += "perl-module-attributes" -RDEPENDS_perl-module-overload += "perl-module-overloading" +RDEPENDS:perl-module-file-spec += "perl-module-file-spec-unix" +RDEPENDS:perl-module-math-bigint += "perl-module-math-bigint-calc" +RDEPENDS:perl-module-thread-queue += "perl-module-attributes" +RDEPENDS:perl-module-overload += "perl-module-overloading" # Generated depends list beyond this line -RDEPENDS_perl-module-anydbm-file += "perl-module-strict" -RDEPENDS_perl-module-anydbm-file += "perl-module-warnings" -RDEPENDS_perl-module-app-cpan += "perl-module-config" -RDEPENDS_perl-module-app-cpan += "perl-module-constant" -RDEPENDS_perl-module-app-cpan += "perl-module-cpan" -RDEPENDS_perl-module-app-cpan += "perl-module-cwd" -RDEPENDS_perl-module-app-cpan += "perl-module-data-dumper" -RDEPENDS_perl-module-app-cpan += "perl-module-file-basename" -RDEPENDS_perl-module-app-cpan += "perl-module-file-find" -RDEPENDS_perl-module-app-cpan += "perl-module-getopt-std" -RDEPENDS_perl-module-app-cpan += "perl-module-if" -RDEPENDS_perl-module-app-cpan += "perl-module-net-ping" -RDEPENDS_perl-module-app-cpan += "perl-module-strict" -RDEPENDS_perl-module-app-cpan += "perl-module-user-pwent" -RDEPENDS_perl-module-app-cpan += "perl-module-vars" -RDEPENDS_perl-module-app-cpan += "perl-module-warnings" -RDEPENDS_perl-module-app-prove += "perl-module-app-prove-state" -RDEPENDS_perl-module-app-prove += "perl-module-base" -RDEPENDS_perl-module-app-prove += "perl-module-constant" -RDEPENDS_perl-module-app-prove += "perl-module-getopt-long" -RDEPENDS_perl-module-app-prove += "perl-module-strict" -RDEPENDS_perl-module-app-prove += "perl-module-tap-harness" -RDEPENDS_perl-module-app-prove += "perl-module-tap-harness-env" -RDEPENDS_perl-module-app-prove += "perl-module-text-parsewords" -RDEPENDS_perl-module-app-prove += "perl-module-warnings" -RDEPENDS_perl-module-app-prove-state += "perl-module-app-prove-state-result" -RDEPENDS_perl-module-app-prove-state += "perl-module-base" -RDEPENDS_perl-module-app-prove-state += "perl-module-constant" -RDEPENDS_perl-module-app-prove-state += "perl-module-file-find" -RDEPENDS_perl-module-app-prove-state += "perl-module-strict" -RDEPENDS_perl-module-app-prove-state += "perl-module-tap-parser-yamlish-reader" -RDEPENDS_perl-module-app-prove-state += "perl-module-tap-parser-yamlish-writer" -RDEPENDS_perl-module-app-prove-state += "perl-module-warnings" -RDEPENDS_perl-module-app-prove-state-result += "perl-module-app-prove-state-result-test" -RDEPENDS_perl-module-app-prove-state-result += "perl-module-constant" -RDEPENDS_perl-module-app-prove-state-result += "perl-module-strict" -RDEPENDS_perl-module-app-prove-state-result += "perl-module-warnings" -RDEPENDS_perl-module-app-prove-state-result-test += "perl-module-strict" -RDEPENDS_perl-module-app-prove-state-result-test += "perl-module-warnings" -RDEPENDS_perl-module-archive-tar-constant += "perl-module-constant" -RDEPENDS_perl-module-archive-tar-constant += "perl-module-exporter" -RDEPENDS_perl-module-archive-tar-constant += "perl-module-io-compress-bzip2" -RDEPENDS_perl-module-archive-tar-constant += "perl-module-strict" -RDEPENDS_perl-module-archive-tar-constant += "perl-module-time-local" -RDEPENDS_perl-module-archive-tar-constant += "perl-module-warnings" -RDEPENDS_perl-module-archive-tar-file += "perl-module-archive-tar" -RDEPENDS_perl-module-archive-tar-file += "perl-module-archive-tar-constant" -RDEPENDS_perl-module-archive-tar-file += "perl-module-file-basename" -RDEPENDS_perl-module-archive-tar-file += "perl-module-io-file" -RDEPENDS_perl-module-archive-tar-file += "perl-module-strict" -RDEPENDS_perl-module-archive-tar-file += "perl-module-vars" -RDEPENDS_perl-module-archive-tar += "perl-module-archive-tar-constant" -RDEPENDS_perl-module-archive-tar += "perl-module-archive-tar-file" -RDEPENDS_perl-module-archive-tar += "perl-module-config" -RDEPENDS_perl-module-archive-tar += "perl-module-cwd" -RDEPENDS_perl-module-archive-tar += "perl-module-exporter" -RDEPENDS_perl-module-archive-tar += "perl-module-file-path" -RDEPENDS_perl-module-archive-tar += "perl-module-io-file" -RDEPENDS_perl-module-archive-tar += "perl-module-io-zlib" -RDEPENDS_perl-module-archive-tar += "perl-module-strict" -RDEPENDS_perl-module-archive-tar += "perl-module-vars" -RDEPENDS_perl-module-attribute-handlers += "perl-module-strict" -RDEPENDS_perl-module-attribute-handlers += "perl-module-warnings" -RDEPENDS_perl-module-attributes += "perl-module-exporter" -RDEPENDS_perl-module-attributes += "perl-module-strict" -RDEPENDS_perl-module-attributes += "perl-module-warnings" -RDEPENDS_perl-module-attributes += "perl-module-xsloader" -RDEPENDS_perl-module-autodie-exception += "perl-module-constant" -RDEPENDS_perl-module-autodie-exception += "perl-module-fatal" -RDEPENDS_perl-module-autodie-exception += "perl-module-fcntl" -RDEPENDS_perl-module-autodie-exception += "perl-module-overload" -RDEPENDS_perl-module-autodie-exception += "perl-module-strict" -RDEPENDS_perl-module-autodie-exception += "perl-module-warnings" -RDEPENDS_perl-module-autodie-exception-system += "perl-module-parent" -RDEPENDS_perl-module-autodie-exception-system += "perl-module-strict" -RDEPENDS_perl-module-autodie-exception-system += "perl-module-warnings" -RDEPENDS_perl-module-autodie-hints += "perl-module-b" -RDEPENDS_perl-module-autodie-hints += "perl-module-constant" -RDEPENDS_perl-module-autodie-hints += "perl-module-strict" -RDEPENDS_perl-module-autodie-hints += "perl-module-warnings" -RDEPENDS_perl-module-autodie += "perl-module-constant" -RDEPENDS_perl-module-autodie += "perl-module-lib" -RDEPENDS_perl-module-autodie += "perl-module-parent" -RDEPENDS_perl-module-autodie += "perl-module-strict" -RDEPENDS_perl-module-autodie += "perl-module-warnings" -RDEPENDS_perl-module-autodie-scope-guard += "perl-module-strict" -RDEPENDS_perl-module-autodie-scope-guard += "perl-module-warnings" -RDEPENDS_perl-module-autodie-scope-guardstack += "perl-module-autodie-scope-guard" -RDEPENDS_perl-module-autodie-scope-guardstack += "perl-module-strict" -RDEPENDS_perl-module-autodie-scope-guardstack += "perl-module-warnings" -RDEPENDS_perl-module-autodie-skip += "perl-module-strict" -RDEPENDS_perl-module-autodie-skip += "perl-module-warnings" -RDEPENDS_perl-module-autodie-util += "perl-module-autodie-scope-guardstack" -RDEPENDS_perl-module-autodie-util += "perl-module-exporter" -RDEPENDS_perl-module-autodie-util += "perl-module-strict" -RDEPENDS_perl-module-autodie-util += "perl-module-warnings" -RDEPENDS_perl-module-autoloader += "perl-module-strict" -RDEPENDS_perl-module-autosplit += "perl-module-config" -RDEPENDS_perl-module-autosplit += "perl-module-exporter" -RDEPENDS_perl-module-autosplit += "perl-module-file-basename" -RDEPENDS_perl-module-autosplit += "perl-module-file-path" -RDEPENDS_perl-module-autosplit += "perl-module-strict" -RDEPENDS_perl-module-base += "perl-module-strict" -RDEPENDS_perl-module-b-concise += "perl-module-b" -RDEPENDS_perl-module-b-concise += "perl-module-b-op-private" -RDEPENDS_perl-module-b-concise += "perl-module-config" -RDEPENDS_perl-module-b-concise += "perl-module-exporter" -RDEPENDS_perl-module-b-concise += "perl-module-feature" -RDEPENDS_perl-module-b-concise += "perl-module-strict" -RDEPENDS_perl-module-b-concise += "perl-module-warnings" -RDEPENDS_perl-module-benchmark += "perl-module-exporter" -RDEPENDS_perl-module-benchmark += "perl-module-strict" -RDEPENDS_perl-module-bigint += "perl-module-constant" -RDEPENDS_perl-module-bigint += "perl-module-exporter" -RDEPENDS_perl-module-bigint += "perl-module-math-bigint" -RDEPENDS_perl-module-bigint += "perl-module-math-bigint-trace" -RDEPENDS_perl-module-bigint += "perl-module-overload" -RDEPENDS_perl-module-bigint += "perl-module-strict" -RDEPENDS_perl-module-bigint += "perl-module-warnings" -RDEPENDS_perl-module-bignum += "perl-module-bigint" -RDEPENDS_perl-module-bignum += "perl-module-exporter" -RDEPENDS_perl-module-bignum += "perl-module-math-bigfloat" -RDEPENDS_perl-module-bignum += "perl-module-math-bigfloat-trace" -RDEPENDS_perl-module-bignum += "perl-module-math-bigint" -RDEPENDS_perl-module-bignum += "perl-module-math-bigint-trace" -RDEPENDS_perl-module-bignum += "perl-module-overload" -RDEPENDS_perl-module-bignum += "perl-module-strict" -RDEPENDS_perl-module-bignum += "perl-module-warnings" -RDEPENDS_perl-module-bigrat += "perl-module-bigint" -RDEPENDS_perl-module-bigrat += "perl-module-exporter" -RDEPENDS_perl-module-bigrat += "perl-module-math-bigfloat" -RDEPENDS_perl-module-bigrat += "perl-module-math-bigint" -RDEPENDS_perl-module-bigrat += "perl-module-math-bigint-trace" -RDEPENDS_perl-module-bigrat += "perl-module-math-bigrat" -RDEPENDS_perl-module-bigrat += "perl-module-overload" -RDEPENDS_perl-module-bigrat += "perl-module-strict" -RDEPENDS_perl-module-bigrat += "perl-module-warnings" -RDEPENDS_perl-module-blib += "perl-module-cwd" -RDEPENDS_perl-module-b += "perl-module-exporter" -RDEPENDS_perl-module-b += "perl-module-xsloader" -RDEPENDS_perl-module-b-showlex += "perl-module-b" -RDEPENDS_perl-module-b-showlex += "perl-module-b-concise" -RDEPENDS_perl-module-b-showlex += "perl-module-b-terse" -RDEPENDS_perl-module-b-showlex += "perl-module-strict" -RDEPENDS_perl-module-b-terse += "perl-module-b" -RDEPENDS_perl-module-b-terse += "perl-module-b-concise" -RDEPENDS_perl-module-b-terse += "perl-module-strict" -RDEPENDS_perl-module-b-xref += "perl-module-b" -RDEPENDS_perl-module-b-xref += "perl-module-config" -RDEPENDS_perl-module-b-xref += "perl-module-strict" -RDEPENDS_perl-module-bytes += "perl-module-bytes-heavy" -RDEPENDS_perl-module--charnames += "perl-module-bytes" -RDEPENDS_perl-module-charnames += "perl-module-bytes" -RDEPENDS_perl-module-charnames += "perl-module--charnames" -RDEPENDS_perl-module--charnames += "perl-module-re" -RDEPENDS_perl-module-charnames += "perl-module-re" -RDEPENDS_perl-module--charnames += "perl-module-strict" -RDEPENDS_perl-module-charnames += "perl-module-strict" -RDEPENDS_perl-module--charnames += "perl-module-warnings" -RDEPENDS_perl-module-charnames += "perl-module-warnings" -RDEPENDS_perl-module-class-struct += "perl-module-exporter" -RDEPENDS_perl-module-class-struct += "perl-module-strict" -RDEPENDS_perl-module-class-struct += "perl-module-warnings-register" -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-bytes " -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-constant" -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-dynaloader" -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-exporter" -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-strict " -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-warnings " -RDEPENDS_perl-module-compress-raw-bzip2 += "perl-module-xsloader" -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-bytes " -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-constant" -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-dynaloader" -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-exporter" -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-strict " -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-warnings " -RDEPENDS_perl-module-compress-raw-zlib += "perl-module-xsloader" -RDEPENDS_perl-module-compress-zlib += "perl-module-bytes " -RDEPENDS_perl-module-compress-zlib += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-compress-zlib += "perl-module-constant" -RDEPENDS_perl-module-compress-zlib += "perl-module-exporter" -RDEPENDS_perl-module-compress-zlib += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-compress-zlib += "perl-module-io-compress-gzip" -RDEPENDS_perl-module-compress-zlib += "perl-module-io-compress-gzip-constants" -RDEPENDS_perl-module-compress-zlib += "perl-module-io-handle " -RDEPENDS_perl-module-compress-zlib += "perl-module-io-uncompress-gunzip" -RDEPENDS_perl-module-compress-zlib += "perl-module-strict " -RDEPENDS_perl-module-compress-zlib += "perl-module-warnings " -RDEPENDS_perl-module-config-extensions += "perl-module-config" -RDEPENDS_perl-module-config-extensions += "perl-module-exporter" -RDEPENDS_perl-module-config-extensions += "perl-module-strict" -RDEPENDS_perl-module-config-perl-v += "perl-module-config" -RDEPENDS_perl-module-config-perl-v += "perl-module-exporter" -RDEPENDS_perl-module-config-perl-v += "perl-module-strict" -RDEPENDS_perl-module-config-perl-v += "perl-module-vars" -RDEPENDS_perl-module-config-perl-v += "perl-module-warnings" -RDEPENDS_perl-module-constant += "perl-module-strict" -RDEPENDS_perl-module-constant += "perl-module-warnings-register" -RDEPENDS_perl-module-corelist += "perl-module-list-util" -RDEPENDS_perl-module-corelist += "perl-module-corelist" -RDEPENDS_perl-module-corelist += "perl-module-strict" -RDEPENDS_perl-module-corelist += "perl-module-version" -RDEPENDS_perl-module-corelist += "perl-module-warnings" -RDEPENDS_perl-module-cpan += "perl-module-b" -RDEPENDS_perl-module-cpan += "perl-module-config" -RDEPENDS_perl-module-cpan += "perl-module-cwd" -RDEPENDS_perl-module-cpan += "perl-module-data-dumper" -RDEPENDS_perl-module-cpan += "perl-module-dirhandle" -RDEPENDS_perl-module-cpan += "perl-module-errno" -RDEPENDS_perl-module-cpan += "perl-module-exporter" -RDEPENDS_perl-module-cpan += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-cpan += "perl-module-extutils-manifest" -RDEPENDS_perl-module-cpan += "perl-module-fcntl" -RDEPENDS_perl-module-cpan += "perl-module-file-basename" -RDEPENDS_perl-module-cpan += "perl-module-file-copy" -RDEPENDS_perl-module-cpan += "perl-module-file-find" -RDEPENDS_perl-module-cpan += "perl-module-filehandle" -RDEPENDS_perl-module-cpan += "perl-module-file-path" -RDEPENDS_perl-module-cpan += "perl-module-json-pp" -RDEPENDS_perl-module-cpan += "perl-module-lib" -RDEPENDS_perl-module-cpan += "perl-module-net-ping" -RDEPENDS_perl-module-cpan += "perl-module-overload" -RDEPENDS_perl-module-cpan += "perl-module-posix" -RDEPENDS_perl-module-cpan += "perl-module-safe" -RDEPENDS_perl-module-cpan += "perl-module-strict" -RDEPENDS_perl-module-cpan += "perl-module-sys-hostname" -RDEPENDS_perl-module-cpan += "perl-module-term-readline" -RDEPENDS_perl-module-cpan += "perl-module-text-parsewords" -RDEPENDS_perl-module-cpan += "perl-module-text-wrap" -RDEPENDS_perl-module-cpan += "perl-module-time-local" -RDEPENDS_perl-module-cpan += "perl-module-vars" -RDEPENDS_perl-module-cpan += "perl-module-warnings" -RDEPENDS_perl-module-cwd += "perl-module-errno" -RDEPENDS_perl-module-cwd += "perl-module-exporter" -RDEPENDS_perl-module-cwd += "perl-module-strict" -RDEPENDS_perl-module-cwd += "perl-module-xsloader" -RDEPENDS_perl-module-data-dumper += "perl-module-config" -RDEPENDS_perl-module-data-dumper += "perl-module-constant" -RDEPENDS_perl-module-data-dumper += "perl-module-exporter" -RDEPENDS_perl-module-data-dumper += "perl-module-xsloader" -RDEPENDS_perl-module-db-file += "perl-module-dynaloader" -RDEPENDS_perl-module-db-file += "perl-module-exporter" -RDEPENDS_perl-module-db-file += "perl-module-fcntl" -RDEPENDS_perl-module-db-file += "perl-module-strict " -RDEPENDS_perl-module-db-file += "perl-module-strict" -RDEPENDS_perl-module-db-file += "perl-module-tie-hash" -RDEPENDS_perl-module-db-file += "perl-module-warnings" -RDEPENDS_perl-module-dbm-filter-compress += "perl-module-strict" -RDEPENDS_perl-module-dbm-filter-compress += "perl-module-warnings" -RDEPENDS_perl-module-dbm-filter-encode += "perl-module-strict" -RDEPENDS_perl-module-dbm-filter-encode += "perl-module-warnings" -RDEPENDS_perl-module-dbm-filter-int32 += "perl-module-strict" -RDEPENDS_perl-module-dbm-filter-int32 += "perl-module-warnings" -RDEPENDS_perl-module-dbm-filter-null += "perl-module-strict" -RDEPENDS_perl-module-dbm-filter-null += "perl-module-warnings" -RDEPENDS_perl-module-dbm-filter += "perl-module-strict" -RDEPENDS_perl-module-dbm-filter += "perl-module-warnings" -RDEPENDS_perl-module-dbm-filter-utf8 += "perl-module-strict" -RDEPENDS_perl-module-dbm-filter-utf8 += "perl-module-warnings" -RDEPENDS_perl-module-db += "perl-module-strict" -RDEPENDS_perl-module-deprecate += "perl-module-strict" -RDEPENDS_perl-module-deprecate += "perl-module-warnings" -RDEPENDS_perl-module-devel-peek += "perl-module-exporter" -RDEPENDS_perl-module-devel-peek += "perl-module-xsloader" -RDEPENDS_perl-module-devel-ppport += "perl-module-file-find" -RDEPENDS_perl-module-devel-ppport += "perl-module-getopt-long" -RDEPENDS_perl-module-devel-ppport += "perl-module-strict" -RDEPENDS_perl-module-devel-ppport += "perl-module-vars" -RDEPENDS_perl-module-devel-selfstubber += "perl-module-selfloader" -RDEPENDS_perl-module-diagnostics += "perl-module-config" -RDEPENDS_perl-module-diagnostics += "perl-module-getopt-std" -RDEPENDS_perl-module-diagnostics += "perl-module-strict" -RDEPENDS_perl-module-diagnostics += "perl-module-text-tabs" -RDEPENDS_perl-module-digest-base += "perl-module-mime-base64" -RDEPENDS_perl-module-digest-base += "perl-module-strict" -RDEPENDS_perl-module-digest-base += "perl-module-vars" -RDEPENDS_perl-module-digest-file += "perl-module-digest" -RDEPENDS_perl-module-digest-file += "perl-module-exporter" -RDEPENDS_perl-module-digest-file += "perl-module-strict" -RDEPENDS_perl-module-digest-file += "perl-module-vars" -RDEPENDS_perl-module-digest-md5 += "perl-module-digest-base" -RDEPENDS_perl-module-digest-md5 += "perl-module-exporter" -RDEPENDS_perl-module-digest-md5 += "perl-module-strict" -RDEPENDS_perl-module-digest-md5 += "perl-module-vars" -RDEPENDS_perl-module-digest-md5 += "perl-module-xsloader" -RDEPENDS_perl-module-digest += "perl-module-strict" -RDEPENDS_perl-module-digest += "perl-module-vars" -RDEPENDS_perl-module-digest-sha += "perl-module-digest-base" -RDEPENDS_perl-module-digest-sha += "perl-module-dynaloader" -RDEPENDS_perl-module-digest-sha += "perl-module-exporter" -RDEPENDS_perl-module-digest-sha += "perl-module-fcntl" -RDEPENDS_perl-module-digest-sha += "perl-module-integer" -RDEPENDS_perl-module-digest-sha += "perl-module-strict" -RDEPENDS_perl-module-digest-sha += "perl-module-vars" -RDEPENDS_perl-module-digest-sha += "perl-module-warnings" -RDEPENDS_perl-module-digest-sha += "perl-module-xsloader" -RDEPENDS_perl-module-dynaloader += "perl-module-config" -RDEPENDS_perl-module-encode-alias += "perl-module-constant" -RDEPENDS_perl-module-encode-alias += "perl-module-encode" -RDEPENDS_perl-module-encode-alias += "perl-module-exporter" -RDEPENDS_perl-module-encode-alias += "perl-module-strict" -RDEPENDS_perl-module-encode-alias += "perl-module-warnings" -RDEPENDS_perl-module-encode-byte += "perl-module-encode" -RDEPENDS_perl-module-encode-byte += "perl-module-strict" -RDEPENDS_perl-module-encode-byte += "perl-module-warnings" -RDEPENDS_perl-module-encode-byte += "perl-module-xsloader" -RDEPENDS_perl-module-encode-cjkconstants += "perl-module-exporter" -RDEPENDS_perl-module-encode-cjkconstants += "perl-module-strict" -RDEPENDS_perl-module-encode-cjkconstants += "perl-module-warnings" -RDEPENDS_perl-module-encode-cn-hz += "perl-module-encode" -RDEPENDS_perl-module-encode-cn-hz += "perl-module-parent" -RDEPENDS_perl-module-encode-cn-hz += "perl-module-strict" -RDEPENDS_perl-module-encode-cn-hz += "perl-module-utf8" -RDEPENDS_perl-module-encode-cn-hz += "perl-module-vars" -RDEPENDS_perl-module-encode-cn-hz += "perl-module-warnings" -RDEPENDS_perl-module-encode-cn += "perl-module-encode" -RDEPENDS_perl-module-encode-cn += "perl-module-encode-cn-hz" -RDEPENDS_perl-module-encode-cn += "perl-module-strict" -RDEPENDS_perl-module-encode-cn += "perl-module-warnings" -RDEPENDS_perl-module-encode-cn += "perl-module-xsloader" -RDEPENDS_perl-module-encode-config += "perl-module-strict" -RDEPENDS_perl-module-encode-config += "perl-module-warnings" -RDEPENDS_perl-module-encode-ebcdic += "perl-module-encode" -RDEPENDS_perl-module-encode-ebcdic += "perl-module-strict" -RDEPENDS_perl-module-encode-ebcdic += "perl-module-warnings" -RDEPENDS_perl-module-encode-ebcdic += "perl-module-xsloader" -RDEPENDS_perl-module-encode-encoder += "perl-module-constant" -RDEPENDS_perl-module-encode-encoder += "perl-module-encode" -RDEPENDS_perl-module-encode-encoder += "perl-module-exporter" -RDEPENDS_perl-module-encode-encoder += "perl-module-overload" -RDEPENDS_perl-module-encode-encoder += "perl-module-strict" -RDEPENDS_perl-module-encode-encoder += "perl-module-warnings" -RDEPENDS_perl-module-encode-encoding += "perl-module-constant" -RDEPENDS_perl-module-encode-encoding += "perl-module-encode" -RDEPENDS_perl-module-encode-encoding += "perl-module-encode-mime-name" -RDEPENDS_perl-module-encode-encoding += "perl-module-strict" -RDEPENDS_perl-module-encode-encoding += "perl-module-warnings" -RDEPENDS_perl-module-encode-gsm0338 += "perl-module-encode" -RDEPENDS_perl-module-encode-gsm0338 += "perl-module-parent" -RDEPENDS_perl-module-encode-gsm0338 += "perl-module-strict" -RDEPENDS_perl-module-encode-gsm0338 += "perl-module-utf8" -RDEPENDS_perl-module-encode-gsm0338 += "perl-module-vars" -RDEPENDS_perl-module-encode-gsm0338 += "perl-module-warnings" -RDEPENDS_perl-module-encode-guess += "perl-module-bytes" -RDEPENDS_perl-module-encode-guess += "perl-module-constant" -RDEPENDS_perl-module-encode-guess += "perl-module-encode" -RDEPENDS_perl-module-encode-guess += "perl-module-encode-unicode" -RDEPENDS_perl-module-encode-guess += "perl-module-parent" -RDEPENDS_perl-module-encode-guess += "perl-module-strict" -RDEPENDS_perl-module-encode-guess += "perl-module-warnings" -RDEPENDS_perl-module-encode-jp-h2z += "perl-module-encode-cjkconstants" -RDEPENDS_perl-module-encode-jp-h2z += "perl-module-strict" -RDEPENDS_perl-module-encode-jp-h2z += "perl-module-vars" -RDEPENDS_perl-module-encode-jp-h2z += "perl-module-warnings" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-bytes" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-encode" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-encode-cjkconstants" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-encode-jp-h2z" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-parent" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-strict" -RDEPENDS_perl-module-encode-jp-jis7 += "perl-module-warnings" -RDEPENDS_perl-module-encode-jp += "perl-module-encode" -RDEPENDS_perl-module-encode-jp += "perl-module-encode-jp-jis7" -RDEPENDS_perl-module-encode-jp += "perl-module-strict" -RDEPENDS_perl-module-encode-jp += "perl-module-warnings" -RDEPENDS_perl-module-encode-jp += "perl-module-xsloader" -RDEPENDS_perl-module-encode-kr-2022-kr += "perl-module-encode" -RDEPENDS_perl-module-encode-kr-2022-kr += "perl-module-encode-cjkconstants" -RDEPENDS_perl-module-encode-kr-2022-kr += "perl-module-parent" -RDEPENDS_perl-module-encode-kr-2022-kr += "perl-module-strict" -RDEPENDS_perl-module-encode-kr-2022-kr += "perl-module-warnings" -RDEPENDS_perl-module-encode-kr += "perl-module-encode" -RDEPENDS_perl-module-encode-kr += "perl-module-encode-kr-2022-kr" -RDEPENDS_perl-module-encode-kr += "perl-module-strict" -RDEPENDS_perl-module-encode-kr += "perl-module-warnings" -RDEPENDS_perl-module-encode-kr += "perl-module-xsloader" -RDEPENDS_perl-module-encode-mime-header-iso-2022-jp += "perl-module-constant" -RDEPENDS_perl-module-encode-mime-header-iso-2022-jp += "perl-module-encode-cjkconstants" -RDEPENDS_perl-module-encode-mime-header-iso-2022-jp += "perl-module-parent" -RDEPENDS_perl-module-encode-mime-header-iso-2022-jp += "perl-module-strict" -RDEPENDS_perl-module-encode-mime-header-iso-2022-jp += "perl-module-warnings" -RDEPENDS_perl-module-encode-mime-header += "perl-module-encode" -RDEPENDS_perl-module-encode-mime-header += "perl-module-mime-base64" -RDEPENDS_perl-module-encode-mime-header += "perl-module-parent" -RDEPENDS_perl-module-encode-mime-header += "perl-module-strict" -RDEPENDS_perl-module-encode-mime-header += "perl-module-warnings" -RDEPENDS_perl-module-encode-mime-name += "perl-module-strict" -RDEPENDS_perl-module-encode-mime-name += "perl-module-warnings" -RDEPENDS_perl-module-encode += "perl-module-bytes" -RDEPENDS_perl-module-encode += "perl-module-constant" -RDEPENDS_perl-module-encode += "perl-module-encode-alias" -RDEPENDS_perl-module-encode += "perl-module-encode-config" -RDEPENDS_perl-module-encode += "perl-module-encode-configlocal-pm" -RDEPENDS_perl-module-encode += "perl-module-encode-mime-name" -RDEPENDS_perl-module-encode += "perl-module-exporter" -RDEPENDS_perl-module-encode += "perl-module-parent" -RDEPENDS_perl-module-encode += "perl-module-storable" -RDEPENDS_perl-module-encode += "perl-module-strict" -RDEPENDS_perl-module-encode += "perl-module-warnings" -RDEPENDS_perl-module-encode += "perl-module-xsloader" -RDEPENDS_perl-module-encode-symbol += "perl-module-encode" -RDEPENDS_perl-module-encode-symbol += "perl-module-strict" -RDEPENDS_perl-module-encode-symbol += "perl-module-warnings" -RDEPENDS_perl-module-encode-symbol += "perl-module-xsloader" -RDEPENDS_perl-module-encode-tw += "perl-module-encode" -RDEPENDS_perl-module-encode-tw += "perl-module-strict" -RDEPENDS_perl-module-encode-tw += "perl-module-warnings" -RDEPENDS_perl-module-encode-tw += "perl-module-xsloader" -RDEPENDS_perl-module-encode-unicode += "perl-module-encode" -RDEPENDS_perl-module-encode-unicode += "perl-module-parent" -RDEPENDS_perl-module-encode-unicode += "perl-module-strict" -RDEPENDS_perl-module-encode-unicode += "perl-module-warnings" -RDEPENDS_perl-module-encode-unicode += "perl-module-xsloader" -RDEPENDS_perl-module-encode-unicode-utf7 += "perl-module-encode" -RDEPENDS_perl-module-encode-unicode-utf7 += "perl-module-mime-base64" -RDEPENDS_perl-module-encode-unicode-utf7 += "perl-module-parent" -RDEPENDS_perl-module-encode-unicode-utf7 += "perl-module-re" -RDEPENDS_perl-module-encode-unicode-utf7 += "perl-module-strict" -RDEPENDS_perl-module-encode-unicode-utf7 += "perl-module-warnings" -RDEPENDS_perl-module-encoding += "perl-module-config" -RDEPENDS_perl-module-encoding += "perl-module-constant" -RDEPENDS_perl-module-encoding += "perl-module-encode" -RDEPENDS_perl-module-encoding += "perl-module-filter-util-call" -RDEPENDS_perl-module-encoding += "perl-module-i18n-langinfo" -RDEPENDS_perl-module-encoding += "perl-module-posix" -RDEPENDS_perl-module-encoding += "perl-module-strict" -RDEPENDS_perl-module-encoding += "perl-module-utf8" -RDEPENDS_perl-module-encoding += "perl-module-warnings" -RDEPENDS_perl-module-encoding-warnings += "perl-module-strict" -RDEPENDS_perl-module-encoding-warnings += "perl-module-warnings" -RDEPENDS_perl-module-english += "perl-module-exporter" -RDEPENDS_perl-module-env += "perl-module-config" -RDEPENDS_perl-module-env += "perl-module-tie-array" -RDEPENDS_perl-module-errno += "perl-module-exporter" -RDEPENDS_perl-module-errno += "perl-module-strict" -RDEPENDS_perl-module-experimental += "perl-module-strict" -RDEPENDS_perl-module-experimental += "perl-module-version" -RDEPENDS_perl-module-experimental += "perl-module-warnings" -RDEPENDS_perl-module-exporter-heavy += "perl-module-exporter" -RDEPENDS_perl-module-exporter-heavy += "perl-module-strict" -RDEPENDS_perl-module-exporter += "perl-module-exporter-heavy" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-config" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-cwd" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-dynaloader" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-extutils-mksymlists" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-file-temp" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-ipc-cmd" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-text-parsewords" -RDEPENDS_perl-module-extutils-cbuilder-base += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-cbuilder += "perl-module-file-path" -RDEPENDS_perl-module-extutils-cbuilder += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-aix += "perl-module-extutils-cbuilder-platform-unix" -RDEPENDS_perl-module-extutils-cbuilder-platform-aix += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-aix += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-android += "perl-module-config" -RDEPENDS_perl-module-extutils-cbuilder-platform-android += "perl-module-extutils-cbuilder-platform-unix" -RDEPENDS_perl-module-extutils-cbuilder-platform-android += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-android += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-cygwin += "perl-module-extutils-cbuilder-platform-unix" -RDEPENDS_perl-module-extutils-cbuilder-platform-cygwin += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-cygwin += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-darwin += "perl-module-extutils-cbuilder-platform-unix" -RDEPENDS_perl-module-extutils-cbuilder-platform-darwin += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-darwin += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-dec-osf += "perl-module-extutils-cbuilder-platform-unix" -RDEPENDS_perl-module-extutils-cbuilder-platform-dec-osf += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-dec-osf += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-os2 += "perl-module-extutils-cbuilder-platform-unix" -RDEPENDS_perl-module-extutils-cbuilder-platform-os2 += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-os2 += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-unix += "perl-module-extutils-cbuilder-base" -RDEPENDS_perl-module-extutils-cbuilder-platform-unix += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-unix += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-vms += "perl-module-config" -RDEPENDS_perl-module-extutils-cbuilder-platform-vms += "perl-module-extutils-cbuilder-base" -RDEPENDS_perl-module-extutils-cbuilder-platform-vms += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-vms += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows-bcc += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows-bcc += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows-gcc += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows-gcc += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows-msvc += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows-msvc += "perl-module-warnings" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows += "perl-module-extutils-cbuilder-base" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows += "perl-module-io-file" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows += "perl-module-strict" -RDEPENDS_perl-module-extutils-cbuilder-platform-windows += "perl-module-warnings" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-exporter" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-extutils-command" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-extutils-install" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-getopt-long" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-strict" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-test-harness" -RDEPENDS_perl-module-extutils-command-mm += "perl-module-warnings" -RDEPENDS_perl-module-extutils-command += "perl-module-exporter" -RDEPENDS_perl-module-extutils-command += "perl-module-file-copy" -RDEPENDS_perl-module-extutils-command += "perl-module-file-find" -RDEPENDS_perl-module-extutils-command += "perl-module-file-path" -RDEPENDS_perl-module-extutils-command += "perl-module-strict" -RDEPENDS_perl-module-extutils-command += "perl-module-vars" -RDEPENDS_perl-module-extutils-constant-base += "perl-module-constant" -RDEPENDS_perl-module-extutils-constant-base += "perl-module-extutils-constant-utils" -RDEPENDS_perl-module-extutils-constant-base += "perl-module-strict" -RDEPENDS_perl-module-extutils-constant-base += "perl-module-text-wrap" -RDEPENDS_perl-module-extutils-constant-base += "perl-module-vars" -RDEPENDS_perl-module-extutils-constant += "perl-module-exporter" -RDEPENDS_perl-module-extutils-constant += "perl-module-extutils-constant-proxysubs" -RDEPENDS_perl-module-extutils-constant += "perl-module-extutils-constant-utils" -RDEPENDS_perl-module-extutils-constant += "perl-module-extutils-constant-xs" -RDEPENDS_perl-module-extutils-constant += "perl-module-filehandle" -RDEPENDS_perl-module-extutils-constant += "perl-module-strict" -RDEPENDS_perl-module-extutils-constant += "perl-module-vars" -RDEPENDS_perl-module-extutils-constant-proxysubs += "perl-module-extutils-constant-utils" -RDEPENDS_perl-module-extutils-constant-proxysubs += "perl-module-extutils-constant-xs" -RDEPENDS_perl-module-extutils-constant-proxysubs += "perl-module-strict" -RDEPENDS_perl-module-extutils-constant-proxysubs += "perl-module-vars" -RDEPENDS_perl-module-extutils-constant-utils += "perl-module-constant" -RDEPENDS_perl-module-extutils-constant-utils += "perl-module-posix" -RDEPENDS_perl-module-extutils-constant-utils += "perl-module-strict" -RDEPENDS_perl-module-extutils-constant-utils += "perl-module-vars" -RDEPENDS_perl-module-extutils-constant-xs += "perl-module-data-dumper" -RDEPENDS_perl-module-extutils-constant-xs += "perl-module-extutils-constant" -RDEPENDS_perl-module-extutils-constant-xs += "perl-module-extutils-constant-base" -RDEPENDS_perl-module-extutils-constant-xs += "perl-module-extutils-constant-utils" -RDEPENDS_perl-module-extutils-constant-xs += "perl-module-strict" -RDEPENDS_perl-module-extutils-constant-xs += "perl-module-vars" -RDEPENDS_perl-module-extutils-embed += "perl-module-config" -RDEPENDS_perl-module-extutils-embed += "perl-module-exporter" -RDEPENDS_perl-module-extutils-embed += "perl-module-extutils-liblist" -RDEPENDS_perl-module-extutils-embed += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-embed += "perl-module-getopt-std" -RDEPENDS_perl-module-extutils-embed += "perl-module-strict" -RDEPENDS_perl-module-extutils-installed += "perl-module-config" -RDEPENDS_perl-module-extutils-installed += "perl-module-data-dumper" -RDEPENDS_perl-module-extutils-installed += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-installed += "perl-module-extutils-packlist" -RDEPENDS_perl-module-extutils-installed += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-installed += "perl-module-file-find" -RDEPENDS_perl-module-extutils-installed += "perl-module-strict" -RDEPENDS_perl-module-extutils-installed += "perl-module-vars" -RDEPENDS_perl-module-extutils-install += "perl-module-autosplit" -RDEPENDS_perl-module-extutils-install += "perl-module-config" -RDEPENDS_perl-module-extutils-install += "perl-module-cwd" -RDEPENDS_perl-module-extutils-install += "perl-module-exporter" -RDEPENDS_perl-module-extutils-install += "perl-module-extutils-packlist" -RDEPENDS_perl-module-extutils-install += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-install += "perl-module-file-compare" -RDEPENDS_perl-module-extutils-install += "perl-module-file-copy" -RDEPENDS_perl-module-extutils-install += "perl-module-file-find" -RDEPENDS_perl-module-extutils-install += "perl-module-file-path" -RDEPENDS_perl-module-extutils-install += "perl-module-strict" -RDEPENDS_perl-module-extutils-liblist-kid += "perl-module-cwd" -RDEPENDS_perl-module-extutils-liblist-kid += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-liblist-kid += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-liblist-kid += "perl-module-strict" -RDEPENDS_perl-module-extutils-liblist-kid += "perl-module-text-parsewords" -RDEPENDS_perl-module-extutils-liblist-kid += "perl-module-warnings" -RDEPENDS_perl-module-extutils-liblist += "perl-module-extutils-liblist-kid" -RDEPENDS_perl-module-extutils-liblist += "perl-module-strict" -RDEPENDS_perl-module-extutils-makemaker-config += "perl-module-config" -RDEPENDS_perl-module-extutils-makemaker-config += "perl-module-strict" -RDEPENDS_perl-module-extutils-makemaker-locale += "perl-module-base" -RDEPENDS_perl-module-extutils-makemaker-locale += "perl-module-encode" -RDEPENDS_perl-module-extutils-makemaker-locale += "perl-module-encode-alias" -RDEPENDS_perl-module-extutils-makemaker-locale += "perl-module-i18n-langinfo" -RDEPENDS_perl-module-extutils-makemaker-locale += "perl-module-strict" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-b" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-cpan" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-cwd" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-exporter" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-extutils-makemaker-version" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-extutils-manifest" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-extutils-mm" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-extutils-my" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-file-path" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-strict" -RDEPENDS_perl-module-extutils-makemaker += "perl-module-version" -RDEPENDS_perl-module-extutils-makemaker-version += "perl-module-strict" -RDEPENDS_perl-module-extutils-makemaker-version += "perl-module-vars" -RDEPENDS_perl-module-extutils-manifest += "perl-module-config" -RDEPENDS_perl-module-extutils-manifest += "perl-module-exporter" -RDEPENDS_perl-module-extutils-manifest += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-manifest += "perl-module-file-copy" -RDEPENDS_perl-module-extutils-manifest += "perl-module-file-find" -RDEPENDS_perl-module-extutils-manifest += "perl-module-file-path" -RDEPENDS_perl-module-extutils-manifest += "perl-module-strict" -RDEPENDS_perl-module-extutils-manifest += "perl-module-warnings" -RDEPENDS_perl-module-extutils-miniperl += "perl-module-exporter" -RDEPENDS_perl-module-extutils-miniperl += "perl-module-extutils-embed" -RDEPENDS_perl-module-extutils-miniperl += "perl-module-strict" -RDEPENDS_perl-module-extutils-mkbootstrap += "perl-module-config" -RDEPENDS_perl-module-extutils-mkbootstrap += "perl-module-dynaloader" -RDEPENDS_perl-module-extutils-mkbootstrap += "perl-module-exporter" -RDEPENDS_perl-module-extutils-mkbootstrap += "perl-module-strict" -RDEPENDS_perl-module-extutils-mksymlists += "perl-module-config" -RDEPENDS_perl-module-extutils-mksymlists += "perl-module-exporter" -RDEPENDS_perl-module-extutils-mksymlists += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-aix += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-aix += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-aix += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-autosplit" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-cpan" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-data-dumper" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-file-find" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-any += "perl-module-version" -RDEPENDS_perl-module-extutils-mm-beos += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-beos += "perl-module-extutils-mm-any" -RDEPENDS_perl-module-extutils-mm-beos += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-beos += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-cygwin += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-cygwin += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-cygwin += "perl-module-extutils-mm-win32" -RDEPENDS_perl-module-extutils-mm-cygwin += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-darwin += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-darwin += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-dos += "perl-module-extutils-mm-any" -RDEPENDS_perl-module-extutils-mm-dos += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-dos += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-macos += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-nw5 += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm-nw5 += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-nw5 += "perl-module-extutils-mm-win32" -RDEPENDS_perl-module-extutils-mm-nw5 += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-mm-nw5 += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-os2 += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm-os2 += "perl-module-extutils-mm-any" -RDEPENDS_perl-module-extutils-mm-os2 += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-os2 += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-liblist" -RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-qnx += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-qnx += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-cwd" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-encode" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-extutils-liblist" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-extutils-mm-any" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-file-find" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-vars" -RDEPENDS_perl-module-extutils-mm-unix += "perl-module-version" -RDEPENDS_perl-module-extutils-mm-uwin += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-uwin += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-exporter" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-extutils-liblist-kid" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-extutils-mm-any" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-file-find" -RDEPENDS_perl-module-extutils-mm-vms += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-vos += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-vos += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-win32 += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-extutils-mm-win32 += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-win32 += "perl-module-extutils-mm-any" -RDEPENDS_perl-module-extutils-mm-win32 += "perl-module-extutils-mm-unix" -RDEPENDS_perl-module-extutils-mm-win32 += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-mm-win32 += "perl-module-strict" -RDEPENDS_perl-module-extutils-mm-win95 += "perl-module-extutils-makemaker-config" -RDEPENDS_perl-module-extutils-mm-win95 += "perl-module-extutils-mm-win32" -RDEPENDS_perl-module-extutils-mm-win95 += "perl-module-strict" -RDEPENDS_perl-module-extutils-my += "perl-module-extutils-mm" -RDEPENDS_perl-module-extutils-my += "perl-module-strict" -RDEPENDS_perl-module-extutils-packlist += "perl-module-config" -RDEPENDS_perl-module-extutils-packlist += "perl-module-cwd" -RDEPENDS_perl-module-extutils-packlist += "perl-module-strict" -RDEPENDS_perl-module-extutils-packlist += "perl-module-vars" -RDEPENDS_perl-module-extutils-parsexs-constants += "perl-module-strict" -RDEPENDS_perl-module-extutils-parsexs-constants += "perl-module-warnings" -RDEPENDS_perl-module-extutils-parsexs-countlines += "perl-module-strict" -RDEPENDS_perl-module-extutils-parsexs-eval += "perl-module-strict" -RDEPENDS_perl-module-extutils-parsexs-eval += "perl-module-warnings" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-config" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-cwd" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-exporter" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-extutils-parsexs-constants" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-extutils-parsexs-countlines" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-extutils-parsexs-eval" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-extutils-parsexs-utilities" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-file-basename" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-re" -RDEPENDS_perl-module-extutils-parsexs += "perl-module-strict" -RDEPENDS_perl-module-extutils-parsexs-utilities += "perl-module-exporter" -RDEPENDS_perl-module-extutils-parsexs-utilities += "perl-module-extutils-parsexs-constants" -RDEPENDS_perl-module-extutils-parsexs-utilities += "perl-module-extutils-typemaps" -RDEPENDS_perl-module-extutils-parsexs-utilities += "perl-module-strict" -RDEPENDS_perl-module-extutils-parsexs-utilities += "perl-module-warnings" -RDEPENDS_perl-module-extutils-testlib += "perl-module-cwd" -RDEPENDS_perl-module-extutils-testlib += "perl-module-lib" -RDEPENDS_perl-module-extutils-testlib += "perl-module-strict" -RDEPENDS_perl-module-extutils-testlib += "perl-module-warnings" -RDEPENDS_perl-module-extutils-typemaps-cmd += "perl-module-exporter" -RDEPENDS_perl-module-extutils-typemaps-cmd += "perl-module-extutils-typemaps" -RDEPENDS_perl-module-extutils-typemaps-cmd += "perl-module-strict" -RDEPENDS_perl-module-extutils-typemaps-cmd += "perl-module-warnings" -RDEPENDS_perl-module-extutils-typemaps-inputmap += "perl-module-strict" -RDEPENDS_perl-module-extutils-typemaps-inputmap += "perl-module-warnings" -RDEPENDS_perl-module-extutils-typemaps-outputmap += "perl-module-re" -RDEPENDS_perl-module-extutils-typemaps-outputmap += "perl-module-strict" -RDEPENDS_perl-module-extutils-typemaps-outputmap += "perl-module-warnings" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-extutils-parsexs" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-extutils-parsexs-constants" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-extutils-typemaps-inputmap" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-extutils-typemaps-outputmap" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-extutils-typemaps-type" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-strict" -RDEPENDS_perl-module-extutils-typemaps += "perl-module-warnings" -RDEPENDS_perl-module-extutils-typemaps-type += "perl-module-extutils-typemaps" -RDEPENDS_perl-module-extutils-typemaps-type += "perl-module-strict" -RDEPENDS_perl-module-extutils-typemaps-type += "perl-module-warnings" -RDEPENDS_perl-module-fatal += "perl-module-autodie" -RDEPENDS_perl-module-fatal += "perl-module-autodie-exception-system" -RDEPENDS_perl-module-fatal += "perl-module-autodie-hints" -RDEPENDS_perl-module-fatal += "perl-module-autodie-util" -RDEPENDS_perl-module-fatal += "perl-module-config" -RDEPENDS_perl-module-fatal += "perl-module-constant" -RDEPENDS_perl-module-fatal += "perl-module-fcntl" -RDEPENDS_perl-module-fatal += "perl-module-posix" -RDEPENDS_perl-module-fatal += "perl-module-strict" -RDEPENDS_perl-module-fatal += "perl-module-tie-refhash" -RDEPENDS_perl-module-fatal += "perl-module-warnings" -RDEPENDS_perl-module-fcntl += "perl-module-exporter" -RDEPENDS_perl-module-fcntl += "perl-module-strict" -RDEPENDS_perl-module-fcntl += "perl-module-xsloader" -RDEPENDS_perl-module-fields += "perl-module-base" -RDEPENDS_perl-module-fields += "perl-module-hash-util" -RDEPENDS_perl-module-fields += "perl-module-strict" -RDEPENDS_perl-module-file-basename += "perl-module-exporter" -RDEPENDS_perl-module-file-basename += "perl-module-re" -RDEPENDS_perl-module-file-basename += "perl-module-strict" -RDEPENDS_perl-module-file-basename += "perl-module-warnings" -RDEPENDS_perl-module-filecache += "perl-module-parent" -RDEPENDS_perl-module-filecache += "perl-module-strict" -RDEPENDS_perl-module-file-compare += "perl-module-exporter" -RDEPENDS_perl-module-file-compare += "perl-module-strict" -RDEPENDS_perl-module-file-compare += "perl-module-warnings" -RDEPENDS_perl-module-file-copy += "perl-module-config" -RDEPENDS_perl-module-file-copy += "perl-module-exporter" -RDEPENDS_perl-module-file-copy += "perl-module-file-basename" -RDEPENDS_perl-module-file-copy += "perl-module-strict" -RDEPENDS_perl-module-file-copy += "perl-module-warnings" -RDEPENDS_perl-module-file-dosglob += "perl-module-strict" -RDEPENDS_perl-module-file-dosglob += "perl-module-text-parsewords" -RDEPENDS_perl-module-file-dosglob += "perl-module-warnings" -RDEPENDS_perl-module-file-dosglob += "perl-module-xsloader" -RDEPENDS_perl-module-file-fetch += "perl-module-constant" -RDEPENDS_perl-module-file-fetch += "perl-module-cwd" -RDEPENDS_perl-module-file-fetch += "perl-module-file-basename" -RDEPENDS_perl-module-file-fetch += "perl-module-file-copy" -RDEPENDS_perl-module-file-fetch += "perl-module-filehandle" -RDEPENDS_perl-module-file-fetch += "perl-module-file-path" -RDEPENDS_perl-module-file-fetch += "perl-module-file-temp" -RDEPENDS_perl-module-file-fetch += "perl-module-ipc-cmd" -RDEPENDS_perl-module-file-fetch += "perl-module-locale-maketext-simple" -RDEPENDS_perl-module-file-fetch += "perl-module-load" -RDEPENDS_perl-module-file-fetch += "perl-module-params-check" -RDEPENDS_perl-module-file-fetch += "perl-module-strict" -RDEPENDS_perl-module-file-fetch += "perl-module-vars" -RDEPENDS_perl-module-file-find += "perl-module-cwd" -RDEPENDS_perl-module-file-find += "perl-module-exporter" -RDEPENDS_perl-module-file-find += "perl-module-file-basename" -RDEPENDS_perl-module-file-find += "perl-module-strict" -RDEPENDS_perl-module-file-find += "perl-module-warnings" -RDEPENDS_perl-module-file-find += "perl-module-warnings-register" -RDEPENDS_perl-module-file-globmapper += "perl-module-file-glob" -RDEPENDS_perl-module-file-globmapper += "perl-module-strict" -RDEPENDS_perl-module-file-globmapper += "perl-module-warnings" -RDEPENDS_perl-module-file-glob += "perl-module-exporter" -RDEPENDS_perl-module-file-glob += "perl-module-strict" -RDEPENDS_perl-module-file-glob += "perl-module-xsloader" -RDEPENDS_perl-module-filehandle += "perl-module-exporter" -RDEPENDS_perl-module-filehandle += "perl-module-fcntl" -RDEPENDS_perl-module-filehandle += "perl-module-io-file" -RDEPENDS_perl-module-filehandle += "perl-module-strict" -RDEPENDS_perl-module-file-path += "perl-module-cwd" -RDEPENDS_perl-module-file-path += "perl-module-exporter" -RDEPENDS_perl-module-file-path += "perl-module-file-basename" -RDEPENDS_perl-module-file-path += "perl-module-strict" -RDEPENDS_perl-module-file-path += "perl-module-vars" -RDEPENDS_perl-module-file-stat += "perl-module-class-struct" -RDEPENDS_perl-module-file-stat += "perl-module-constant" -RDEPENDS_perl-module-file-stat += "perl-module-exporter" -RDEPENDS_perl-module-file-stat += "perl-module-fcntl" -RDEPENDS_perl-module-file-stat += "perl-module-overload " -RDEPENDS_perl-module-file-stat += "perl-module-strict" -RDEPENDS_perl-module-file-stat += "perl-module-warnings" -RDEPENDS_perl-module-file-stat += "perl-module-warnings-register" -RDEPENDS_perl-module-file-temp += "perl-module-constant" -RDEPENDS_perl-module-file-temp += "perl-module-cwd" -RDEPENDS_perl-module-file-temp += "perl-module-errno" -RDEPENDS_perl-module-file-temp += "perl-module-exporter" -RDEPENDS_perl-module-file-temp += "perl-module-fcntl" -RDEPENDS_perl-module-file-temp += "perl-module-file-path" -RDEPENDS_perl-module-file-temp += "perl-module-io-seekable" -RDEPENDS_perl-module-file-temp += "perl-module-overload" -RDEPENDS_perl-module-file-temp += "perl-module-parent" -RDEPENDS_perl-module-file-temp += "perl-module-posix" -RDEPENDS_perl-module-file-temp += "perl-module-strict" -RDEPENDS_perl-module-filter-simple += "perl-module-filter-util-call" -RDEPENDS_perl-module-filter-simple += "perl-module-text-balanced" -RDEPENDS_perl-module-filter-util-call += "perl-module-exporter" -RDEPENDS_perl-module-filter-util-call += "perl-module-strict" -RDEPENDS_perl-module-filter-util-call += "perl-module-warnings" -RDEPENDS_perl-module-filter-util-call += "perl-module-xsloader" -RDEPENDS_perl-module-findbin += "perl-module-cwd" -RDEPENDS_perl-module-findbin += "perl-module-exporter" -RDEPENDS_perl-module-findbin += "perl-module-file-basename" -RDEPENDS_perl-module-gdbm-file += "perl-module-exporter" -RDEPENDS_perl-module-gdbm-file += "perl-module-strict" -RDEPENDS_perl-module-gdbm-file += "perl-module-tie-hash" -RDEPENDS_perl-module-gdbm-file += "perl-module-warnings" -RDEPENDS_perl-module-gdbm-file += "perl-module-xsloader" -RDEPENDS_perl-module-getopt-long += "perl-module-constant" -RDEPENDS_perl-module-getopt-long += "perl-module-exporter" -RDEPENDS_perl-module-getopt-long += "perl-module-overload" -RDEPENDS_perl-module-getopt-long += "perl-module-pod-usage" -RDEPENDS_perl-module-getopt-long += "perl-module-strict" -RDEPENDS_perl-module-getopt-long += "perl-module-text-parsewords" -RDEPENDS_perl-module-getopt-long += "perl-module-vars" -RDEPENDS_perl-module-getopt-long += "perl-module-warnings" -RDEPENDS_perl-module-getopt-std += "perl-module-exporter" -RDEPENDS_perl-module-hash-util-fieldhash += "perl-module-exporter" -RDEPENDS_perl-module-hash-util-fieldhash += "perl-module-strict" -RDEPENDS_perl-module-hash-util-fieldhash += "perl-module-warnings" -RDEPENDS_perl-module-hash-util-fieldhash += "perl-module-xsloader" -RDEPENDS_perl-module-hash-util += "perl-module-exporter" -RDEPENDS_perl-module-hash-util += "perl-module-hash-util-fieldhash" -RDEPENDS_perl-module-hash-util += "perl-module-strict" -RDEPENDS_perl-module-hash-util += "perl-module-warnings" -RDEPENDS_perl-module-hash-util += "perl-module-warnings-register" -RDEPENDS_perl-module-hash-util += "perl-module-xsloader" -RDEPENDS_perl-module-i18n-collate += "perl-module-exporter" -RDEPENDS_perl-module-i18n-collate += "perl-module-overload" -RDEPENDS_perl-module-i18n-collate += "perl-module-posix" -RDEPENDS_perl-module-i18n-collate += "perl-module-strict" -RDEPENDS_perl-module-i18n-collate += "perl-module-warnings-register" -RDEPENDS_perl-module-i18n-langinfo += "perl-module-exporter" -RDEPENDS_perl-module-i18n-langinfo += "perl-module-strict" -RDEPENDS_perl-module-i18n-langinfo += "perl-module-warnings" -RDEPENDS_perl-module-i18n-langinfo += "perl-module-xsloader" -RDEPENDS_perl-module-i18n-langtags-detect += "perl-module-i18n-langtags" -RDEPENDS_perl-module-i18n-langtags-detect += "perl-module-strict" -RDEPENDS_perl-module-i18n-langtags-list += "perl-module-strict" -RDEPENDS_perl-module-i18n-langtags += "perl-module-exporter" -RDEPENDS_perl-module-i18n-langtags += "perl-module-strict" -RDEPENDS_perl-module-io-compress-adapter-bzip2 += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-adapter-bzip2 += "perl-module-compress-raw-bzip2" -RDEPENDS_perl-module-io-compress-adapter-bzip2 += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-adapter-bzip2 += "perl-module-strict" -RDEPENDS_perl-module-io-compress-adapter-bzip2 += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-adapter-deflate += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-adapter-deflate += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-compress-adapter-deflate += "perl-module-exporter" -RDEPENDS_perl-module-io-compress-adapter-deflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-adapter-deflate += "perl-module-strict" -RDEPENDS_perl-module-io-compress-adapter-deflate += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-adapter-identity += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-adapter-identity += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-adapter-identity += "perl-module-strict" -RDEPENDS_perl-module-io-compress-adapter-identity += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-constant" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-encode" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-exporter" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-file-globmapper" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-strict " -RDEPENDS_perl-module-io-compress-base-common += "perl-module-strict" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-utf8" -RDEPENDS_perl-module-io-compress-base-common += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-base += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-base += "perl-module-io-file" -RDEPENDS_perl-module-io-compress-base += "perl-module-io-handle " -RDEPENDS_perl-module-io-compress-base += "perl-module-strict " -RDEPENDS_perl-module-io-compress-base += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-exporter " -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-io-compress-adapter-bzip2" -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-io-compress-base" -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-strict " -RDEPENDS_perl-module-io-compress-bzip2 += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-deflate += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-deflate += "perl-module-exporter " -RDEPENDS_perl-module-io-compress-deflate += "perl-module-io-compress-adapter-deflate" -RDEPENDS_perl-module-io-compress-deflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-deflate += "perl-module-io-compress-rawdeflate" -RDEPENDS_perl-module-io-compress-deflate += "perl-module-io-compress-zlib-constants" -RDEPENDS_perl-module-io-compress-deflate += "perl-module-strict " -RDEPENDS_perl-module-io-compress-deflate += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-gzip-constants += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-gzip-constants += "perl-module-constant" -RDEPENDS_perl-module-io-compress-gzip-constants += "perl-module-exporter" -RDEPENDS_perl-module-io-compress-gzip-constants += "perl-module-strict " -RDEPENDS_perl-module-io-compress-gzip-constants += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-exporter " -RDEPENDS_perl-module-io-compress-gzip += "perl-module-io-compress-adapter-deflate" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-io-compress-gzip-constants" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-io-compress-rawdeflate" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-io-compress-zlib-extra" -RDEPENDS_perl-module-io-compress-gzip += "perl-module-strict " -RDEPENDS_perl-module-io-compress-gzip += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-exporter " -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-fcntl" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-io-compress-adapter-deflate" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-io-compress-base" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-strict " -RDEPENDS_perl-module-io-compress-rawdeflate += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-zip-constants += "perl-module-constant" -RDEPENDS_perl-module-io-compress-zip-constants += "perl-module-exporter" -RDEPENDS_perl-module-io-compress-zip-constants += "perl-module-strict " -RDEPENDS_perl-module-io-compress-zip-constants += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-zip += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-zip += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-compress-zip += "perl-module-config" -RDEPENDS_perl-module-io-compress-zip += "perl-module-exporter " -RDEPENDS_perl-module-io-compress-zip += "perl-module-fcntl" -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-adapter-deflate" -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-adapter-identity" -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-bzip2 " -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-rawdeflate" -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-zip-constants" -RDEPENDS_perl-module-io-compress-zip += "perl-module-io-compress-zlib-extra" -RDEPENDS_perl-module-io-compress-zip += "perl-module-strict " -RDEPENDS_perl-module-io-compress-zip += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-zlib-constants += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-zlib-constants += "perl-module-constant" -RDEPENDS_perl-module-io-compress-zlib-constants += "perl-module-exporter" -RDEPENDS_perl-module-io-compress-zlib-constants += "perl-module-strict " -RDEPENDS_perl-module-io-compress-zlib-constants += "perl-module-warnings" -RDEPENDS_perl-module-io-compress-zlib-extra += "perl-module-bytes" -RDEPENDS_perl-module-io-compress-zlib-extra += "perl-module-io-compress-gzip-constants" -RDEPENDS_perl-module-io-compress-zlib-extra += "perl-module-strict " -RDEPENDS_perl-module-io-compress-zlib-extra += "perl-module-warnings" -RDEPENDS_perl-module-io-dir += "perl-module-exporter" -RDEPENDS_perl-module-io-dir += "perl-module-file-stat" -RDEPENDS_perl-module-io-dir += "perl-module-io-file" -RDEPENDS_perl-module-io-dir += "perl-module-strict" -RDEPENDS_perl-module-io-dir += "perl-module-tie-hash" -RDEPENDS_perl-module-io-file += "perl-module-exporter" -RDEPENDS_perl-module-io-file += "perl-module-fcntl" -RDEPENDS_perl-module-io-file += "perl-module-io-seekable" -RDEPENDS_perl-module-io-file += "perl-module-selectsaver" -RDEPENDS_perl-module-io-file += "perl-module-strict" -RDEPENDS_perl-module-io-handle += "perl-module-exporter" -RDEPENDS_perl-module-io-handle += "perl-module-io" -RDEPENDS_perl-module-io-handle += "perl-module-io-file" -RDEPENDS_perl-module-io-handle += "perl-module-selectsaver" -RDEPENDS_perl-module-io-handle += "perl-module-strict" -RDEPENDS_perl-module-io += "perl-module-strict" -RDEPENDS_perl-module-io += "perl-module-warnings" -RDEPENDS_perl-module-io += "perl-module-xsloader" -RDEPENDS_perl-module-io-pipe += "perl-module-fcntl" -RDEPENDS_perl-module-io-pipe += "perl-module-io-handle" -RDEPENDS_perl-module-io-pipe += "perl-module-strict" -RDEPENDS_perl-module-io-poll += "perl-module-exporter" -RDEPENDS_perl-module-io-poll += "perl-module-io-handle" -RDEPENDS_perl-module-io-poll += "perl-module-strict" -RDEPENDS_perl-module-io-seekable += "perl-module-exporter" -RDEPENDS_perl-module-io-seekable += "perl-module-fcntl" -RDEPENDS_perl-module-io-seekable += "perl-module-io-handle" -RDEPENDS_perl-module-io-seekable += "perl-module-strict" -RDEPENDS_perl-module-io-select += "perl-module-exporter" -RDEPENDS_perl-module-io-select += "perl-module-strict" -RDEPENDS_perl-module-io-select += "perl-module-warnings-register" -RDEPENDS_perl-module-io-socket-inet += "perl-module-errno" -RDEPENDS_perl-module-io-socket-inet += "perl-module-exporter" -RDEPENDS_perl-module-io-socket-inet += "perl-module-io-socket" -RDEPENDS_perl-module-io-socket-inet += "perl-module-socket" -RDEPENDS_perl-module-io-socket-inet += "perl-module-strict" -RDEPENDS_perl-module-io-socket-ip += "perl-module-base" -RDEPENDS_perl-module-io-socket-ip += "perl-module-constant" -RDEPENDS_perl-module-io-socket-ip += "perl-module-errno" -RDEPENDS_perl-module-io-socket-ip += "perl-module-posix" -RDEPENDS_perl-module-io-socket-ip += "perl-module-socket" -RDEPENDS_perl-module-io-socket-ip += "perl-module-strict" -RDEPENDS_perl-module-io-socket-ip += "perl-module-warnings" -RDEPENDS_perl-module-io-socket += "perl-module-errno" -RDEPENDS_perl-module-io-socket += "perl-module-exporter" -RDEPENDS_perl-module-io-socket += "perl-module-io-handle" -RDEPENDS_perl-module-io-socket += "perl-module-io-select" -RDEPENDS_perl-module-io-socket += "perl-module-io-socket-inet" -RDEPENDS_perl-module-io-socket += "perl-module-io-socket-unix" -RDEPENDS_perl-module-io-socket += "perl-module-socket" -RDEPENDS_perl-module-io-socket += "perl-module-strict" -RDEPENDS_perl-module-io-socket-unix += "perl-module-io-socket" -RDEPENDS_perl-module-io-socket-unix += "perl-module-strict" -RDEPENDS_perl-module-io-uncompress-adapter-bunzip2 += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-adapter-bunzip2 += "perl-module-compress-raw-bzip2" -RDEPENDS_perl-module-io-uncompress-adapter-bunzip2 += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-adapter-bunzip2 += "perl-module-strict" -RDEPENDS_perl-module-io-uncompress-adapter-bunzip2 += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-adapter-identity += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-adapter-identity += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-uncompress-adapter-identity += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-adapter-identity += "perl-module-io-compress-zip-constants " -RDEPENDS_perl-module-io-uncompress-adapter-identity += "perl-module-strict" -RDEPENDS_perl-module-io-uncompress-adapter-identity += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-adapter-inflate += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-adapter-inflate += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-uncompress-adapter-inflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-adapter-inflate += "perl-module-strict" -RDEPENDS_perl-module-io-uncompress-adapter-inflate += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-adapter-inflate" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-base" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-gunzip" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-inflate" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-rawinflate" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-unzip" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-strict" -RDEPENDS_perl-module-io-uncompress-anyinflate += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-anyuncompress += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-anyuncompress += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-anyuncompress += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-anyuncompress += "perl-module-io-uncompress-base" -RDEPENDS_perl-module-io-uncompress-anyuncompress += "perl-module-strict" -RDEPENDS_perl-module-io-uncompress-anyuncompress += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-base += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-base += "perl-module-constant" -RDEPENDS_perl-module-io-uncompress-base += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-base += "perl-module-io-file " -RDEPENDS_perl-module-io-uncompress-base += "perl-module-list-util" -RDEPENDS_perl-module-io-uncompress-base += "perl-module-strict " -RDEPENDS_perl-module-io-uncompress-base += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-io-uncompress-adapter-bunzip2" -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-io-uncompress-base" -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-strict " -RDEPENDS_perl-module-io-uncompress-bunzip2 += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-io-compress-gzip-constants" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-io-compress-zlib-extra" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-io-uncompress-rawinflate" -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-strict " -RDEPENDS_perl-module-io-uncompress-gunzip += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-io-compress-zlib-constants" -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-io-uncompress-rawinflate" -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-strict " -RDEPENDS_perl-module-io-uncompress-inflate += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-io-uncompress-adapter-inflate" -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-io-uncompress-base" -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-strict " -RDEPENDS_perl-module-io-uncompress-rawinflate += "perl-module-warnings" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-bytes" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-compress-raw-zlib" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-constant" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-encode" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-exporter " -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-fcntl" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-compress-base-common" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-compress-zip-constants" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-compress-zlib-extra" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-file" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-uncompress-adapter-identity" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-uncompress-adapter-inflate" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-io-uncompress-rawinflate" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-posix" -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-strict " -RDEPENDS_perl-module-io-uncompress-unzip += "perl-module-warnings" -RDEPENDS_perl-module-io-zlib += "perl-module-fcntl" -RDEPENDS_perl-module-io-zlib += "perl-module-io-handle" -RDEPENDS_perl-module-io-zlib += "perl-module-strict" -RDEPENDS_perl-module-io-zlib += "perl-module-tie-handle" -RDEPENDS_perl-module-io-zlib += "perl-module-vars" -RDEPENDS_perl-module-ipc-cmd += "perl-module-constant" -RDEPENDS_perl-module-ipc-cmd += "perl-module-exporter" -RDEPENDS_perl-module-ipc-cmd += "perl-module-extutils-makemaker" -RDEPENDS_perl-module-ipc-cmd += "perl-module-filehandle" -RDEPENDS_perl-module-ipc-cmd += "perl-module-io-handle" -RDEPENDS_perl-module-ipc-cmd += "perl-module-io-select" -RDEPENDS_perl-module-ipc-cmd += "perl-module-ipc-open3" -RDEPENDS_perl-module-ipc-cmd += "perl-module-locale-maketext-simple" -RDEPENDS_perl-module-ipc-cmd += "perl-module-load" -RDEPENDS_perl-module-ipc-cmd += "perl-module-params-check" -RDEPENDS_perl-module-ipc-cmd += "perl-module-posix" -RDEPENDS_perl-module-ipc-cmd += "perl-module-socket" -RDEPENDS_perl-module-ipc-cmd += "perl-module-strict" -RDEPENDS_perl-module-ipc-cmd += "perl-module-text-parsewords" -RDEPENDS_perl-module-ipc-cmd += "perl-module-time-hires" -RDEPENDS_perl-module-ipc-cmd += "perl-module-vars" -RDEPENDS_perl-module-ipc-msg += "perl-module-class-struct" -RDEPENDS_perl-module-ipc-msg += "perl-module-ipc-sysv" -RDEPENDS_perl-module-ipc-msg += "perl-module-strict" -RDEPENDS_perl-module-ipc-msg += "perl-module-vars" -RDEPENDS_perl-module-ipc-open2 += "perl-module-exporter" -RDEPENDS_perl-module-ipc-open2 += "perl-module-ipc-open3" -RDEPENDS_perl-module-ipc-open2 += "perl-module-strict" -RDEPENDS_perl-module-ipc-open3 += "perl-module-constant" -RDEPENDS_perl-module-ipc-open3 += "perl-module-exporter" -RDEPENDS_perl-module-ipc-open3 += "perl-module-fcntl" -RDEPENDS_perl-module-ipc-open3 += "perl-module-io-pipe" -RDEPENDS_perl-module-ipc-open3 += "perl-module-posix" -RDEPENDS_perl-module-ipc-open3 += "perl-module-strict" -RDEPENDS_perl-module-ipc-semaphore += "perl-module-class-struct" -RDEPENDS_perl-module-ipc-semaphore += "perl-module-ipc-sysv" -RDEPENDS_perl-module-ipc-semaphore += "perl-module-strict" -RDEPENDS_perl-module-ipc-semaphore += "perl-module-vars" -RDEPENDS_perl-module-ipc-sharedmem += "perl-module-class-struct" -RDEPENDS_perl-module-ipc-sharedmem += "perl-module-ipc-sysv" -RDEPENDS_perl-module-ipc-sharedmem += "perl-module-strict" -RDEPENDS_perl-module-ipc-sharedmem += "perl-module-vars" -RDEPENDS_perl-module-ipc-sysv += "perl-module-config" -RDEPENDS_perl-module-ipc-sysv += "perl-module-dynaloader" -RDEPENDS_perl-module-ipc-sysv += "perl-module-exporter" -RDEPENDS_perl-module-ipc-sysv += "perl-module-strict" -RDEPENDS_perl-module-ipc-sysv += "perl-module-vars" -RDEPENDS_perl-module-json-pp-boolean += "perl-module-overload" -RDEPENDS_perl-module-json-pp-boolean += "perl-module-strict" -RDEPENDS_perl-module-json-pp += "perl-module-b" -RDEPENDS_perl-module-json-pp += "perl-module-bytes" -RDEPENDS_perl-module-json-pp += "perl-module-constant" -RDEPENDS_perl-module-json-pp += "perl-module-encode" -RDEPENDS_perl-module-json-pp += "perl-module-exporter" -RDEPENDS_perl-module-json-pp += "perl-module-json-pp-boolean" -RDEPENDS_perl-module-json-pp += "perl-module-math-bigfloat" -RDEPENDS_perl-module-json-pp += "perl-module-math-bigint" -RDEPENDS_perl-module-json-pp += "perl-module-overload" -RDEPENDS_perl-module-json-pp += "perl-module-strict" -RDEPENDS_perl-module-json-pp += "perl-module-subs" -RDEPENDS_perl-module-less += "perl-module-strict" -RDEPENDS_perl-module-less += "perl-module-warnings" -RDEPENDS_perl-module-lib += "perl-module-config" -RDEPENDS_perl-module-lib += "perl-module-strict" -RDEPENDS_perl-module-list-util += "perl-module-exporter" -RDEPENDS_perl-module-list-util += "perl-module-strict" -RDEPENDS_perl-module-list-util += "perl-module-warnings" -RDEPENDS_perl-module-list-util += "perl-module-xsloader" -RDEPENDS_perl-module-list-util-xs += "perl-module-list-util" -RDEPENDS_perl-module-list-util-xs += "perl-module-strict" -RDEPENDS_perl-module-list-util-xs += "perl-module-warnings" -RDEPENDS_perl-module-loaded += "perl-module-strict" -RDEPENDS_perl-module-loaded += "perl-module-vars" -RDEPENDS_perl-module-load += "perl-module-config" -RDEPENDS_perl-module-load += "perl-module-constant" -RDEPENDS_perl-module-load += "perl-module-exporter" -RDEPENDS_perl-module-load += "perl-module-filehandle" -RDEPENDS_perl-module-load += "perl-module-locale-maketext-simple" -RDEPENDS_perl-module-load += "perl-module-corelist" -RDEPENDS_perl-module-load += "perl-module-load" -RDEPENDS_perl-module-load += "perl-module-params-check" -RDEPENDS_perl-module-load += "perl-module-strict" -RDEPENDS_perl-module-load += "perl-module-vars" -RDEPENDS_perl-module-load += "perl-module-version" -RDEPENDS_perl-module-load += "perl-module-warnings" -RDEPENDS_perl-module-locale-maketext-gutsloader += "perl-module-locale-maketext" -RDEPENDS_perl-module-locale-maketext-guts += "perl-module-locale-maketext" -RDEPENDS_perl-module-locale-maketext += "perl-module-i18n-langtags" -RDEPENDS_perl-module-locale-maketext += "perl-module-i18n-langtags-detect" -RDEPENDS_perl-module-locale-maketext += "perl-module-integer" -RDEPENDS_perl-module-locale-maketext += "perl-module-strict" -RDEPENDS_perl-module-locale-maketext-simple += "perl-module-base" -RDEPENDS_perl-module-locale-maketext-simple += "perl-module-strict" -RDEPENDS_perl-module-locale += "perl-module-config" -RDEPENDS_perl-module-math-bigfloat += "perl-module-exporter" -RDEPENDS_perl-module-math-bigfloat += "perl-module-math-bigint" -RDEPENDS_perl-module-math-bigfloat += "perl-module-math-complex" -RDEPENDS_perl-module-math-bigfloat += "perl-module-overload" -RDEPENDS_perl-module-math-bigfloat += "perl-module-strict" -RDEPENDS_perl-module-math-bigfloat += "perl-module-warnings" -RDEPENDS_perl-module-math-bigfloat-trace += "perl-module-exporter" -RDEPENDS_perl-module-math-bigfloat-trace += "perl-module-math-bigfloat" -RDEPENDS_perl-module-math-bigfloat-trace += "perl-module-overload" -RDEPENDS_perl-module-math-bigfloat-trace += "perl-module-strict" -RDEPENDS_perl-module-math-bigfloat-trace += "perl-module-warnings" -RDEPENDS_perl-module-math-bigint-calc += "perl-module-constant" -RDEPENDS_perl-module-math-bigint-calc += "perl-module-integer" -RDEPENDS_perl-module-math-bigint-calc += "perl-module-math-bigint-lib" -RDEPENDS_perl-module-math-bigint-calc += "perl-module-strict" -RDEPENDS_perl-module-math-bigint-calc += "perl-module-warnings" -RDEPENDS_perl-module-math-bigint-fastcalc += "perl-module-math-bigint-calc" -RDEPENDS_perl-module-math-bigint-fastcalc += "perl-module-strict" -RDEPENDS_perl-module-math-bigint-fastcalc += "perl-module-warnings" -RDEPENDS_perl-module-math-bigint-fastcalc += "perl-module-xsloader" -RDEPENDS_perl-module-math-bigint-lib += "perl-module-overload" -RDEPENDS_perl-module-math-bigint-lib += "perl-module-strict" -RDEPENDS_perl-module-math-bigint-lib += "perl-module-warnings" -RDEPENDS_perl-module-math-bigint += "perl-module-exporter" -RDEPENDS_perl-module-math-bigint += "perl-module-math-bigfloat" -RDEPENDS_perl-module-math-bigint += "perl-module-math-complex" -RDEPENDS_perl-module-math-bigint += "perl-module-overload" -RDEPENDS_perl-module-math-bigint += "perl-module-strict" -RDEPENDS_perl-module-math-bigint += "perl-module-warnings" -RDEPENDS_perl-module-math-bigint-trace += "perl-module-exporter" -RDEPENDS_perl-module-math-bigint-trace += "perl-module-math-bigint" -RDEPENDS_perl-module-math-bigint-trace += "perl-module-overload" -RDEPENDS_perl-module-math-bigint-trace += "perl-module-strict" -RDEPENDS_perl-module-math-bigint-trace += "perl-module-warnings" -RDEPENDS_perl-module-math-bigrat += "perl-module-math-bigfloat" -RDEPENDS_perl-module-math-bigrat += "perl-module-math-bigint" -RDEPENDS_perl-module-math-bigrat += "perl-module-overload" -RDEPENDS_perl-module-math-bigrat += "perl-module-strict" -RDEPENDS_perl-module-math-bigrat += "perl-module-warnings" -RDEPENDS_perl-module-math-complex += "perl-module-config" -RDEPENDS_perl-module-math-complex += "perl-module-exporter" -RDEPENDS_perl-module-math-complex += "perl-module-overload" -RDEPENDS_perl-module-math-complex += "perl-module-strict" -RDEPENDS_perl-module-math-complex += "perl-module-warnings" -RDEPENDS_perl-module-math-trig += "perl-module-exporter" -RDEPENDS_perl-module-math-trig += "perl-module-math-complex" -RDEPENDS_perl-module-math-trig += "perl-module-strict" -RDEPENDS_perl-module-memoize-anydbm-file += "perl-module-vars" -RDEPENDS_perl-module-memoize += "perl-module-config" -RDEPENDS_perl-module-memoize += "perl-module-exporter" -RDEPENDS_perl-module-memoize += "perl-module-strict" -RDEPENDS_perl-module-memoize += "perl-module-vars" -RDEPENDS_perl-module-memoize-sdbm-file += "perl-module-sdbm-file" -RDEPENDS_perl-module-memoize-storable += "perl-module-storable" -RDEPENDS_perl-module-mime-base64 += "perl-module-exporter" -RDEPENDS_perl-module-mime-base64 += "perl-module-strict" -RDEPENDS_perl-module-mime-base64 += "perl-module-vars" -RDEPENDS_perl-module-mime-base64 += "perl-module-xsloader" -RDEPENDS_perl-module-mime-quotedprint += "perl-module-exporter" -RDEPENDS_perl-module-mime-quotedprint += "perl-module-mime-base64" -RDEPENDS_perl-module-mime-quotedprint += "perl-module-strict" -RDEPENDS_perl-module-mime-quotedprint += "perl-module-vars" -RDEPENDS_perl-module-mro += "perl-module-strict" -RDEPENDS_perl-module-mro += "perl-module-warnings" -RDEPENDS_perl-module-mro += "perl-module-xsloader" -RDEPENDS_perl-module-net-cmd += "perl-module-constant" -RDEPENDS_perl-module-net-cmd += "perl-module-errno" -RDEPENDS_perl-module-net-cmd += "perl-module-exporter" -RDEPENDS_perl-module-net-cmd += "perl-module-strict" -RDEPENDS_perl-module-net-cmd += "perl-module-warnings" -RDEPENDS_perl-module-net-config += "perl-module-exporter" -RDEPENDS_perl-module-net-config += "perl-module-socket" -RDEPENDS_perl-module-net-config += "perl-module-strict" -RDEPENDS_perl-module-net-config += "perl-module-warnings" -RDEPENDS_perl-module-net-domain += "perl-module-exporter" -RDEPENDS_perl-module-net-domain += "perl-module-net-config" -RDEPENDS_perl-module-net-domain += "perl-module-posix" -RDEPENDS_perl-module-net-domain += "perl-module-socket" -RDEPENDS_perl-module-net-domain += "perl-module-strict" -RDEPENDS_perl-module-net-domain += "perl-module-warnings" -RDEPENDS_perl-module-net-ftp-a += "perl-module-net-ftp-dataconn" -RDEPENDS_perl-module-net-ftp-a += "perl-module-strict" -RDEPENDS_perl-module-net-ftp-a += "perl-module-warnings" -RDEPENDS_perl-module-net-ftp-dataconn += "perl-module-errno" -RDEPENDS_perl-module-net-ftp-dataconn += "perl-module-net-cmd" -RDEPENDS_perl-module-net-ftp-dataconn += "perl-module-strict" -RDEPENDS_perl-module-net-ftp-dataconn += "perl-module-warnings" -RDEPENDS_perl-module-net-ftp-e += "perl-module-net-ftp-i" -RDEPENDS_perl-module-net-ftp-e += "perl-module-strict" -RDEPENDS_perl-module-net-ftp-e += "perl-module-warnings" -RDEPENDS_perl-module-net-ftp-i += "perl-module-net-ftp-dataconn" -RDEPENDS_perl-module-net-ftp-i += "perl-module-strict" -RDEPENDS_perl-module-net-ftp-i += "perl-module-warnings" -RDEPENDS_perl-module-net-ftp-l += "perl-module-net-ftp-i" -RDEPENDS_perl-module-net-ftp-l += "perl-module-strict" -RDEPENDS_perl-module-net-ftp-l += "perl-module-warnings" -RDEPENDS_perl-module-net-ftp += "perl-module-constant" -RDEPENDS_perl-module-net-ftp += "perl-module-fcntl" -RDEPENDS_perl-module-net-ftp += "perl-module-file-basename" -RDEPENDS_perl-module-net-ftp += "perl-module-io-socket" -RDEPENDS_perl-module-net-ftp += "perl-module-io-socket-ip" -RDEPENDS_perl-module-net-ftp += "perl-module-net-cmd" -RDEPENDS_perl-module-net-ftp += "perl-module-net-config" -RDEPENDS_perl-module-net-ftp += "perl-module-net-ftp-a" -RDEPENDS_perl-module-net-ftp += "perl-module-net-netrc" -RDEPENDS_perl-module-net-ftp += "perl-module-socket" -RDEPENDS_perl-module-net-ftp += "perl-module-strict" -RDEPENDS_perl-module-net-ftp += "perl-module-time-local" -RDEPENDS_perl-module-net-ftp += "perl-module-warnings" -RDEPENDS_perl-module-net-hostent += "perl-module-class-struct" -RDEPENDS_perl-module-net-hostent += "perl-module-exporter" -RDEPENDS_perl-module-net-hostent += "perl-module-socket" -RDEPENDS_perl-module-net-hostent += "perl-module-strict" -RDEPENDS_perl-module-net-netent += "perl-module-class-struct" -RDEPENDS_perl-module-net-netent += "perl-module-exporter" -RDEPENDS_perl-module-net-netent += "perl-module-socket" -RDEPENDS_perl-module-net-netent += "perl-module-strict" -RDEPENDS_perl-module-net-netrc += "perl-module-filehandle" -RDEPENDS_perl-module-net-netrc += "perl-module-strict" -RDEPENDS_perl-module-net-netrc += "perl-module-warnings" -RDEPENDS_perl-module-net-nntp += "perl-module-io-socket" -RDEPENDS_perl-module-net-nntp += "perl-module-io-socket-ip" -RDEPENDS_perl-module-net-nntp += "perl-module-net-cmd" -RDEPENDS_perl-module-net-nntp += "perl-module-net-config" -RDEPENDS_perl-module-net-nntp += "perl-module-strict" -RDEPENDS_perl-module-net-nntp += "perl-module-time-local" -RDEPENDS_perl-module-net-nntp += "perl-module-warnings" -RDEPENDS_perl-module-net-ping += "perl-module-constant" -RDEPENDS_perl-module-net-ping += "perl-module-exporter" -RDEPENDS_perl-module-net-ping += "perl-module-fcntl" -RDEPENDS_perl-module-net-ping += "perl-module-filehandle" -RDEPENDS_perl-module-net-ping += "perl-module-io-socket-inet" -RDEPENDS_perl-module-net-ping += "perl-module-posix" -RDEPENDS_perl-module-net-ping += "perl-module-socket" -RDEPENDS_perl-module-net-ping += "perl-module-strict" -RDEPENDS_perl-module-net-ping += "perl-module-time-hires" -RDEPENDS_perl-module-net-pop3 += "perl-module-io-socket" -RDEPENDS_perl-module-net-pop3 += "perl-module-io-socket-ip" -RDEPENDS_perl-module-net-pop3 += "perl-module-mime-base64" -RDEPENDS_perl-module-net-pop3 += "perl-module-net-cmd" -RDEPENDS_perl-module-net-pop3 += "perl-module-net-config" -RDEPENDS_perl-module-net-pop3 += "perl-module-net-netrc" -RDEPENDS_perl-module-net-pop3 += "perl-module-strict" -RDEPENDS_perl-module-net-pop3 += "perl-module-warnings" -RDEPENDS_perl-module-net-protoent += "perl-module-class-struct" -RDEPENDS_perl-module-net-protoent += "perl-module-exporter" -RDEPENDS_perl-module-net-protoent += "perl-module-strict" -RDEPENDS_perl-module-net-servent += "perl-module-class-struct" -RDEPENDS_perl-module-net-servent += "perl-module-exporter" -RDEPENDS_perl-module-net-servent += "perl-module-strict" -RDEPENDS_perl-module-net-smtp += "perl-module-io-socket" -RDEPENDS_perl-module-net-smtp += "perl-module-io-socket-ip" -RDEPENDS_perl-module-net-smtp += "perl-module-mime-base64" -RDEPENDS_perl-module-net-smtp += "perl-module-net-cmd" -RDEPENDS_perl-module-net-smtp += "perl-module-net-config" -RDEPENDS_perl-module-net-smtp += "perl-module-socket" -RDEPENDS_perl-module-net-smtp += "perl-module-strict" -RDEPENDS_perl-module-net-smtp += "perl-module-warnings" -RDEPENDS_perl-module-net-time += "perl-module-exporter" -RDEPENDS_perl-module-net-time += "perl-module-io-select" -RDEPENDS_perl-module-net-time += "perl-module-io-socket" -RDEPENDS_perl-module-net-time += "perl-module-net-config" -RDEPENDS_perl-module-net-time += "perl-module-strict" -RDEPENDS_perl-module-net-time += "perl-module-warnings" -RDEPENDS_perl-module-next += "perl-module-overload" -RDEPENDS_perl-module-next += "perl-module-strict" -RDEPENDS_perl-module-next += "perl-module-warnings" -RDEPENDS_perl-module-ok += "perl-module-strict" -RDEPENDS_perl-module-ok += "perl-module-test-more" -RDEPENDS_perl-module-opcode += "perl-module-exporter" -RDEPENDS_perl-module-opcode += "perl-module-strict" -RDEPENDS_perl-module-opcode += "perl-module-subs" -RDEPENDS_perl-module-opcode += "perl-module-xsloader" -RDEPENDS_perl-module-open += "perl-module-encode" -RDEPENDS_perl-module-open += "perl-module-encoding" -RDEPENDS_perl-module-open += "perl-module-warnings" -RDEPENDS_perl-module-o += "perl-module-b" -RDEPENDS_perl-module-ops += "perl-module-opcode" -RDEPENDS_perl-module-overloading += "perl-module-overload-numbers" -RDEPENDS_perl-module-overloading += "perl-module-warnings" -RDEPENDS_perl-module-overload += "perl-module-mro" -RDEPENDS_perl-module-overload += "perl-module-warnings-register" -RDEPENDS_perl-module-params-check += "perl-module-exporter" -RDEPENDS_perl-module-params-check += "perl-module-locale-maketext-simple" -RDEPENDS_perl-module-params-check += "perl-module-strict" -RDEPENDS_perl-module-params-check += "perl-module-vars" -RDEPENDS_perl-module-parent += "perl-module-strict" -RDEPENDS_perl-module-perlfaq += "perl-module-strict" -RDEPENDS_perl-module-perlfaq += "perl-module-warnings" -RDEPENDS_perl-module-perlio-encoding += "perl-module-strict" -RDEPENDS_perl-module-perlio-encoding += "perl-module-xsloader" -RDEPENDS_perl-module-perlio-mmap += "perl-module-strict" -RDEPENDS_perl-module-perlio-mmap += "perl-module-warnings" -RDEPENDS_perl-module-perlio-mmap += "perl-module-xsloader" -RDEPENDS_perl-module-perlio-scalar += "perl-module-xsloader" -RDEPENDS_perl-module-perlio-via += "perl-module-xsloader" -RDEPENDS_perl-module-perlio-via-quotedprint += "perl-module-mime-quotedprint" -RDEPENDS_perl-module-perlio-via-quotedprint += "perl-module-strict" -RDEPENDS_perl-module-pod-checker += "perl-module-base" -RDEPENDS_perl-module-pod-checker += "perl-module-exporter" -RDEPENDS_perl-module-pod-checker += "perl-module-strict" -RDEPENDS_perl-module-pod-checker += "perl-module-warnings" -RDEPENDS_perl-module-pod-escapes += "perl-module-exporter" -RDEPENDS_perl-module-pod-escapes += "perl-module-strict" -RDEPENDS_perl-module-pod-escapes += "perl-module-vars" -RDEPENDS_perl-module-pod-escapes += "perl-module-warnings" -RDEPENDS_perl-module-pod-functions += "perl-module-exporter" -RDEPENDS_perl-module-pod-functions += "perl-module-strict" -RDEPENDS_perl-module-pod-man += "perl-module-file-basename" -RDEPENDS_perl-module-pod-man += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-man += "perl-module-strict" -RDEPENDS_perl-module-pod-man += "perl-module-subs" -RDEPENDS_perl-module-pod-man += "perl-module-vars" -RDEPENDS_perl-module-pod-man += "perl-module-warnings" -RDEPENDS_perl-module-pod-parselink += "perl-module-exporter" -RDEPENDS_perl-module-pod-parselink += "perl-module-strict" -RDEPENDS_perl-module-pod-parselink += "perl-module-vars" -RDEPENDS_perl-module-pod-parselink += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-baseto += "perl-module-config" -RDEPENDS_perl-module-pod-perldoc-baseto += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-baseto += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-baseto += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-getoptsoo += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-getoptsoo += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc += "perl-module-config" -RDEPENDS_perl-module-pod-perldoc += "perl-module-encode" -RDEPENDS_perl-module-pod-perldoc += "perl-module-fcntl" -RDEPENDS_perl-module-pod-perldoc += "perl-module-file-basename" -RDEPENDS_perl-module-pod-perldoc += "perl-module-file-temp" -RDEPENDS_perl-module-pod-perldoc += "perl-module-pod-perldoc-getoptsoo" -RDEPENDS_perl-module-pod-perldoc += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc += "perl-module-text-parsewords" -RDEPENDS_perl-module-pod-perldoc += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-toansi += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-toansi += "perl-module-pod-text-color" -RDEPENDS_perl-module-pod-perldoc-toansi += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-toansi += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-toansi += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-tochecker += "perl-module-pod-checker" -RDEPENDS_perl-module-pod-perldoc-tochecker += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-tochecker += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-tochecker += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-encode" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-io-handle" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-io-select" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-ipc-open3" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-pod-man" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-pod-perldoc-topod" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-toman += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-tonroff += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-tonroff += "perl-module-pod-man" -RDEPENDS_perl-module-pod-perldoc-tonroff += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-tonroff += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-tonroff += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-topod += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-topod += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-topod += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-topod += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-tortf += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-tortf += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-tortf += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-tortf += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-toterm += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-toterm += "perl-module-pod-text-termcap" -RDEPENDS_perl-module-pod-perldoc-toterm += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-toterm += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-toterm += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-totext += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-totext += "perl-module-pod-text" -RDEPENDS_perl-module-pod-perldoc-totext += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-totext += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-totext += "perl-module-warnings" -RDEPENDS_perl-module-pod-perldoc-toxml += "perl-module-parent" -RDEPENDS_perl-module-pod-perldoc-toxml += "perl-module-strict" -RDEPENDS_perl-module-pod-perldoc-toxml += "perl-module-vars" -RDEPENDS_perl-module-pod-perldoc-toxml += "perl-module-warnings" -RDEPENDS_perl-module-pod-simple-blackbox += "perl-module-if" -RDEPENDS_perl-module-pod-simple-blackbox += "perl-module-integer" -RDEPENDS_perl-module-pod-simple-blackbox += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-blackbox += "perl-module-pod-simple-transcode" -RDEPENDS_perl-module-pod-simple-blackbox += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-blackbox += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-checker += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-checker += "perl-module-pod-simple-methody" -RDEPENDS_perl-module-pod-simple-checker += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-checker += "perl-module-text-wrap" -RDEPENDS_perl-module-pod-simple-checker += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-debug += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-debug += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-debug += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-dumpastext += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-dumpastext += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-dumpasxml += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-dumpasxml += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-dumpasxml += "perl-module-text-wrap" -RDEPENDS_perl-module-pod-simple-justpod += "perl-module-pod-simple-methody" -RDEPENDS_perl-module-pod-simple-justpod += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-justpod += "perl-module-warnings" -RDEPENDS_perl-module-pod-simple-linksection += "perl-module-overload" -RDEPENDS_perl-module-pod-simple-linksection += "perl-module-pod-simple-blackbox" -RDEPENDS_perl-module-pod-simple-linksection += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-linksection += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-methody += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-methody += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-methody += "perl-module-vars" -RDEPENDS_perl-module-pod-simple += "perl-module-integer" -RDEPENDS_perl-module-pod-simple += "perl-module-pod-escapes" -RDEPENDS_perl-module-pod-simple += "perl-module-pod-simple-blackbox" -RDEPENDS_perl-module-pod-simple += "perl-module-pod-simple-linksection" -RDEPENDS_perl-module-pod-simple += "perl-module-pod-simple-tiedoutfh" -RDEPENDS_perl-module-pod-simple += "perl-module-strict" -RDEPENDS_perl-module-pod-simple += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-progress += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-pullparserendtoken += "perl-module-pod-simple-pullparsertoken" -RDEPENDS_perl-module-pod-simple-pullparserendtoken += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-pullparserendtoken += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-pullparser += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparserendtoken" -RDEPENDS_perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparserstarttoken" -RDEPENDS_perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparsertexttoken" -RDEPENDS_perl-module-pod-simple-pullparser += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-pullparserstarttoken += "perl-module-pod-simple-pullparsertoken" -RDEPENDS_perl-module-pod-simple-pullparserstarttoken += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-pullparserstarttoken += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-pullparsertexttoken += "perl-module-pod-simple-pullparsertoken" -RDEPENDS_perl-module-pod-simple-pullparsertexttoken += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-pullparsertexttoken += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-pullparsertoken += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-rtf += "perl-module-if" -RDEPENDS_perl-module-pod-simple-rtf += "perl-module-integer" -RDEPENDS_perl-module-pod-simple-rtf += "perl-module-pod-simple-pullparser" -RDEPENDS_perl-module-pod-simple-rtf += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-rtf += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-search += "perl-module-config" -RDEPENDS_perl-module-pod-simple-search += "perl-module-cwd" -RDEPENDS_perl-module-pod-simple-search += "perl-module-file-basename" -RDEPENDS_perl-module-pod-simple-search += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-search += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-simpletree += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-simpletree += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-simpletree += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-textcontent += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-textcontent += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-textcontent += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-text += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-text += "perl-module-pod-simple-methody" -RDEPENDS_perl-module-pod-simple-text += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-text += "perl-module-text-wrap" -RDEPENDS_perl-module-pod-simple-text += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-tiedoutfh += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-tiedoutfh += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-transcodedumb += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-transcodedumb += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-transcode += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-transcode += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-transcodesmart += "perl-module-encode" -RDEPENDS_perl-module-pod-simple-transcodesmart += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-transcodesmart += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-transcodesmart += "perl-module-vars" -RDEPENDS_perl-module-pod-simple-xmloutstream += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-simple-xmloutstream += "perl-module-strict" -RDEPENDS_perl-module-pod-simple-xmloutstream += "perl-module-vars" -RDEPENDS_perl-module-pod-text-color += "perl-module-pod-text" -RDEPENDS_perl-module-pod-text-color += "perl-module-strict" -RDEPENDS_perl-module-pod-text-color += "perl-module-term-ansicolor" -RDEPENDS_perl-module-pod-text-color += "perl-module-vars" -RDEPENDS_perl-module-pod-text-color += "perl-module-warnings" -RDEPENDS_perl-module-pod-text-overstrike += "perl-module-pod-text" -RDEPENDS_perl-module-pod-text-overstrike += "perl-module-strict" -RDEPENDS_perl-module-pod-text-overstrike += "perl-module-vars" -RDEPENDS_perl-module-pod-text-overstrike += "perl-module-warnings" -RDEPENDS_perl-module-pod-text += "perl-module-encode" -RDEPENDS_perl-module-pod-text += "perl-module-exporter" -RDEPENDS_perl-module-pod-text += "perl-module-pod-simple" -RDEPENDS_perl-module-pod-text += "perl-module-strict" -RDEPENDS_perl-module-pod-text += "perl-module-vars" -RDEPENDS_perl-module-pod-text += "perl-module-warnings" -RDEPENDS_perl-module-pod-text-termcap += "perl-module-pod-text" -RDEPENDS_perl-module-pod-text-termcap += "perl-module-posix" -RDEPENDS_perl-module-pod-text-termcap += "perl-module-strict" -RDEPENDS_perl-module-pod-text-termcap += "perl-module-term-cap" -RDEPENDS_perl-module-pod-text-termcap += "perl-module-vars" -RDEPENDS_perl-module-pod-text-termcap += "perl-module-warnings" -RDEPENDS_perl-module-pod-usage += "perl-module-config" -RDEPENDS_perl-module-pod-usage += "perl-module-exporter" -RDEPENDS_perl-module-pod-usage += "perl-module-strict" -RDEPENDS_perl-module-pod-usage += "perl-module-vars" -RDEPENDS_perl-module-posix += "perl-module-exporter" -RDEPENDS_perl-module-posix += "perl-module-fcntl" -RDEPENDS_perl-module-posix += "perl-module-strict" -RDEPENDS_perl-module-posix += "perl-module-tie-hash" -RDEPENDS_perl-module-posix += "perl-module-warnings" -RDEPENDS_perl-module-posix += "perl-module-xsloader" -RDEPENDS_perl-module-re += "perl-module-exporter" -RDEPENDS_perl-module-re += "perl-module-strict" -RDEPENDS_perl-module-re += "perl-module-term-cap" -RDEPENDS_perl-module-re += "perl-module-warnings" -RDEPENDS_perl-module-re += "perl-module-xsloader" -RDEPENDS_perl-module-safe += "perl-module-b" -RDEPENDS_perl-module-safe += "perl-module-opcode" -RDEPENDS_perl-module-safe += "perl-module-strict" -RDEPENDS_perl-module-safe += "perl-module-utf8" -RDEPENDS_perl-module-sdbm-file += "perl-module-exporter" -RDEPENDS_perl-module-sdbm-file += "perl-module-strict" -RDEPENDS_perl-module-sdbm-file += "perl-module-tie-hash" -RDEPENDS_perl-module-sdbm-file += "perl-module-warnings" -RDEPENDS_perl-module-sdbm-file += "perl-module-xsloader" -RDEPENDS_perl-module-search-dict += "perl-module-exporter" -RDEPENDS_perl-module-search-dict += "perl-module-feature" -RDEPENDS_perl-module-search-dict += "perl-module-strict" -RDEPENDS_perl-module-selfloader += "perl-module-exporter" -RDEPENDS_perl-module-selfloader += "perl-module-io-handle" -RDEPENDS_perl-module-selfloader += "perl-module-strict" -RDEPENDS_perl-module-socket += "perl-module-exporter" -RDEPENDS_perl-module-socket += "perl-module-strict" -RDEPENDS_perl-module-socket += "perl-module-warnings-register" -RDEPENDS_perl-module-socket += "perl-module-xsloader" -RDEPENDS_perl-module-sort += "perl-module-strict" -RDEPENDS_perl-module-storable += "perl-module-exporter" -RDEPENDS_perl-module-storable += "perl-module-io-file" -RDEPENDS_perl-module-sub-util += "perl-module-exporter" -RDEPENDS_perl-module-sub-util += "perl-module-list-util" -RDEPENDS_perl-module-sub-util += "perl-module-strict" -RDEPENDS_perl-module-sub-util += "perl-module-warnings" -RDEPENDS_perl-module-sys-hostname += "perl-module-exporter" -RDEPENDS_perl-module-sys-hostname += "perl-module-posix" -RDEPENDS_perl-module-sys-hostname += "perl-module-strict" -RDEPENDS_perl-module-sys-hostname += "perl-module-warnings" -RDEPENDS_perl-module-sys-hostname += "perl-module-xsloader" -RDEPENDS_perl-module-sys-syslog += "perl-module-config" -RDEPENDS_perl-module-sys-syslog += "perl-module-constant" -RDEPENDS_perl-module-sys-syslog += "perl-module-dynaloader" -RDEPENDS_perl-module-sys-syslog += "perl-module-exporter" -RDEPENDS_perl-module-sys-syslog += "perl-module-fcntl" -RDEPENDS_perl-module-sys-syslog += "perl-module-file-basename" -RDEPENDS_perl-module-sys-syslog += "perl-module-posix" -RDEPENDS_perl-module-sys-syslog += "perl-module-socket" -RDEPENDS_perl-module-sys-syslog += "perl-module-strict" -RDEPENDS_perl-module-sys-syslog += "perl-module-sys-hostname" -RDEPENDS_perl-module-sys-syslog += "perl-module-vars" -RDEPENDS_perl-module-sys-syslog += "perl-module-warnings" -RDEPENDS_perl-module-sys-syslog += "perl-module-warnings-register" -RDEPENDS_perl-module-sys-syslog += "perl-module-xsloader" -RDEPENDS_perl-module-tap-base += "perl-module-base" -RDEPENDS_perl-module-tap-base += "perl-module-constant" -RDEPENDS_perl-module-tap-base += "perl-module-strict" -RDEPENDS_perl-module-tap-base += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-base += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-base += "perl-module-posix" -RDEPENDS_perl-module-tap-formatter-base += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-base += "perl-module-tap-formatter-color" -RDEPENDS_perl-module-tap-formatter-base += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-color += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-color += "perl-module-constant" -RDEPENDS_perl-module-tap-formatter-color += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-color += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-console-parallelsession += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-console-parallelsession += "perl-module-constant" -RDEPENDS_perl-module-tap-formatter-console-parallelsession += "perl-module-file-path" -RDEPENDS_perl-module-tap-formatter-console-parallelsession += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-console-parallelsession += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-console += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-console += "perl-module-posix" -RDEPENDS_perl-module-tap-formatter-console += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-console += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-console-session += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-console-session += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-console-session += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-file += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-file += "perl-module-posix" -RDEPENDS_perl-module-tap-formatter-file += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-file += "perl-module-tap-formatter-file-session" -RDEPENDS_perl-module-tap-formatter-file += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-file-session += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-file-session += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-file-session += "perl-module-warnings" -RDEPENDS_perl-module-tap-formatter-session += "perl-module-base" -RDEPENDS_perl-module-tap-formatter-session += "perl-module-strict" -RDEPENDS_perl-module-tap-formatter-session += "perl-module-warnings" -RDEPENDS_perl-module-tap-harness-env += "perl-module-constant" -RDEPENDS_perl-module-tap-harness-env += "perl-module-strict" -RDEPENDS_perl-module-tap-harness-env += "perl-module-tap-object" -RDEPENDS_perl-module-tap-harness-env += "perl-module-text-parsewords" -RDEPENDS_perl-module-tap-harness-env += "perl-module-warnings" -RDEPENDS_perl-module-tap-harness += "perl-module-base" -RDEPENDS_perl-module-tap-harness += "perl-module-file-path" -RDEPENDS_perl-module-tap-harness += "perl-module-io-handle" -RDEPENDS_perl-module-tap-harness += "perl-module-strict" -RDEPENDS_perl-module-tap-harness += "perl-module-warnings" -RDEPENDS_perl-module-tap-object += "perl-module-strict" -RDEPENDS_perl-module-tap-object += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-aggregator += "perl-module-base" -RDEPENDS_perl-module-tap-parser-aggregator += "perl-module-benchmark" -RDEPENDS_perl-module-tap-parser-aggregator += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-aggregator += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-grammar += "perl-module-base" -RDEPENDS_perl-module-tap-parser-grammar += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-grammar += "perl-module-tap-parser-resultfactory" -RDEPENDS_perl-module-tap-parser-grammar += "perl-module-tap-parser-yamlish-reader" -RDEPENDS_perl-module-tap-parser-grammar += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-iterator-array += "perl-module-base" -RDEPENDS_perl-module-tap-parser-iterator-array += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-iterator-array += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-iteratorfactory += "perl-module-base" -RDEPENDS_perl-module-tap-parser-iteratorfactory += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-iteratorfactory += "perl-module-file-basename" -RDEPENDS_perl-module-tap-parser-iteratorfactory += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-iteratorfactory += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-iterator += "perl-module-base" -RDEPENDS_perl-module-tap-parser-iterator += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-iterator += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-iterator-process += "perl-module-base" -RDEPENDS_perl-module-tap-parser-iterator-process += "perl-module-config" -RDEPENDS_perl-module-tap-parser-iterator-process += "perl-module-io-handle" -RDEPENDS_perl-module-tap-parser-iterator-process += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-iterator-process += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-iterator-stream += "perl-module-base" -RDEPENDS_perl-module-tap-parser-iterator-stream += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-iterator-stream += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-multiplexer += "perl-module-base" -RDEPENDS_perl-module-tap-parser-multiplexer += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-multiplexer += "perl-module-io-select" -RDEPENDS_perl-module-tap-parser-multiplexer += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-multiplexer += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser += "perl-module-base" -RDEPENDS_perl-module-tap-parser += "perl-module-strict" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-grammar" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-iterator" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-iteratorfactory" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-result" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-resultfactory" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-source" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-executable" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-file" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-handle" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-perl" -RDEPENDS_perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-rawtap" -RDEPENDS_perl-module-tap-parser += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-bailout += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-bailout += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-bailout += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-comment += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-comment += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-comment += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-base" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-bailout" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-comment" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-plan" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-pragma" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-test" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-unknown" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-version" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-yaml" -RDEPENDS_perl-module-tap-parser-resultfactory += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-plan += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-plan += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-plan += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-pragma += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-pragma += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-pragma += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-test += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-test += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-test += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-unknown += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-unknown += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-unknown += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-version += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-version += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-version += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-result-yaml += "perl-module-base" -RDEPENDS_perl-module-tap-parser-result-yaml += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-result-yaml += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-scheduler-job += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-scheduler-job += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-scheduler += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-scheduler += "perl-module-tap-parser-scheduler-job" -RDEPENDS_perl-module-tap-parser-scheduler += "perl-module-tap-parser-scheduler-spinner" -RDEPENDS_perl-module-tap-parser-scheduler += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-scheduler-spinner += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-scheduler-spinner += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-sourcehandler-executable += "perl-module-base" -RDEPENDS_perl-module-tap-parser-sourcehandler-executable += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-sourcehandler-executable += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-sourcehandler-executable += "perl-module-tap-parser-iteratorfactory" -RDEPENDS_perl-module-tap-parser-sourcehandler-executable += "perl-module-tap-parser-iterator-process" -RDEPENDS_perl-module-tap-parser-sourcehandler-executable += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-sourcehandler-file += "perl-module-base" -RDEPENDS_perl-module-tap-parser-sourcehandler-file += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-sourcehandler-file += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-sourcehandler-file += "perl-module-tap-parser-iteratorfactory" -RDEPENDS_perl-module-tap-parser-sourcehandler-file += "perl-module-tap-parser-iterator-stream" -RDEPENDS_perl-module-tap-parser-sourcehandler-file += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-sourcehandler-handle += "perl-module-base" -RDEPENDS_perl-module-tap-parser-sourcehandler-handle += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-sourcehandler-handle += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-sourcehandler-handle += "perl-module-tap-parser-iteratorfactory" -RDEPENDS_perl-module-tap-parser-sourcehandler-handle += "perl-module-tap-parser-iterator-stream" -RDEPENDS_perl-module-tap-parser-sourcehandler-handle += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-sourcehandler += "perl-module-base" -RDEPENDS_perl-module-tap-parser-sourcehandler += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-sourcehandler += "perl-module-tap-parser-iterator" -RDEPENDS_perl-module-tap-parser-sourcehandler += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-base" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-config" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-tap-parser-iteratorfactory" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-tap-parser-iterator-process" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-text-parsewords" -RDEPENDS_perl-module-tap-parser-sourcehandler-perl += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-sourcehandler-rawtap += "perl-module-base" -RDEPENDS_perl-module-tap-parser-sourcehandler-rawtap += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-sourcehandler-rawtap += "perl-module-tap-parser-iterator-array" -RDEPENDS_perl-module-tap-parser-sourcehandler-rawtap += "perl-module-tap-parser-iteratorfactory" -RDEPENDS_perl-module-tap-parser-sourcehandler-rawtap += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-source += "perl-module-base" -RDEPENDS_perl-module-tap-parser-source += "perl-module-constant" -RDEPENDS_perl-module-tap-parser-source += "perl-module-file-basename" -RDEPENDS_perl-module-tap-parser-source += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-source += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-yamlish-reader += "perl-module-base" -RDEPENDS_perl-module-tap-parser-yamlish-reader += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-yamlish-reader += "perl-module-warnings" -RDEPENDS_perl-module-tap-parser-yamlish-writer += "perl-module-base" -RDEPENDS_perl-module-tap-parser-yamlish-writer += "perl-module-strict" -RDEPENDS_perl-module-tap-parser-yamlish-writer += "perl-module-warnings" -RDEPENDS_perl-module-term-ansicolor += "perl-module-exporter" -RDEPENDS_perl-module-term-ansicolor += "perl-module-strict" -RDEPENDS_perl-module-term-ansicolor += "perl-module-warnings" -RDEPENDS_perl-module-term-cap += "perl-module-strict" -RDEPENDS_perl-module-term-cap += "perl-module-vars" -RDEPENDS_perl-module-term-complete += "perl-module-exporter" -RDEPENDS_perl-module-term-complete += "perl-module-strict" -RDEPENDS_perl-module-term-readline += "perl-module-strict" -RDEPENDS_perl-module-term-readline += "perl-module-term-cap" -RDEPENDS_perl-module-test-builder-formatter += "perl-module-strict" -RDEPENDS_perl-module-test-builder-formatter += "perl-module-warnings" -RDEPENDS_perl-module-test-builder-module += "perl-module-exporter" -RDEPENDS_perl-module-test-builder-module += "perl-module-strict" -RDEPENDS_perl-module-test-builder-module += "perl-module-test-builder" -RDEPENDS_perl-module-test-builder += "perl-module-data-dumper" -RDEPENDS_perl-module-test-builder += "perl-module-overload" -RDEPENDS_perl-module-test-builder += "perl-module-strict" -RDEPENDS_perl-module-test-builder += "perl-module-test-builder-formatter" -RDEPENDS_perl-module-test-builder += "perl-module-test-builder-tododiag" -RDEPENDS_perl-module-test-builder += "perl-module-warnings" -RDEPENDS_perl-module-test-builder-tester-color += "perl-module-strict" -RDEPENDS_perl-module-test-builder-tester-color += "perl-module-test-builder-tester" -RDEPENDS_perl-module-test-builder-tester += "perl-module-exporter" -RDEPENDS_perl-module-test-builder-tester += "perl-module-strict" -RDEPENDS_perl-module-test-builder-tester += "perl-module-test-builder" -RDEPENDS_perl-module-test-builder-tododiag += "perl-module-strict" -RDEPENDS_perl-module-test-builder-tododiag += "perl-module-warnings" -RDEPENDS_perl-module-test-harness += "perl-module-base" -RDEPENDS_perl-module-test-harness += "perl-module-config" -RDEPENDS_perl-module-test-harness += "perl-module-constant" -RDEPENDS_perl-module-test-harness += "perl-module-strict" -RDEPENDS_perl-module-test-harness += "perl-module-tap-harness" -RDEPENDS_perl-module-test-harness += "perl-module-tap-parser-aggregator" -RDEPENDS_perl-module-test-harness += "perl-module-tap-parser-source" -RDEPENDS_perl-module-test-harness += "perl-module-tap-parser-sourcehandler-perl" -RDEPENDS_perl-module-test-harness += "perl-module-text-parsewords" -RDEPENDS_perl-module-test-harness += "perl-module-warnings" -RDEPENDS_perl-module-test-more += "perl-module-strict" -RDEPENDS_perl-module-test-more += "perl-module-test-builder-module" -RDEPENDS_perl-module-test-more += "perl-module-warnings" -RDEPENDS_perl-module-test += "perl-module-exporter" -RDEPENDS_perl-module-test += "perl-module-file-temp" -RDEPENDS_perl-module-test += "perl-module-strict" -RDEPENDS_perl-module-test-simple += "perl-module-strict" -RDEPENDS_perl-module-test-simple += "perl-module-test-builder-module" -RDEPENDS_perl-module-test-tester-capture += "perl-module-config" -RDEPENDS_perl-module-test-tester-capture += "perl-module-strict" -RDEPENDS_perl-module-test-tester-capture += "perl-module-test-builder" -RDEPENDS_perl-module-test-tester-capture += "perl-module-vars" -RDEPENDS_perl-module-test-tester-capturerunner += "perl-module-exporter" -RDEPENDS_perl-module-test-tester-capturerunner += "perl-module-strict" -RDEPENDS_perl-module-test-tester-capturerunner += "perl-module-test-tester-capture" -RDEPENDS_perl-module-test-tester-delegate += "perl-module-strict" -RDEPENDS_perl-module-test-tester-delegate += "perl-module-vars" -RDEPENDS_perl-module-test-tester-delegate += "perl-module-warnings" -RDEPENDS_perl-module-test-tester += "perl-module-exporter" -RDEPENDS_perl-module-test-tester += "perl-module-strict" -RDEPENDS_perl-module-test-tester += "perl-module-test-builder" -RDEPENDS_perl-module-test-tester += "perl-module-test-tester-capturerunner" -RDEPENDS_perl-module-test-tester += "perl-module-test-tester-delegate" -RDEPENDS_perl-module-test-tester += "perl-module-vars" -RDEPENDS_perl-module-text-abbrev += "perl-module-exporter" -RDEPENDS_perl-module-text-balanced += "perl-module-exporter" -RDEPENDS_perl-module-text-balanced += "perl-module-overload" -RDEPENDS_perl-module-text-balanced += "perl-module-selfloader" -RDEPENDS_perl-module-text-balanced += "perl-module-strict" -RDEPENDS_perl-module-text-balanced += "perl-module-vars" -RDEPENDS_perl-module-text-parsewords += "perl-module-exporter" -RDEPENDS_perl-module-text-parsewords += "perl-module-strict" -RDEPENDS_perl-module-text-tabs += "perl-module-exporter" -RDEPENDS_perl-module-text-tabs += "perl-module-strict" -RDEPENDS_perl-module-text-tabs += "perl-module-vars" -RDEPENDS_perl-module-text-wrap += "perl-module-exporter" -RDEPENDS_perl-module-text-wrap += "perl-module-re" -RDEPENDS_perl-module-text-wrap += "perl-module-strict" -RDEPENDS_perl-module-text-wrap += "perl-module-text-tabs" -RDEPENDS_perl-module-text-wrap += "perl-module-vars" -RDEPENDS_perl-module-text-wrap += "perl-module-warnings-register" -RDEPENDS_perl-module-thread += "perl-module-config" -RDEPENDS_perl-module-thread += "perl-module-exporter" -RDEPENDS_perl-module-thread += "perl-module-strict" -RDEPENDS_perl-module-thread += "perl-module-threads" -RDEPENDS_perl-module-thread += "perl-module-threads-shared" -RDEPENDS_perl-module-thread += "perl-module-warnings" -RDEPENDS_perl-module-thread-queue += "perl-module-strict" -RDEPENDS_perl-module-thread-queue += "perl-module-threads-shared" -RDEPENDS_perl-module-thread-queue += "perl-module-warnings" -RDEPENDS_perl-module-thread-semaphore += "perl-module-strict" -RDEPENDS_perl-module-thread-semaphore += "perl-module-threads-shared" -RDEPENDS_perl-module-thread-semaphore += "perl-module-warnings" -RDEPENDS_perl-module-threads += "perl-module-config" -RDEPENDS_perl-module-threads += "perl-module-overload" -RDEPENDS_perl-module-threads += "perl-module-strict" -RDEPENDS_perl-module-threads += "perl-module-warnings" -RDEPENDS_perl-module-threads += "perl-module-xsloader" -RDEPENDS_perl-module-threads-shared += "perl-module-config" -RDEPENDS_perl-module-threads-shared += "perl-module-strict" -RDEPENDS_perl-module-threads-shared += "perl-module-warnings" -RDEPENDS_perl-module-threads-shared += "perl-module-xsloader" -RDEPENDS_perl-module-tie-array += "perl-module-strict" -RDEPENDS_perl-module-tie-file += "perl-module-fcntl" -RDEPENDS_perl-module-tie-file += "perl-module-posix" -RDEPENDS_perl-module-tie-file += "perl-module-strict" -RDEPENDS_perl-module-tie-file += "perl-module-warnings" -RDEPENDS_perl-module-tie-handle += "perl-module-tie-stdhandle" -RDEPENDS_perl-module-tie-handle += "perl-module-warnings-register" -RDEPENDS_perl-module-tie-hash-namedcapture += "perl-module-strict" -RDEPENDS_perl-module-tie-hash += "perl-module-warnings-register" -RDEPENDS_perl-module-tie-memoize += "perl-module-strict" -RDEPENDS_perl-module-tie-memoize += "perl-module-tie-hash" -RDEPENDS_perl-module-tie-refhash += "perl-module-config" -RDEPENDS_perl-module-tie-refhash += "perl-module-overload" -RDEPENDS_perl-module-tie-refhash += "perl-module-strict" -RDEPENDS_perl-module-tie-refhash += "perl-module-tie-hash" -RDEPENDS_perl-module-tie-refhash += "perl-module-vars" -RDEPENDS_perl-module-tie-scalar += "perl-module-warnings-register" -RDEPENDS_perl-module-tie-stdhandle += "perl-module-strict" -RDEPENDS_perl-module-tie-stdhandle += "perl-module-tie-handle" -RDEPENDS_perl-module-tie-substrhash += "perl-module-integer" -RDEPENDS_perl-module-time-gmtime += "perl-module-exporter" -RDEPENDS_perl-module-time-gmtime += "perl-module-strict" -RDEPENDS_perl-module-time-gmtime += "perl-module-time-tm" -RDEPENDS_perl-module-time-hires += "perl-module-exporter" -RDEPENDS_perl-module-time-hires += "perl-module-strict" -RDEPENDS_perl-module-time-hires += "perl-module-xsloader" -RDEPENDS_perl-module-time-local += "perl-module-config" -RDEPENDS_perl-module-time-local += "perl-module-constant" -RDEPENDS_perl-module-time-local += "perl-module-exporter" -RDEPENDS_perl-module-time-local += "perl-module-parent" -RDEPENDS_perl-module-time-local += "perl-module-strict" -RDEPENDS_perl-module-time-localtime += "perl-module-exporter" -RDEPENDS_perl-module-time-localtime += "perl-module-strict" -RDEPENDS_perl-module-time-localtime += "perl-module-time-tm" -RDEPENDS_perl-module-time-piece += "perl-module-constant" -RDEPENDS_perl-module-time-piece += "perl-module-exporter" -RDEPENDS_perl-module-time-piece += "perl-module-integer" -RDEPENDS_perl-module-time-piece += "perl-module-overload" -RDEPENDS_perl-module-time-piece += "perl-module-strict" -RDEPENDS_perl-module-time-piece += "perl-module-time-local" -RDEPENDS_perl-module-time-piece += "perl-module-time-seconds" -RDEPENDS_perl-module-time-piece += "perl-module-xsloader" -RDEPENDS_perl-module-time-seconds += "perl-module-constant" -RDEPENDS_perl-module-time-seconds += "perl-module-exporter" -RDEPENDS_perl-module-time-seconds += "perl-module-overload" -RDEPENDS_perl-module-time-seconds += "perl-module-strict" -RDEPENDS_perl-module-time-tm += "perl-module-class-struct" -RDEPENDS_perl-module-time-tm += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-big5 += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-big5 += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-cjk-gb2312 += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-gb2312 += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-cjk-jisx0208 += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-jisx0208 += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-cjk-korean += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-korean += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-cjk-pinyin += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-pinyin += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-cjk-stroke += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-stroke += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-cjk-zhuyin += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-cjk-zhuyin += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate-locale += "perl-module-base" -RDEPENDS_perl-module-unicode-collate-locale += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate-locale += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate += "perl-module-constant" -RDEPENDS_perl-module-unicode-collate += "perl-module-strict" -RDEPENDS_perl-module-unicode-collate += "perl-module-warnings" -RDEPENDS_perl-module-unicode-collate += "perl-module-xsloader" -RDEPENDS_perl-module-unicode-normalize += "perl-module-exporter" -RDEPENDS_perl-module-unicode-normalize += "perl-module-strict" -RDEPENDS_perl-module-unicode-normalize += "perl-module-warnings" -RDEPENDS_perl-module-unicode-normalize += "perl-module-xsloader" -RDEPENDS_perl-module-unicode-ucd += "perl-module-charnames" -RDEPENDS_perl-module-unicode-ucd += "perl-module-exporter" -RDEPENDS_perl-module-unicode-ucd += "perl-module-feature" -RDEPENDS_perl-module-unicode-ucd += "perl-module-if" -RDEPENDS_perl-module-unicode-ucd += "perl-module-integer" -RDEPENDS_perl-module-unicode-ucd += "perl-module-re" -RDEPENDS_perl-module-unicode-ucd += "perl-module-strict" -RDEPENDS_perl-module-unicode-ucd += "perl-module-unicode-normalize" -RDEPENDS_perl-module-unicode-ucd += "perl-module-warnings" -RDEPENDS_perl-module-user-grent += "perl-module-class-struct" -RDEPENDS_perl-module-user-grent += "perl-module-exporter" -RDEPENDS_perl-module-user-grent += "perl-module-strict" -RDEPENDS_perl-module-user-pwent += "perl-module-class-struct" -RDEPENDS_perl-module-user-pwent += "perl-module-config" -RDEPENDS_perl-module-user-pwent += "perl-module-exporter" -RDEPENDS_perl-module-user-pwent += "perl-module-strict" -RDEPENDS_perl-module-user-pwent += "perl-module-warnings" -RDEPENDS_perl-module-version += "perl-module-strict" -RDEPENDS_perl-module-version += "perl-module-version-regex" -RDEPENDS_perl-module-version += "perl-module-warnings-register" -RDEPENDS_perl-module-version-regex += "perl-module-strict" -RDEPENDS_perl-module-xsloader += "perl-module-dynaloader" +RDEPENDS:perl-module-anydbm-file += "perl-module-strict" +RDEPENDS:perl-module-anydbm-file += "perl-module-warnings" +RDEPENDS:perl-module-app-cpan += "perl-module-config" +RDEPENDS:perl-module-app-cpan += "perl-module-constant" +RDEPENDS:perl-module-app-cpan += "perl-module-cpan" +RDEPENDS:perl-module-app-cpan += "perl-module-cwd" +RDEPENDS:perl-module-app-cpan += "perl-module-data-dumper" +RDEPENDS:perl-module-app-cpan += "perl-module-file-basename" +RDEPENDS:perl-module-app-cpan += "perl-module-file-find" +RDEPENDS:perl-module-app-cpan += "perl-module-getopt-std" +RDEPENDS:perl-module-app-cpan += "perl-module-if" +RDEPENDS:perl-module-app-cpan += "perl-module-net-ping" +RDEPENDS:perl-module-app-cpan += "perl-module-strict" +RDEPENDS:perl-module-app-cpan += "perl-module-user-pwent" +RDEPENDS:perl-module-app-cpan += "perl-module-vars" +RDEPENDS:perl-module-app-cpan += "perl-module-warnings" +RDEPENDS:perl-module-app-prove += "perl-module-app-prove-state" +RDEPENDS:perl-module-app-prove += "perl-module-base" +RDEPENDS:perl-module-app-prove += "perl-module-constant" +RDEPENDS:perl-module-app-prove += "perl-module-getopt-long" +RDEPENDS:perl-module-app-prove += "perl-module-strict" +RDEPENDS:perl-module-app-prove += "perl-module-tap-harness" +RDEPENDS:perl-module-app-prove += "perl-module-tap-harness-env" +RDEPENDS:perl-module-app-prove += "perl-module-text-parsewords" +RDEPENDS:perl-module-app-prove += "perl-module-warnings" +RDEPENDS:perl-module-app-prove-state += "perl-module-app-prove-state-result" +RDEPENDS:perl-module-app-prove-state += "perl-module-base" +RDEPENDS:perl-module-app-prove-state += "perl-module-constant" +RDEPENDS:perl-module-app-prove-state += "perl-module-file-find" +RDEPENDS:perl-module-app-prove-state += "perl-module-strict" +RDEPENDS:perl-module-app-prove-state += "perl-module-tap-parser-yamlish-reader" +RDEPENDS:perl-module-app-prove-state += "perl-module-tap-parser-yamlish-writer" +RDEPENDS:perl-module-app-prove-state += "perl-module-warnings" +RDEPENDS:perl-module-app-prove-state-result += "perl-module-app-prove-state-result-test" +RDEPENDS:perl-module-app-prove-state-result += "perl-module-constant" +RDEPENDS:perl-module-app-prove-state-result += "perl-module-strict" +RDEPENDS:perl-module-app-prove-state-result += "perl-module-warnings" +RDEPENDS:perl-module-app-prove-state-result-test += "perl-module-strict" +RDEPENDS:perl-module-app-prove-state-result-test += "perl-module-warnings" +RDEPENDS:perl-module-archive-tar-constant += "perl-module-constant" +RDEPENDS:perl-module-archive-tar-constant += "perl-module-exporter" +RDEPENDS:perl-module-archive-tar-constant += "perl-module-io-compress-bzip2" +RDEPENDS:perl-module-archive-tar-constant += "perl-module-strict" +RDEPENDS:perl-module-archive-tar-constant += "perl-module-time-local" +RDEPENDS:perl-module-archive-tar-constant += "perl-module-warnings" +RDEPENDS:perl-module-archive-tar-file += "perl-module-archive-tar" +RDEPENDS:perl-module-archive-tar-file += "perl-module-archive-tar-constant" +RDEPENDS:perl-module-archive-tar-file += "perl-module-file-basename" +RDEPENDS:perl-module-archive-tar-file += "perl-module-io-file" +RDEPENDS:perl-module-archive-tar-file += "perl-module-strict" +RDEPENDS:perl-module-archive-tar-file += "perl-module-vars" +RDEPENDS:perl-module-archive-tar += "perl-module-archive-tar-constant" +RDEPENDS:perl-module-archive-tar += "perl-module-archive-tar-file" +RDEPENDS:perl-module-archive-tar += "perl-module-config" +RDEPENDS:perl-module-archive-tar += "perl-module-cwd" +RDEPENDS:perl-module-archive-tar += "perl-module-exporter" +RDEPENDS:perl-module-archive-tar += "perl-module-file-path" +RDEPENDS:perl-module-archive-tar += "perl-module-io-file" +RDEPENDS:perl-module-archive-tar += "perl-module-io-zlib" +RDEPENDS:perl-module-archive-tar += "perl-module-strict" +RDEPENDS:perl-module-archive-tar += "perl-module-vars" +RDEPENDS:perl-module-attribute-handlers += "perl-module-strict" +RDEPENDS:perl-module-attribute-handlers += "perl-module-warnings" +RDEPENDS:perl-module-attributes += "perl-module-exporter" +RDEPENDS:perl-module-attributes += "perl-module-strict" +RDEPENDS:perl-module-attributes += "perl-module-warnings" +RDEPENDS:perl-module-attributes += "perl-module-xsloader" +RDEPENDS:perl-module-autodie-exception += "perl-module-constant" +RDEPENDS:perl-module-autodie-exception += "perl-module-fatal" +RDEPENDS:perl-module-autodie-exception += "perl-module-fcntl" +RDEPENDS:perl-module-autodie-exception += "perl-module-overload" +RDEPENDS:perl-module-autodie-exception += "perl-module-strict" +RDEPENDS:perl-module-autodie-exception += "perl-module-warnings" +RDEPENDS:perl-module-autodie-exception-system += "perl-module-parent" +RDEPENDS:perl-module-autodie-exception-system += "perl-module-strict" +RDEPENDS:perl-module-autodie-exception-system += "perl-module-warnings" +RDEPENDS:perl-module-autodie-hints += "perl-module-b" +RDEPENDS:perl-module-autodie-hints += "perl-module-constant" +RDEPENDS:perl-module-autodie-hints += "perl-module-strict" +RDEPENDS:perl-module-autodie-hints += "perl-module-warnings" +RDEPENDS:perl-module-autodie += "perl-module-constant" +RDEPENDS:perl-module-autodie += "perl-module-lib" +RDEPENDS:perl-module-autodie += "perl-module-parent" +RDEPENDS:perl-module-autodie += "perl-module-strict" +RDEPENDS:perl-module-autodie += "perl-module-warnings" +RDEPENDS:perl-module-autodie-scope-guard += "perl-module-strict" +RDEPENDS:perl-module-autodie-scope-guard += "perl-module-warnings" +RDEPENDS:perl-module-autodie-scope-guardstack += "perl-module-autodie-scope-guard" +RDEPENDS:perl-module-autodie-scope-guardstack += "perl-module-strict" +RDEPENDS:perl-module-autodie-scope-guardstack += "perl-module-warnings" +RDEPENDS:perl-module-autodie-skip += "perl-module-strict" +RDEPENDS:perl-module-autodie-skip += "perl-module-warnings" +RDEPENDS:perl-module-autodie-util += "perl-module-autodie-scope-guardstack" +RDEPENDS:perl-module-autodie-util += "perl-module-exporter" +RDEPENDS:perl-module-autodie-util += "perl-module-strict" +RDEPENDS:perl-module-autodie-util += "perl-module-warnings" +RDEPENDS:perl-module-autoloader += "perl-module-strict" +RDEPENDS:perl-module-autosplit += "perl-module-config" +RDEPENDS:perl-module-autosplit += "perl-module-exporter" +RDEPENDS:perl-module-autosplit += "perl-module-file-basename" +RDEPENDS:perl-module-autosplit += "perl-module-file-path" +RDEPENDS:perl-module-autosplit += "perl-module-strict" +RDEPENDS:perl-module-base += "perl-module-strict" +RDEPENDS:perl-module-b-concise += "perl-module-b" +RDEPENDS:perl-module-b-concise += "perl-module-b-op-private" +RDEPENDS:perl-module-b-concise += "perl-module-config" +RDEPENDS:perl-module-b-concise += "perl-module-exporter" +RDEPENDS:perl-module-b-concise += "perl-module-feature" +RDEPENDS:perl-module-b-concise += "perl-module-strict" +RDEPENDS:perl-module-b-concise += "perl-module-warnings" +RDEPENDS:perl-module-benchmark += "perl-module-exporter" +RDEPENDS:perl-module-benchmark += "perl-module-strict" +RDEPENDS:perl-module-bigint += "perl-module-constant" +RDEPENDS:perl-module-bigint += "perl-module-exporter" +RDEPENDS:perl-module-bigint += "perl-module-math-bigint" +RDEPENDS:perl-module-bigint += "perl-module-math-bigint-trace" +RDEPENDS:perl-module-bigint += "perl-module-overload" +RDEPENDS:perl-module-bigint += "perl-module-strict" +RDEPENDS:perl-module-bigint += "perl-module-warnings" +RDEPENDS:perl-module-bignum += "perl-module-bigint" +RDEPENDS:perl-module-bignum += "perl-module-exporter" +RDEPENDS:perl-module-bignum += "perl-module-math-bigfloat" +RDEPENDS:perl-module-bignum += "perl-module-math-bigfloat-trace" +RDEPENDS:perl-module-bignum += "perl-module-math-bigint" +RDEPENDS:perl-module-bignum += "perl-module-math-bigint-trace" +RDEPENDS:perl-module-bignum += "perl-module-overload" +RDEPENDS:perl-module-bignum += "perl-module-strict" +RDEPENDS:perl-module-bignum += "perl-module-warnings" +RDEPENDS:perl-module-bigrat += "perl-module-bigint" +RDEPENDS:perl-module-bigrat += "perl-module-exporter" +RDEPENDS:perl-module-bigrat += "perl-module-math-bigfloat" +RDEPENDS:perl-module-bigrat += "perl-module-math-bigint" +RDEPENDS:perl-module-bigrat += "perl-module-math-bigint-trace" +RDEPENDS:perl-module-bigrat += "perl-module-math-bigrat" +RDEPENDS:perl-module-bigrat += "perl-module-overload" +RDEPENDS:perl-module-bigrat += "perl-module-strict" +RDEPENDS:perl-module-bigrat += "perl-module-warnings" +RDEPENDS:perl-module-blib += "perl-module-cwd" +RDEPENDS:perl-module-b += "perl-module-exporter" +RDEPENDS:perl-module-b += "perl-module-xsloader" +RDEPENDS:perl-module-b-showlex += "perl-module-b" +RDEPENDS:perl-module-b-showlex += "perl-module-b-concise" +RDEPENDS:perl-module-b-showlex += "perl-module-b-terse" +RDEPENDS:perl-module-b-showlex += "perl-module-strict" +RDEPENDS:perl-module-b-terse += "perl-module-b" +RDEPENDS:perl-module-b-terse += "perl-module-b-concise" +RDEPENDS:perl-module-b-terse += "perl-module-strict" +RDEPENDS:perl-module-b-xref += "perl-module-b" +RDEPENDS:perl-module-b-xref += "perl-module-config" +RDEPENDS:perl-module-b-xref += "perl-module-strict" +RDEPENDS:perl-module-bytes += "perl-module-bytes-heavy" +RDEPENDS:perl-module--charnames += "perl-module-bytes" +RDEPENDS:perl-module-charnames += "perl-module-bytes" +RDEPENDS:perl-module-charnames += "perl-module--charnames" +RDEPENDS:perl-module--charnames += "perl-module-re" +RDEPENDS:perl-module-charnames += "perl-module-re" +RDEPENDS:perl-module--charnames += "perl-module-strict" +RDEPENDS:perl-module-charnames += "perl-module-strict" +RDEPENDS:perl-module--charnames += "perl-module-warnings" +RDEPENDS:perl-module-charnames += "perl-module-warnings" +RDEPENDS:perl-module-class-struct += "perl-module-exporter" +RDEPENDS:perl-module-class-struct += "perl-module-strict" +RDEPENDS:perl-module-class-struct += "perl-module-warnings-register" +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-bytes " +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-constant" +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-dynaloader" +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-exporter" +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-strict " +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-warnings " +RDEPENDS:perl-module-compress-raw-bzip2 += "perl-module-xsloader" +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-bytes " +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-constant" +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-dynaloader" +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-exporter" +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-strict " +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-warnings " +RDEPENDS:perl-module-compress-raw-zlib += "perl-module-xsloader" +RDEPENDS:perl-module-compress-zlib += "perl-module-bytes " +RDEPENDS:perl-module-compress-zlib += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-compress-zlib += "perl-module-constant" +RDEPENDS:perl-module-compress-zlib += "perl-module-exporter" +RDEPENDS:perl-module-compress-zlib += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-compress-zlib += "perl-module-io-compress-gzip" +RDEPENDS:perl-module-compress-zlib += "perl-module-io-compress-gzip-constants" +RDEPENDS:perl-module-compress-zlib += "perl-module-io-handle " +RDEPENDS:perl-module-compress-zlib += "perl-module-io-uncompress-gunzip" +RDEPENDS:perl-module-compress-zlib += "perl-module-strict " +RDEPENDS:perl-module-compress-zlib += "perl-module-warnings " +RDEPENDS:perl-module-config-extensions += "perl-module-config" +RDEPENDS:perl-module-config-extensions += "perl-module-exporter" +RDEPENDS:perl-module-config-extensions += "perl-module-strict" +RDEPENDS:perl-module-config-perl-v += "perl-module-config" +RDEPENDS:perl-module-config-perl-v += "perl-module-exporter" +RDEPENDS:perl-module-config-perl-v += "perl-module-strict" +RDEPENDS:perl-module-config-perl-v += "perl-module-vars" +RDEPENDS:perl-module-config-perl-v += "perl-module-warnings" +RDEPENDS:perl-module-constant += "perl-module-strict" +RDEPENDS:perl-module-constant += "perl-module-warnings-register" +RDEPENDS:perl-module-corelist += "perl-module-list-util" +RDEPENDS:perl-module-corelist += "perl-module-corelist" +RDEPENDS:perl-module-corelist += "perl-module-strict" +RDEPENDS:perl-module-corelist += "perl-module-version" +RDEPENDS:perl-module-corelist += "perl-module-warnings" +RDEPENDS:perl-module-cpan += "perl-module-b" +RDEPENDS:perl-module-cpan += "perl-module-config" +RDEPENDS:perl-module-cpan += "perl-module-cwd" +RDEPENDS:perl-module-cpan += "perl-module-data-dumper" +RDEPENDS:perl-module-cpan += "perl-module-dirhandle" +RDEPENDS:perl-module-cpan += "perl-module-errno" +RDEPENDS:perl-module-cpan += "perl-module-exporter" +RDEPENDS:perl-module-cpan += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-cpan += "perl-module-extutils-manifest" +RDEPENDS:perl-module-cpan += "perl-module-fcntl" +RDEPENDS:perl-module-cpan += "perl-module-file-basename" +RDEPENDS:perl-module-cpan += "perl-module-file-copy" +RDEPENDS:perl-module-cpan += "perl-module-file-find" +RDEPENDS:perl-module-cpan += "perl-module-filehandle" +RDEPENDS:perl-module-cpan += "perl-module-file-path" +RDEPENDS:perl-module-cpan += "perl-module-json-pp" +RDEPENDS:perl-module-cpan += "perl-module-lib" +RDEPENDS:perl-module-cpan += "perl-module-net-ping" +RDEPENDS:perl-module-cpan += "perl-module-overload" +RDEPENDS:perl-module-cpan += "perl-module-posix" +RDEPENDS:perl-module-cpan += "perl-module-safe" +RDEPENDS:perl-module-cpan += "perl-module-strict" +RDEPENDS:perl-module-cpan += "perl-module-sys-hostname" +RDEPENDS:perl-module-cpan += "perl-module-term-readline" +RDEPENDS:perl-module-cpan += "perl-module-text-parsewords" +RDEPENDS:perl-module-cpan += "perl-module-text-wrap" +RDEPENDS:perl-module-cpan += "perl-module-time-local" +RDEPENDS:perl-module-cpan += "perl-module-vars" +RDEPENDS:perl-module-cpan += "perl-module-warnings" +RDEPENDS:perl-module-cwd += "perl-module-errno" +RDEPENDS:perl-module-cwd += "perl-module-exporter" +RDEPENDS:perl-module-cwd += "perl-module-strict" +RDEPENDS:perl-module-cwd += "perl-module-xsloader" +RDEPENDS:perl-module-data-dumper += "perl-module-config" +RDEPENDS:perl-module-data-dumper += "perl-module-constant" +RDEPENDS:perl-module-data-dumper += "perl-module-exporter" +RDEPENDS:perl-module-data-dumper += "perl-module-xsloader" +RDEPENDS:perl-module-db-file += "perl-module-dynaloader" +RDEPENDS:perl-module-db-file += "perl-module-exporter" +RDEPENDS:perl-module-db-file += "perl-module-fcntl" +RDEPENDS:perl-module-db-file += "perl-module-strict " +RDEPENDS:perl-module-db-file += "perl-module-strict" +RDEPENDS:perl-module-db-file += "perl-module-tie-hash" +RDEPENDS:perl-module-db-file += "perl-module-warnings" +RDEPENDS:perl-module-dbm-filter-compress += "perl-module-strict" +RDEPENDS:perl-module-dbm-filter-compress += "perl-module-warnings" +RDEPENDS:perl-module-dbm-filter-encode += "perl-module-strict" +RDEPENDS:perl-module-dbm-filter-encode += "perl-module-warnings" +RDEPENDS:perl-module-dbm-filter-int32 += "perl-module-strict" +RDEPENDS:perl-module-dbm-filter-int32 += "perl-module-warnings" +RDEPENDS:perl-module-dbm-filter-null += "perl-module-strict" +RDEPENDS:perl-module-dbm-filter-null += "perl-module-warnings" +RDEPENDS:perl-module-dbm-filter += "perl-module-strict" +RDEPENDS:perl-module-dbm-filter += "perl-module-warnings" +RDEPENDS:perl-module-dbm-filter-utf8 += "perl-module-strict" +RDEPENDS:perl-module-dbm-filter-utf8 += "perl-module-warnings" +RDEPENDS:perl-module-db += "perl-module-strict" +RDEPENDS:perl-module-deprecate += "perl-module-strict" +RDEPENDS:perl-module-deprecate += "perl-module-warnings" +RDEPENDS:perl-module-devel-peek += "perl-module-exporter" +RDEPENDS:perl-module-devel-peek += "perl-module-xsloader" +RDEPENDS:perl-module-devel-ppport += "perl-module-file-find" +RDEPENDS:perl-module-devel-ppport += "perl-module-getopt-long" +RDEPENDS:perl-module-devel-ppport += "perl-module-strict" +RDEPENDS:perl-module-devel-ppport += "perl-module-vars" +RDEPENDS:perl-module-devel-selfstubber += "perl-module-selfloader" +RDEPENDS:perl-module-diagnostics += "perl-module-config" +RDEPENDS:perl-module-diagnostics += "perl-module-getopt-std" +RDEPENDS:perl-module-diagnostics += "perl-module-strict" +RDEPENDS:perl-module-diagnostics += "perl-module-text-tabs" +RDEPENDS:perl-module-digest-base += "perl-module-mime-base64" +RDEPENDS:perl-module-digest-base += "perl-module-strict" +RDEPENDS:perl-module-digest-base += "perl-module-vars" +RDEPENDS:perl-module-digest-file += "perl-module-digest" +RDEPENDS:perl-module-digest-file += "perl-module-exporter" +RDEPENDS:perl-module-digest-file += "perl-module-strict" +RDEPENDS:perl-module-digest-file += "perl-module-vars" +RDEPENDS:perl-module-digest-md5 += "perl-module-digest-base" +RDEPENDS:perl-module-digest-md5 += "perl-module-exporter" +RDEPENDS:perl-module-digest-md5 += "perl-module-strict" +RDEPENDS:perl-module-digest-md5 += "perl-module-vars" +RDEPENDS:perl-module-digest-md5 += "perl-module-xsloader" +RDEPENDS:perl-module-digest += "perl-module-strict" +RDEPENDS:perl-module-digest += "perl-module-vars" +RDEPENDS:perl-module-digest-sha += "perl-module-digest-base" +RDEPENDS:perl-module-digest-sha += "perl-module-dynaloader" +RDEPENDS:perl-module-digest-sha += "perl-module-exporter" +RDEPENDS:perl-module-digest-sha += "perl-module-fcntl" +RDEPENDS:perl-module-digest-sha += "perl-module-integer" +RDEPENDS:perl-module-digest-sha += "perl-module-strict" +RDEPENDS:perl-module-digest-sha += "perl-module-vars" +RDEPENDS:perl-module-digest-sha += "perl-module-warnings" +RDEPENDS:perl-module-digest-sha += "perl-module-xsloader" +RDEPENDS:perl-module-dynaloader += "perl-module-config" +RDEPENDS:perl-module-encode-alias += "perl-module-constant" +RDEPENDS:perl-module-encode-alias += "perl-module-encode" +RDEPENDS:perl-module-encode-alias += "perl-module-exporter" +RDEPENDS:perl-module-encode-alias += "perl-module-strict" +RDEPENDS:perl-module-encode-alias += "perl-module-warnings" +RDEPENDS:perl-module-encode-byte += "perl-module-encode" +RDEPENDS:perl-module-encode-byte += "perl-module-strict" +RDEPENDS:perl-module-encode-byte += "perl-module-warnings" +RDEPENDS:perl-module-encode-byte += "perl-module-xsloader" +RDEPENDS:perl-module-encode-cjkconstants += "perl-module-exporter" +RDEPENDS:perl-module-encode-cjkconstants += "perl-module-strict" +RDEPENDS:perl-module-encode-cjkconstants += "perl-module-warnings" +RDEPENDS:perl-module-encode-cn-hz += "perl-module-encode" +RDEPENDS:perl-module-encode-cn-hz += "perl-module-parent" +RDEPENDS:perl-module-encode-cn-hz += "perl-module-strict" +RDEPENDS:perl-module-encode-cn-hz += "perl-module-utf8" +RDEPENDS:perl-module-encode-cn-hz += "perl-module-vars" +RDEPENDS:perl-module-encode-cn-hz += "perl-module-warnings" +RDEPENDS:perl-module-encode-cn += "perl-module-encode" +RDEPENDS:perl-module-encode-cn += "perl-module-encode-cn-hz" +RDEPENDS:perl-module-encode-cn += "perl-module-strict" +RDEPENDS:perl-module-encode-cn += "perl-module-warnings" +RDEPENDS:perl-module-encode-cn += "perl-module-xsloader" +RDEPENDS:perl-module-encode-config += "perl-module-strict" +RDEPENDS:perl-module-encode-config += "perl-module-warnings" +RDEPENDS:perl-module-encode-ebcdic += "perl-module-encode" +RDEPENDS:perl-module-encode-ebcdic += "perl-module-strict" +RDEPENDS:perl-module-encode-ebcdic += "perl-module-warnings" +RDEPENDS:perl-module-encode-ebcdic += "perl-module-xsloader" +RDEPENDS:perl-module-encode-encoder += "perl-module-constant" +RDEPENDS:perl-module-encode-encoder += "perl-module-encode" +RDEPENDS:perl-module-encode-encoder += "perl-module-exporter" +RDEPENDS:perl-module-encode-encoder += "perl-module-overload" +RDEPENDS:perl-module-encode-encoder += "perl-module-strict" +RDEPENDS:perl-module-encode-encoder += "perl-module-warnings" +RDEPENDS:perl-module-encode-encoding += "perl-module-constant" +RDEPENDS:perl-module-encode-encoding += "perl-module-encode" +RDEPENDS:perl-module-encode-encoding += "perl-module-encode-mime-name" +RDEPENDS:perl-module-encode-encoding += "perl-module-strict" +RDEPENDS:perl-module-encode-encoding += "perl-module-warnings" +RDEPENDS:perl-module-encode-gsm0338 += "perl-module-encode" +RDEPENDS:perl-module-encode-gsm0338 += "perl-module-parent" +RDEPENDS:perl-module-encode-gsm0338 += "perl-module-strict" +RDEPENDS:perl-module-encode-gsm0338 += "perl-module-utf8" +RDEPENDS:perl-module-encode-gsm0338 += "perl-module-vars" +RDEPENDS:perl-module-encode-gsm0338 += "perl-module-warnings" +RDEPENDS:perl-module-encode-guess += "perl-module-bytes" +RDEPENDS:perl-module-encode-guess += "perl-module-constant" +RDEPENDS:perl-module-encode-guess += "perl-module-encode" +RDEPENDS:perl-module-encode-guess += "perl-module-encode-unicode" +RDEPENDS:perl-module-encode-guess += "perl-module-parent" +RDEPENDS:perl-module-encode-guess += "perl-module-strict" +RDEPENDS:perl-module-encode-guess += "perl-module-warnings" +RDEPENDS:perl-module-encode-jp-h2z += "perl-module-encode-cjkconstants" +RDEPENDS:perl-module-encode-jp-h2z += "perl-module-strict" +RDEPENDS:perl-module-encode-jp-h2z += "perl-module-vars" +RDEPENDS:perl-module-encode-jp-h2z += "perl-module-warnings" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-bytes" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-encode" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-encode-cjkconstants" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-encode-jp-h2z" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-parent" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-strict" +RDEPENDS:perl-module-encode-jp-jis7 += "perl-module-warnings" +RDEPENDS:perl-module-encode-jp += "perl-module-encode" +RDEPENDS:perl-module-encode-jp += "perl-module-encode-jp-jis7" +RDEPENDS:perl-module-encode-jp += "perl-module-strict" +RDEPENDS:perl-module-encode-jp += "perl-module-warnings" +RDEPENDS:perl-module-encode-jp += "perl-module-xsloader" +RDEPENDS:perl-module-encode-kr-2022-kr += "perl-module-encode" +RDEPENDS:perl-module-encode-kr-2022-kr += "perl-module-encode-cjkconstants" +RDEPENDS:perl-module-encode-kr-2022-kr += "perl-module-parent" +RDEPENDS:perl-module-encode-kr-2022-kr += "perl-module-strict" +RDEPENDS:perl-module-encode-kr-2022-kr += "perl-module-warnings" +RDEPENDS:perl-module-encode-kr += "perl-module-encode" +RDEPENDS:perl-module-encode-kr += "perl-module-encode-kr-2022-kr" +RDEPENDS:perl-module-encode-kr += "perl-module-strict" +RDEPENDS:perl-module-encode-kr += "perl-module-warnings" +RDEPENDS:perl-module-encode-kr += "perl-module-xsloader" +RDEPENDS:perl-module-encode-mime-header-iso-2022-jp += "perl-module-constant" +RDEPENDS:perl-module-encode-mime-header-iso-2022-jp += "perl-module-encode-cjkconstants" +RDEPENDS:perl-module-encode-mime-header-iso-2022-jp += "perl-module-parent" +RDEPENDS:perl-module-encode-mime-header-iso-2022-jp += "perl-module-strict" +RDEPENDS:perl-module-encode-mime-header-iso-2022-jp += "perl-module-warnings" +RDEPENDS:perl-module-encode-mime-header += "perl-module-encode" +RDEPENDS:perl-module-encode-mime-header += "perl-module-mime-base64" +RDEPENDS:perl-module-encode-mime-header += "perl-module-parent" +RDEPENDS:perl-module-encode-mime-header += "perl-module-strict" +RDEPENDS:perl-module-encode-mime-header += "perl-module-warnings" +RDEPENDS:perl-module-encode-mime-name += "perl-module-strict" +RDEPENDS:perl-module-encode-mime-name += "perl-module-warnings" +RDEPENDS:perl-module-encode += "perl-module-bytes" +RDEPENDS:perl-module-encode += "perl-module-constant" +RDEPENDS:perl-module-encode += "perl-module-encode-alias" +RDEPENDS:perl-module-encode += "perl-module-encode-config" +RDEPENDS:perl-module-encode += "perl-module-encode-configlocal-pm" +RDEPENDS:perl-module-encode += "perl-module-encode-mime-name" +RDEPENDS:perl-module-encode += "perl-module-exporter" +RDEPENDS:perl-module-encode += "perl-module-parent" +RDEPENDS:perl-module-encode += "perl-module-storable" +RDEPENDS:perl-module-encode += "perl-module-strict" +RDEPENDS:perl-module-encode += "perl-module-warnings" +RDEPENDS:perl-module-encode += "perl-module-xsloader" +RDEPENDS:perl-module-encode-symbol += "perl-module-encode" +RDEPENDS:perl-module-encode-symbol += "perl-module-strict" +RDEPENDS:perl-module-encode-symbol += "perl-module-warnings" +RDEPENDS:perl-module-encode-symbol += "perl-module-xsloader" +RDEPENDS:perl-module-encode-tw += "perl-module-encode" +RDEPENDS:perl-module-encode-tw += "perl-module-strict" +RDEPENDS:perl-module-encode-tw += "perl-module-warnings" +RDEPENDS:perl-module-encode-tw += "perl-module-xsloader" +RDEPENDS:perl-module-encode-unicode += "perl-module-encode" +RDEPENDS:perl-module-encode-unicode += "perl-module-parent" +RDEPENDS:perl-module-encode-unicode += "perl-module-strict" +RDEPENDS:perl-module-encode-unicode += "perl-module-warnings" +RDEPENDS:perl-module-encode-unicode += "perl-module-xsloader" +RDEPENDS:perl-module-encode-unicode-utf7 += "perl-module-encode" +RDEPENDS:perl-module-encode-unicode-utf7 += "perl-module-mime-base64" +RDEPENDS:perl-module-encode-unicode-utf7 += "perl-module-parent" +RDEPENDS:perl-module-encode-unicode-utf7 += "perl-module-re" +RDEPENDS:perl-module-encode-unicode-utf7 += "perl-module-strict" +RDEPENDS:perl-module-encode-unicode-utf7 += "perl-module-warnings" +RDEPENDS:perl-module-encoding += "perl-module-config" +RDEPENDS:perl-module-encoding += "perl-module-constant" +RDEPENDS:perl-module-encoding += "perl-module-encode" +RDEPENDS:perl-module-encoding += "perl-module-filter-util-call" +RDEPENDS:perl-module-encoding += "perl-module-i18n-langinfo" +RDEPENDS:perl-module-encoding += "perl-module-posix" +RDEPENDS:perl-module-encoding += "perl-module-strict" +RDEPENDS:perl-module-encoding += "perl-module-utf8" +RDEPENDS:perl-module-encoding += "perl-module-warnings" +RDEPENDS:perl-module-encoding-warnings += "perl-module-strict" +RDEPENDS:perl-module-encoding-warnings += "perl-module-warnings" +RDEPENDS:perl-module-english += "perl-module-exporter" +RDEPENDS:perl-module-env += "perl-module-config" +RDEPENDS:perl-module-env += "perl-module-tie-array" +RDEPENDS:perl-module-errno += "perl-module-exporter" +RDEPENDS:perl-module-errno += "perl-module-strict" +RDEPENDS:perl-module-experimental += "perl-module-strict" +RDEPENDS:perl-module-experimental += "perl-module-version" +RDEPENDS:perl-module-experimental += "perl-module-warnings" +RDEPENDS:perl-module-exporter-heavy += "perl-module-exporter" +RDEPENDS:perl-module-exporter-heavy += "perl-module-strict" +RDEPENDS:perl-module-exporter += "perl-module-exporter-heavy" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-config" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-cwd" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-dynaloader" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-extutils-mksymlists" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-file-temp" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-ipc-cmd" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-text-parsewords" +RDEPENDS:perl-module-extutils-cbuilder-base += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-cbuilder += "perl-module-file-path" +RDEPENDS:perl-module-extutils-cbuilder += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-aix += "perl-module-extutils-cbuilder-platform-unix" +RDEPENDS:perl-module-extutils-cbuilder-platform-aix += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-aix += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-android += "perl-module-config" +RDEPENDS:perl-module-extutils-cbuilder-platform-android += "perl-module-extutils-cbuilder-platform-unix" +RDEPENDS:perl-module-extutils-cbuilder-platform-android += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-android += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-cygwin += "perl-module-extutils-cbuilder-platform-unix" +RDEPENDS:perl-module-extutils-cbuilder-platform-cygwin += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-cygwin += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-extutils-cbuilder-platform-unix" +RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-dec-osf += "perl-module-extutils-cbuilder-platform-unix" +RDEPENDS:perl-module-extutils-cbuilder-platform-dec-osf += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-dec-osf += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-os2 += "perl-module-extutils-cbuilder-platform-unix" +RDEPENDS:perl-module-extutils-cbuilder-platform-os2 += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-os2 += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-unix += "perl-module-extutils-cbuilder-base" +RDEPENDS:perl-module-extutils-cbuilder-platform-unix += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-unix += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-vms += "perl-module-config" +RDEPENDS:perl-module-extutils-cbuilder-platform-vms += "perl-module-extutils-cbuilder-base" +RDEPENDS:perl-module-extutils-cbuilder-platform-vms += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-vms += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows-bcc += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows-bcc += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows-gcc += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows-gcc += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows-msvc += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows-msvc += "perl-module-warnings" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows += "perl-module-extutils-cbuilder-base" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows += "perl-module-io-file" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows += "perl-module-strict" +RDEPENDS:perl-module-extutils-cbuilder-platform-windows += "perl-module-warnings" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-exporter" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-extutils-command" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-extutils-install" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-getopt-long" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-strict" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-test-harness" +RDEPENDS:perl-module-extutils-command-mm += "perl-module-warnings" +RDEPENDS:perl-module-extutils-command += "perl-module-exporter" +RDEPENDS:perl-module-extutils-command += "perl-module-file-copy" +RDEPENDS:perl-module-extutils-command += "perl-module-file-find" +RDEPENDS:perl-module-extutils-command += "perl-module-file-path" +RDEPENDS:perl-module-extutils-command += "perl-module-strict" +RDEPENDS:perl-module-extutils-command += "perl-module-vars" +RDEPENDS:perl-module-extutils-constant-base += "perl-module-constant" +RDEPENDS:perl-module-extutils-constant-base += "perl-module-extutils-constant-utils" +RDEPENDS:perl-module-extutils-constant-base += "perl-module-strict" +RDEPENDS:perl-module-extutils-constant-base += "perl-module-text-wrap" +RDEPENDS:perl-module-extutils-constant-base += "perl-module-vars" +RDEPENDS:perl-module-extutils-constant += "perl-module-exporter" +RDEPENDS:perl-module-extutils-constant += "perl-module-extutils-constant-proxysubs" +RDEPENDS:perl-module-extutils-constant += "perl-module-extutils-constant-utils" +RDEPENDS:perl-module-extutils-constant += "perl-module-extutils-constant-xs" +RDEPENDS:perl-module-extutils-constant += "perl-module-filehandle" +RDEPENDS:perl-module-extutils-constant += "perl-module-strict" +RDEPENDS:perl-module-extutils-constant += "perl-module-vars" +RDEPENDS:perl-module-extutils-constant-proxysubs += "perl-module-extutils-constant-utils" +RDEPENDS:perl-module-extutils-constant-proxysubs += "perl-module-extutils-constant-xs" +RDEPENDS:perl-module-extutils-constant-proxysubs += "perl-module-strict" +RDEPENDS:perl-module-extutils-constant-proxysubs += "perl-module-vars" +RDEPENDS:perl-module-extutils-constant-utils += "perl-module-constant" +RDEPENDS:perl-module-extutils-constant-utils += "perl-module-posix" +RDEPENDS:perl-module-extutils-constant-utils += "perl-module-strict" +RDEPENDS:perl-module-extutils-constant-utils += "perl-module-vars" +RDEPENDS:perl-module-extutils-constant-xs += "perl-module-data-dumper" +RDEPENDS:perl-module-extutils-constant-xs += "perl-module-extutils-constant" +RDEPENDS:perl-module-extutils-constant-xs += "perl-module-extutils-constant-base" +RDEPENDS:perl-module-extutils-constant-xs += "perl-module-extutils-constant-utils" +RDEPENDS:perl-module-extutils-constant-xs += "perl-module-strict" +RDEPENDS:perl-module-extutils-constant-xs += "perl-module-vars" +RDEPENDS:perl-module-extutils-embed += "perl-module-config" +RDEPENDS:perl-module-extutils-embed += "perl-module-exporter" +RDEPENDS:perl-module-extutils-embed += "perl-module-extutils-liblist" +RDEPENDS:perl-module-extutils-embed += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-embed += "perl-module-getopt-std" +RDEPENDS:perl-module-extutils-embed += "perl-module-strict" +RDEPENDS:perl-module-extutils-installed += "perl-module-config" +RDEPENDS:perl-module-extutils-installed += "perl-module-data-dumper" +RDEPENDS:perl-module-extutils-installed += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-installed += "perl-module-extutils-packlist" +RDEPENDS:perl-module-extutils-installed += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-installed += "perl-module-file-find" +RDEPENDS:perl-module-extutils-installed += "perl-module-strict" +RDEPENDS:perl-module-extutils-installed += "perl-module-vars" +RDEPENDS:perl-module-extutils-install += "perl-module-autosplit" +RDEPENDS:perl-module-extutils-install += "perl-module-config" +RDEPENDS:perl-module-extutils-install += "perl-module-cwd" +RDEPENDS:perl-module-extutils-install += "perl-module-exporter" +RDEPENDS:perl-module-extutils-install += "perl-module-extutils-packlist" +RDEPENDS:perl-module-extutils-install += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-install += "perl-module-file-compare" +RDEPENDS:perl-module-extutils-install += "perl-module-file-copy" +RDEPENDS:perl-module-extutils-install += "perl-module-file-find" +RDEPENDS:perl-module-extutils-install += "perl-module-file-path" +RDEPENDS:perl-module-extutils-install += "perl-module-strict" +RDEPENDS:perl-module-extutils-liblist-kid += "perl-module-cwd" +RDEPENDS:perl-module-extutils-liblist-kid += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-liblist-kid += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-liblist-kid += "perl-module-strict" +RDEPENDS:perl-module-extutils-liblist-kid += "perl-module-text-parsewords" +RDEPENDS:perl-module-extutils-liblist-kid += "perl-module-warnings" +RDEPENDS:perl-module-extutils-liblist += "perl-module-extutils-liblist-kid" +RDEPENDS:perl-module-extutils-liblist += "perl-module-strict" +RDEPENDS:perl-module-extutils-makemaker-config += "perl-module-config" +RDEPENDS:perl-module-extutils-makemaker-config += "perl-module-strict" +RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-base" +RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-encode" +RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-encode-alias" +RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-i18n-langinfo" +RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-strict" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-b" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-cpan" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-cwd" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-exporter" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-extutils-makemaker-version" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-extutils-manifest" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-extutils-mm" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-extutils-my" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-file-path" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-strict" +RDEPENDS:perl-module-extutils-makemaker += "perl-module-version" +RDEPENDS:perl-module-extutils-makemaker-version += "perl-module-strict" +RDEPENDS:perl-module-extutils-makemaker-version += "perl-module-vars" +RDEPENDS:perl-module-extutils-manifest += "perl-module-config" +RDEPENDS:perl-module-extutils-manifest += "perl-module-exporter" +RDEPENDS:perl-module-extutils-manifest += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-manifest += "perl-module-file-copy" +RDEPENDS:perl-module-extutils-manifest += "perl-module-file-find" +RDEPENDS:perl-module-extutils-manifest += "perl-module-file-path" +RDEPENDS:perl-module-extutils-manifest += "perl-module-strict" +RDEPENDS:perl-module-extutils-manifest += "perl-module-warnings" +RDEPENDS:perl-module-extutils-miniperl += "perl-module-exporter" +RDEPENDS:perl-module-extutils-miniperl += "perl-module-extutils-embed" +RDEPENDS:perl-module-extutils-miniperl += "perl-module-strict" +RDEPENDS:perl-module-extutils-mkbootstrap += "perl-module-config" +RDEPENDS:perl-module-extutils-mkbootstrap += "perl-module-dynaloader" +RDEPENDS:perl-module-extutils-mkbootstrap += "perl-module-exporter" +RDEPENDS:perl-module-extutils-mkbootstrap += "perl-module-strict" +RDEPENDS:perl-module-extutils-mksymlists += "perl-module-config" +RDEPENDS:perl-module-extutils-mksymlists += "perl-module-exporter" +RDEPENDS:perl-module-extutils-mksymlists += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-aix += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-aix += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-aix += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-autosplit" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-cpan" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-data-dumper" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-file-find" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-any += "perl-module-version" +RDEPENDS:perl-module-extutils-mm-beos += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-beos += "perl-module-extutils-mm-any" +RDEPENDS:perl-module-extutils-mm-beos += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-beos += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-cygwin += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-cygwin += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-cygwin += "perl-module-extutils-mm-win32" +RDEPENDS:perl-module-extutils-mm-cygwin += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-darwin += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-darwin += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-dos += "perl-module-extutils-mm-any" +RDEPENDS:perl-module-extutils-mm-dos += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-dos += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-macos += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-nw5 += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm-nw5 += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-nw5 += "perl-module-extutils-mm-win32" +RDEPENDS:perl-module-extutils-mm-nw5 += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-mm-nw5 += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-os2 += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm-os2 += "perl-module-extutils-mm-any" +RDEPENDS:perl-module-extutils-mm-os2 += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-os2 += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm += "perl-module-extutils-liblist" +RDEPENDS:perl-module-extutils-mm += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-qnx += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-qnx += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-cwd" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-encode" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-extutils-liblist" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-extutils-mm-any" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-file-find" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-vars" +RDEPENDS:perl-module-extutils-mm-unix += "perl-module-version" +RDEPENDS:perl-module-extutils-mm-uwin += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-uwin += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-exporter" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-extutils-liblist-kid" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-extutils-mm-any" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-file-find" +RDEPENDS:perl-module-extutils-mm-vms += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-vos += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-vos += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-win32 += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-extutils-mm-win32 += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-win32 += "perl-module-extutils-mm-any" +RDEPENDS:perl-module-extutils-mm-win32 += "perl-module-extutils-mm-unix" +RDEPENDS:perl-module-extutils-mm-win32 += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-mm-win32 += "perl-module-strict" +RDEPENDS:perl-module-extutils-mm-win95 += "perl-module-extutils-makemaker-config" +RDEPENDS:perl-module-extutils-mm-win95 += "perl-module-extutils-mm-win32" +RDEPENDS:perl-module-extutils-mm-win95 += "perl-module-strict" +RDEPENDS:perl-module-extutils-my += "perl-module-extutils-mm" +RDEPENDS:perl-module-extutils-my += "perl-module-strict" +RDEPENDS:perl-module-extutils-packlist += "perl-module-config" +RDEPENDS:perl-module-extutils-packlist += "perl-module-cwd" +RDEPENDS:perl-module-extutils-packlist += "perl-module-strict" +RDEPENDS:perl-module-extutils-packlist += "perl-module-vars" +RDEPENDS:perl-module-extutils-parsexs-constants += "perl-module-strict" +RDEPENDS:perl-module-extutils-parsexs-constants += "perl-module-warnings" +RDEPENDS:perl-module-extutils-parsexs-countlines += "perl-module-strict" +RDEPENDS:perl-module-extutils-parsexs-eval += "perl-module-strict" +RDEPENDS:perl-module-extutils-parsexs-eval += "perl-module-warnings" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-config" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-cwd" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-exporter" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-extutils-parsexs-constants" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-extutils-parsexs-countlines" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-extutils-parsexs-eval" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-extutils-parsexs-utilities" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-file-basename" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-re" +RDEPENDS:perl-module-extutils-parsexs += "perl-module-strict" +RDEPENDS:perl-module-extutils-parsexs-utilities += "perl-module-exporter" +RDEPENDS:perl-module-extutils-parsexs-utilities += "perl-module-extutils-parsexs-constants" +RDEPENDS:perl-module-extutils-parsexs-utilities += "perl-module-extutils-typemaps" +RDEPENDS:perl-module-extutils-parsexs-utilities += "perl-module-strict" +RDEPENDS:perl-module-extutils-parsexs-utilities += "perl-module-warnings" +RDEPENDS:perl-module-extutils-testlib += "perl-module-cwd" +RDEPENDS:perl-module-extutils-testlib += "perl-module-lib" +RDEPENDS:perl-module-extutils-testlib += "perl-module-strict" +RDEPENDS:perl-module-extutils-testlib += "perl-module-warnings" +RDEPENDS:perl-module-extutils-typemaps-cmd += "perl-module-exporter" +RDEPENDS:perl-module-extutils-typemaps-cmd += "perl-module-extutils-typemaps" +RDEPENDS:perl-module-extutils-typemaps-cmd += "perl-module-strict" +RDEPENDS:perl-module-extutils-typemaps-cmd += "perl-module-warnings" +RDEPENDS:perl-module-extutils-typemaps-inputmap += "perl-module-strict" +RDEPENDS:perl-module-extutils-typemaps-inputmap += "perl-module-warnings" +RDEPENDS:perl-module-extutils-typemaps-outputmap += "perl-module-re" +RDEPENDS:perl-module-extutils-typemaps-outputmap += "perl-module-strict" +RDEPENDS:perl-module-extutils-typemaps-outputmap += "perl-module-warnings" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-extutils-parsexs" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-extutils-parsexs-constants" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-extutils-typemaps-inputmap" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-extutils-typemaps-outputmap" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-extutils-typemaps-type" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-strict" +RDEPENDS:perl-module-extutils-typemaps += "perl-module-warnings" +RDEPENDS:perl-module-extutils-typemaps-type += "perl-module-extutils-typemaps" +RDEPENDS:perl-module-extutils-typemaps-type += "perl-module-strict" +RDEPENDS:perl-module-extutils-typemaps-type += "perl-module-warnings" +RDEPENDS:perl-module-fatal += "perl-module-autodie" +RDEPENDS:perl-module-fatal += "perl-module-autodie-exception-system" +RDEPENDS:perl-module-fatal += "perl-module-autodie-hints" +RDEPENDS:perl-module-fatal += "perl-module-autodie-util" +RDEPENDS:perl-module-fatal += "perl-module-config" +RDEPENDS:perl-module-fatal += "perl-module-constant" +RDEPENDS:perl-module-fatal += "perl-module-fcntl" +RDEPENDS:perl-module-fatal += "perl-module-posix" +RDEPENDS:perl-module-fatal += "perl-module-strict" +RDEPENDS:perl-module-fatal += "perl-module-tie-refhash" +RDEPENDS:perl-module-fatal += "perl-module-warnings" +RDEPENDS:perl-module-fcntl += "perl-module-exporter" +RDEPENDS:perl-module-fcntl += "perl-module-strict" +RDEPENDS:perl-module-fcntl += "perl-module-xsloader" +RDEPENDS:perl-module-fields += "perl-module-base" +RDEPENDS:perl-module-fields += "perl-module-hash-util" +RDEPENDS:perl-module-fields += "perl-module-strict" +RDEPENDS:perl-module-file-basename += "perl-module-exporter" +RDEPENDS:perl-module-file-basename += "perl-module-re" +RDEPENDS:perl-module-file-basename += "perl-module-strict" +RDEPENDS:perl-module-file-basename += "perl-module-warnings" +RDEPENDS:perl-module-filecache += "perl-module-parent" +RDEPENDS:perl-module-filecache += "perl-module-strict" +RDEPENDS:perl-module-file-compare += "perl-module-exporter" +RDEPENDS:perl-module-file-compare += "perl-module-strict" +RDEPENDS:perl-module-file-compare += "perl-module-warnings" +RDEPENDS:perl-module-file-copy += "perl-module-config" +RDEPENDS:perl-module-file-copy += "perl-module-exporter" +RDEPENDS:perl-module-file-copy += "perl-module-file-basename" +RDEPENDS:perl-module-file-copy += "perl-module-strict" +RDEPENDS:perl-module-file-copy += "perl-module-warnings" +RDEPENDS:perl-module-file-dosglob += "perl-module-strict" +RDEPENDS:perl-module-file-dosglob += "perl-module-text-parsewords" +RDEPENDS:perl-module-file-dosglob += "perl-module-warnings" +RDEPENDS:perl-module-file-dosglob += "perl-module-xsloader" +RDEPENDS:perl-module-file-fetch += "perl-module-constant" +RDEPENDS:perl-module-file-fetch += "perl-module-cwd" +RDEPENDS:perl-module-file-fetch += "perl-module-file-basename" +RDEPENDS:perl-module-file-fetch += "perl-module-file-copy" +RDEPENDS:perl-module-file-fetch += "perl-module-filehandle" +RDEPENDS:perl-module-file-fetch += "perl-module-file-path" +RDEPENDS:perl-module-file-fetch += "perl-module-file-temp" +RDEPENDS:perl-module-file-fetch += "perl-module-ipc-cmd" +RDEPENDS:perl-module-file-fetch += "perl-module-locale-maketext-simple" +RDEPENDS:perl-module-file-fetch += "perl-module-load" +RDEPENDS:perl-module-file-fetch += "perl-module-params-check" +RDEPENDS:perl-module-file-fetch += "perl-module-strict" +RDEPENDS:perl-module-file-fetch += "perl-module-vars" +RDEPENDS:perl-module-file-find += "perl-module-cwd" +RDEPENDS:perl-module-file-find += "perl-module-exporter" +RDEPENDS:perl-module-file-find += "perl-module-file-basename" +RDEPENDS:perl-module-file-find += "perl-module-strict" +RDEPENDS:perl-module-file-find += "perl-module-warnings" +RDEPENDS:perl-module-file-find += "perl-module-warnings-register" +RDEPENDS:perl-module-file-globmapper += "perl-module-file-glob" +RDEPENDS:perl-module-file-globmapper += "perl-module-strict" +RDEPENDS:perl-module-file-globmapper += "perl-module-warnings" +RDEPENDS:perl-module-file-glob += "perl-module-exporter" +RDEPENDS:perl-module-file-glob += "perl-module-strict" +RDEPENDS:perl-module-file-glob += "perl-module-xsloader" +RDEPENDS:perl-module-filehandle += "perl-module-exporter" +RDEPENDS:perl-module-filehandle += "perl-module-fcntl" +RDEPENDS:perl-module-filehandle += "perl-module-io-file" +RDEPENDS:perl-module-filehandle += "perl-module-strict" +RDEPENDS:perl-module-file-path += "perl-module-cwd" +RDEPENDS:perl-module-file-path += "perl-module-exporter" +RDEPENDS:perl-module-file-path += "perl-module-file-basename" +RDEPENDS:perl-module-file-path += "perl-module-strict" +RDEPENDS:perl-module-file-path += "perl-module-vars" +RDEPENDS:perl-module-file-stat += "perl-module-class-struct" +RDEPENDS:perl-module-file-stat += "perl-module-constant" +RDEPENDS:perl-module-file-stat += "perl-module-exporter" +RDEPENDS:perl-module-file-stat += "perl-module-fcntl" +RDEPENDS:perl-module-file-stat += "perl-module-overload " +RDEPENDS:perl-module-file-stat += "perl-module-strict" +RDEPENDS:perl-module-file-stat += "perl-module-warnings" +RDEPENDS:perl-module-file-stat += "perl-module-warnings-register" +RDEPENDS:perl-module-file-temp += "perl-module-constant" +RDEPENDS:perl-module-file-temp += "perl-module-cwd" +RDEPENDS:perl-module-file-temp += "perl-module-errno" +RDEPENDS:perl-module-file-temp += "perl-module-exporter" +RDEPENDS:perl-module-file-temp += "perl-module-fcntl" +RDEPENDS:perl-module-file-temp += "perl-module-file-path" +RDEPENDS:perl-module-file-temp += "perl-module-io-seekable" +RDEPENDS:perl-module-file-temp += "perl-module-overload" +RDEPENDS:perl-module-file-temp += "perl-module-parent" +RDEPENDS:perl-module-file-temp += "perl-module-posix" +RDEPENDS:perl-module-file-temp += "perl-module-strict" +RDEPENDS:perl-module-filter-simple += "perl-module-filter-util-call" +RDEPENDS:perl-module-filter-simple += "perl-module-text-balanced" +RDEPENDS:perl-module-filter-util-call += "perl-module-exporter" +RDEPENDS:perl-module-filter-util-call += "perl-module-strict" +RDEPENDS:perl-module-filter-util-call += "perl-module-warnings" +RDEPENDS:perl-module-filter-util-call += "perl-module-xsloader" +RDEPENDS:perl-module-findbin += "perl-module-cwd" +RDEPENDS:perl-module-findbin += "perl-module-exporter" +RDEPENDS:perl-module-findbin += "perl-module-file-basename" +RDEPENDS:perl-module-gdbm-file += "perl-module-exporter" +RDEPENDS:perl-module-gdbm-file += "perl-module-strict" +RDEPENDS:perl-module-gdbm-file += "perl-module-tie-hash" +RDEPENDS:perl-module-gdbm-file += "perl-module-warnings" +RDEPENDS:perl-module-gdbm-file += "perl-module-xsloader" +RDEPENDS:perl-module-getopt-long += "perl-module-constant" +RDEPENDS:perl-module-getopt-long += "perl-module-exporter" +RDEPENDS:perl-module-getopt-long += "perl-module-overload" +RDEPENDS:perl-module-getopt-long += "perl-module-pod-usage" +RDEPENDS:perl-module-getopt-long += "perl-module-strict" +RDEPENDS:perl-module-getopt-long += "perl-module-text-parsewords" +RDEPENDS:perl-module-getopt-long += "perl-module-vars" +RDEPENDS:perl-module-getopt-long += "perl-module-warnings" +RDEPENDS:perl-module-getopt-std += "perl-module-exporter" +RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-exporter" +RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-strict" +RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-warnings" +RDEPENDS:perl-module-hash-util-fieldhash += "perl-module-xsloader" +RDEPENDS:perl-module-hash-util += "perl-module-exporter" +RDEPENDS:perl-module-hash-util += "perl-module-hash-util-fieldhash" +RDEPENDS:perl-module-hash-util += "perl-module-strict" +RDEPENDS:perl-module-hash-util += "perl-module-warnings" +RDEPENDS:perl-module-hash-util += "perl-module-warnings-register" +RDEPENDS:perl-module-hash-util += "perl-module-xsloader" +RDEPENDS:perl-module-i18n-collate += "perl-module-exporter" +RDEPENDS:perl-module-i18n-collate += "perl-module-overload" +RDEPENDS:perl-module-i18n-collate += "perl-module-posix" +RDEPENDS:perl-module-i18n-collate += "perl-module-strict" +RDEPENDS:perl-module-i18n-collate += "perl-module-warnings-register" +RDEPENDS:perl-module-i18n-langinfo += "perl-module-exporter" +RDEPENDS:perl-module-i18n-langinfo += "perl-module-strict" +RDEPENDS:perl-module-i18n-langinfo += "perl-module-warnings" +RDEPENDS:perl-module-i18n-langinfo += "perl-module-xsloader" +RDEPENDS:perl-module-i18n-langtags-detect += "perl-module-i18n-langtags" +RDEPENDS:perl-module-i18n-langtags-detect += "perl-module-strict" +RDEPENDS:perl-module-i18n-langtags-list += "perl-module-strict" +RDEPENDS:perl-module-i18n-langtags += "perl-module-exporter" +RDEPENDS:perl-module-i18n-langtags += "perl-module-strict" +RDEPENDS:perl-module-io-compress-adapter-bzip2 += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-adapter-bzip2 += "perl-module-compress-raw-bzip2" +RDEPENDS:perl-module-io-compress-adapter-bzip2 += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-adapter-bzip2 += "perl-module-strict" +RDEPENDS:perl-module-io-compress-adapter-bzip2 += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-adapter-deflate += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-adapter-deflate += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-compress-adapter-deflate += "perl-module-exporter" +RDEPENDS:perl-module-io-compress-adapter-deflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-adapter-deflate += "perl-module-strict" +RDEPENDS:perl-module-io-compress-adapter-deflate += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-adapter-identity += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-adapter-identity += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-adapter-identity += "perl-module-strict" +RDEPENDS:perl-module-io-compress-adapter-identity += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-constant" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-encode" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-exporter" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-file-globmapper" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-strict " +RDEPENDS:perl-module-io-compress-base-common += "perl-module-strict" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-utf8" +RDEPENDS:perl-module-io-compress-base-common += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-base += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-base += "perl-module-io-file" +RDEPENDS:perl-module-io-compress-base += "perl-module-io-handle " +RDEPENDS:perl-module-io-compress-base += "perl-module-strict " +RDEPENDS:perl-module-io-compress-base += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-exporter " +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-io-compress-adapter-bzip2" +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-io-compress-base" +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-strict " +RDEPENDS:perl-module-io-compress-bzip2 += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-deflate += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-deflate += "perl-module-exporter " +RDEPENDS:perl-module-io-compress-deflate += "perl-module-io-compress-adapter-deflate" +RDEPENDS:perl-module-io-compress-deflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-deflate += "perl-module-io-compress-rawdeflate" +RDEPENDS:perl-module-io-compress-deflate += "perl-module-io-compress-zlib-constants" +RDEPENDS:perl-module-io-compress-deflate += "perl-module-strict " +RDEPENDS:perl-module-io-compress-deflate += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-gzip-constants += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-gzip-constants += "perl-module-constant" +RDEPENDS:perl-module-io-compress-gzip-constants += "perl-module-exporter" +RDEPENDS:perl-module-io-compress-gzip-constants += "perl-module-strict " +RDEPENDS:perl-module-io-compress-gzip-constants += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-exporter " +RDEPENDS:perl-module-io-compress-gzip += "perl-module-io-compress-adapter-deflate" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-io-compress-gzip-constants" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-io-compress-rawdeflate" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-io-compress-zlib-extra" +RDEPENDS:perl-module-io-compress-gzip += "perl-module-strict " +RDEPENDS:perl-module-io-compress-gzip += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-exporter " +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-fcntl" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-io-compress-adapter-deflate" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-io-compress-base" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-strict " +RDEPENDS:perl-module-io-compress-rawdeflate += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-zip-constants += "perl-module-constant" +RDEPENDS:perl-module-io-compress-zip-constants += "perl-module-exporter" +RDEPENDS:perl-module-io-compress-zip-constants += "perl-module-strict " +RDEPENDS:perl-module-io-compress-zip-constants += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-zip += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-zip += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-compress-zip += "perl-module-config" +RDEPENDS:perl-module-io-compress-zip += "perl-module-exporter " +RDEPENDS:perl-module-io-compress-zip += "perl-module-fcntl" +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-adapter-deflate" +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-adapter-identity" +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-bzip2 " +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-rawdeflate" +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-zip-constants" +RDEPENDS:perl-module-io-compress-zip += "perl-module-io-compress-zlib-extra" +RDEPENDS:perl-module-io-compress-zip += "perl-module-strict " +RDEPENDS:perl-module-io-compress-zip += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-zlib-constants += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-zlib-constants += "perl-module-constant" +RDEPENDS:perl-module-io-compress-zlib-constants += "perl-module-exporter" +RDEPENDS:perl-module-io-compress-zlib-constants += "perl-module-strict " +RDEPENDS:perl-module-io-compress-zlib-constants += "perl-module-warnings" +RDEPENDS:perl-module-io-compress-zlib-extra += "perl-module-bytes" +RDEPENDS:perl-module-io-compress-zlib-extra += "perl-module-io-compress-gzip-constants" +RDEPENDS:perl-module-io-compress-zlib-extra += "perl-module-strict " +RDEPENDS:perl-module-io-compress-zlib-extra += "perl-module-warnings" +RDEPENDS:perl-module-io-dir += "perl-module-exporter" +RDEPENDS:perl-module-io-dir += "perl-module-file-stat" +RDEPENDS:perl-module-io-dir += "perl-module-io-file" +RDEPENDS:perl-module-io-dir += "perl-module-strict" +RDEPENDS:perl-module-io-dir += "perl-module-tie-hash" +RDEPENDS:perl-module-io-file += "perl-module-exporter" +RDEPENDS:perl-module-io-file += "perl-module-fcntl" +RDEPENDS:perl-module-io-file += "perl-module-io-seekable" +RDEPENDS:perl-module-io-file += "perl-module-selectsaver" +RDEPENDS:perl-module-io-file += "perl-module-strict" +RDEPENDS:perl-module-io-handle += "perl-module-exporter" +RDEPENDS:perl-module-io-handle += "perl-module-io" +RDEPENDS:perl-module-io-handle += "perl-module-io-file" +RDEPENDS:perl-module-io-handle += "perl-module-selectsaver" +RDEPENDS:perl-module-io-handle += "perl-module-strict" +RDEPENDS:perl-module-io += "perl-module-strict" +RDEPENDS:perl-module-io += "perl-module-warnings" +RDEPENDS:perl-module-io += "perl-module-xsloader" +RDEPENDS:perl-module-io-pipe += "perl-module-fcntl" +RDEPENDS:perl-module-io-pipe += "perl-module-io-handle" +RDEPENDS:perl-module-io-pipe += "perl-module-strict" +RDEPENDS:perl-module-io-poll += "perl-module-exporter" +RDEPENDS:perl-module-io-poll += "perl-module-io-handle" +RDEPENDS:perl-module-io-poll += "perl-module-strict" +RDEPENDS:perl-module-io-seekable += "perl-module-exporter" +RDEPENDS:perl-module-io-seekable += "perl-module-fcntl" +RDEPENDS:perl-module-io-seekable += "perl-module-io-handle" +RDEPENDS:perl-module-io-seekable += "perl-module-strict" +RDEPENDS:perl-module-io-select += "perl-module-exporter" +RDEPENDS:perl-module-io-select += "perl-module-strict" +RDEPENDS:perl-module-io-select += "perl-module-warnings-register" +RDEPENDS:perl-module-io-socket-inet += "perl-module-errno" +RDEPENDS:perl-module-io-socket-inet += "perl-module-exporter" +RDEPENDS:perl-module-io-socket-inet += "perl-module-io-socket" +RDEPENDS:perl-module-io-socket-inet += "perl-module-socket" +RDEPENDS:perl-module-io-socket-inet += "perl-module-strict" +RDEPENDS:perl-module-io-socket-ip += "perl-module-base" +RDEPENDS:perl-module-io-socket-ip += "perl-module-constant" +RDEPENDS:perl-module-io-socket-ip += "perl-module-errno" +RDEPENDS:perl-module-io-socket-ip += "perl-module-posix" +RDEPENDS:perl-module-io-socket-ip += "perl-module-socket" +RDEPENDS:perl-module-io-socket-ip += "perl-module-strict" +RDEPENDS:perl-module-io-socket-ip += "perl-module-warnings" +RDEPENDS:perl-module-io-socket += "perl-module-errno" +RDEPENDS:perl-module-io-socket += "perl-module-exporter" +RDEPENDS:perl-module-io-socket += "perl-module-io-handle" +RDEPENDS:perl-module-io-socket += "perl-module-io-select" +RDEPENDS:perl-module-io-socket += "perl-module-io-socket-inet" +RDEPENDS:perl-module-io-socket += "perl-module-io-socket-unix" +RDEPENDS:perl-module-io-socket += "perl-module-socket" +RDEPENDS:perl-module-io-socket += "perl-module-strict" +RDEPENDS:perl-module-io-socket-unix += "perl-module-io-socket" +RDEPENDS:perl-module-io-socket-unix += "perl-module-strict" +RDEPENDS:perl-module-io-uncompress-adapter-bunzip2 += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-adapter-bunzip2 += "perl-module-compress-raw-bzip2" +RDEPENDS:perl-module-io-uncompress-adapter-bunzip2 += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-adapter-bunzip2 += "perl-module-strict" +RDEPENDS:perl-module-io-uncompress-adapter-bunzip2 += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-adapter-identity += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-adapter-identity += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-uncompress-adapter-identity += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-adapter-identity += "perl-module-io-compress-zip-constants " +RDEPENDS:perl-module-io-uncompress-adapter-identity += "perl-module-strict" +RDEPENDS:perl-module-io-uncompress-adapter-identity += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-adapter-inflate += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-adapter-inflate += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-uncompress-adapter-inflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-adapter-inflate += "perl-module-strict" +RDEPENDS:perl-module-io-uncompress-adapter-inflate += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-adapter-inflate" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-base" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-gunzip" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-inflate" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-rawinflate" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-io-uncompress-unzip" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-strict" +RDEPENDS:perl-module-io-uncompress-anyinflate += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-anyuncompress += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-anyuncompress += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-anyuncompress += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-anyuncompress += "perl-module-io-uncompress-base" +RDEPENDS:perl-module-io-uncompress-anyuncompress += "perl-module-strict" +RDEPENDS:perl-module-io-uncompress-anyuncompress += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-base += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-base += "perl-module-constant" +RDEPENDS:perl-module-io-uncompress-base += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-base += "perl-module-io-file " +RDEPENDS:perl-module-io-uncompress-base += "perl-module-list-util" +RDEPENDS:perl-module-io-uncompress-base += "perl-module-strict " +RDEPENDS:perl-module-io-uncompress-base += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-io-uncompress-adapter-bunzip2" +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-io-uncompress-base" +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-strict " +RDEPENDS:perl-module-io-uncompress-bunzip2 += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-io-compress-gzip-constants" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-io-compress-zlib-extra" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-io-uncompress-rawinflate" +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-strict " +RDEPENDS:perl-module-io-uncompress-gunzip += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-io-compress-zlib-constants" +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-io-uncompress-rawinflate" +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-strict " +RDEPENDS:perl-module-io-uncompress-inflate += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-io-uncompress-adapter-inflate" +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-io-uncompress-base" +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-strict " +RDEPENDS:perl-module-io-uncompress-rawinflate += "perl-module-warnings" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-bytes" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-compress-raw-zlib" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-constant" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-encode" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-exporter " +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-fcntl" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-compress-base-common" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-compress-zip-constants" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-compress-zlib-extra" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-file" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-uncompress-adapter-identity" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-uncompress-adapter-inflate" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-uncompress-rawinflate" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-posix" +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-strict " +RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-warnings" +RDEPENDS:perl-module-io-zlib += "perl-module-fcntl" +RDEPENDS:perl-module-io-zlib += "perl-module-io-handle" +RDEPENDS:perl-module-io-zlib += "perl-module-strict" +RDEPENDS:perl-module-io-zlib += "perl-module-tie-handle" +RDEPENDS:perl-module-io-zlib += "perl-module-vars" +RDEPENDS:perl-module-ipc-cmd += "perl-module-constant" +RDEPENDS:perl-module-ipc-cmd += "perl-module-exporter" +RDEPENDS:perl-module-ipc-cmd += "perl-module-extutils-makemaker" +RDEPENDS:perl-module-ipc-cmd += "perl-module-filehandle" +RDEPENDS:perl-module-ipc-cmd += "perl-module-io-handle" +RDEPENDS:perl-module-ipc-cmd += "perl-module-io-select" +RDEPENDS:perl-module-ipc-cmd += "perl-module-ipc-open3" +RDEPENDS:perl-module-ipc-cmd += "perl-module-locale-maketext-simple" +RDEPENDS:perl-module-ipc-cmd += "perl-module-load" +RDEPENDS:perl-module-ipc-cmd += "perl-module-params-check" +RDEPENDS:perl-module-ipc-cmd += "perl-module-posix" +RDEPENDS:perl-module-ipc-cmd += "perl-module-socket" +RDEPENDS:perl-module-ipc-cmd += "perl-module-strict" +RDEPENDS:perl-module-ipc-cmd += "perl-module-text-parsewords" +RDEPENDS:perl-module-ipc-cmd += "perl-module-time-hires" +RDEPENDS:perl-module-ipc-cmd += "perl-module-vars" +RDEPENDS:perl-module-ipc-msg += "perl-module-class-struct" +RDEPENDS:perl-module-ipc-msg += "perl-module-ipc-sysv" +RDEPENDS:perl-module-ipc-msg += "perl-module-strict" +RDEPENDS:perl-module-ipc-msg += "perl-module-vars" +RDEPENDS:perl-module-ipc-open2 += "perl-module-exporter" +RDEPENDS:perl-module-ipc-open2 += "perl-module-ipc-open3" +RDEPENDS:perl-module-ipc-open2 += "perl-module-strict" +RDEPENDS:perl-module-ipc-open3 += "perl-module-constant" +RDEPENDS:perl-module-ipc-open3 += "perl-module-exporter" +RDEPENDS:perl-module-ipc-open3 += "perl-module-fcntl" +RDEPENDS:perl-module-ipc-open3 += "perl-module-io-pipe" +RDEPENDS:perl-module-ipc-open3 += "perl-module-posix" +RDEPENDS:perl-module-ipc-open3 += "perl-module-strict" +RDEPENDS:perl-module-ipc-semaphore += "perl-module-class-struct" +RDEPENDS:perl-module-ipc-semaphore += "perl-module-ipc-sysv" +RDEPENDS:perl-module-ipc-semaphore += "perl-module-strict" +RDEPENDS:perl-module-ipc-semaphore += "perl-module-vars" +RDEPENDS:perl-module-ipc-sharedmem += "perl-module-class-struct" +RDEPENDS:perl-module-ipc-sharedmem += "perl-module-ipc-sysv" +RDEPENDS:perl-module-ipc-sharedmem += "perl-module-strict" +RDEPENDS:perl-module-ipc-sharedmem += "perl-module-vars" +RDEPENDS:perl-module-ipc-sysv += "perl-module-config" +RDEPENDS:perl-module-ipc-sysv += "perl-module-dynaloader" +RDEPENDS:perl-module-ipc-sysv += "perl-module-exporter" +RDEPENDS:perl-module-ipc-sysv += "perl-module-strict" +RDEPENDS:perl-module-ipc-sysv += "perl-module-vars" +RDEPENDS:perl-module-json-pp-boolean += "perl-module-overload" +RDEPENDS:perl-module-json-pp-boolean += "perl-module-strict" +RDEPENDS:perl-module-json-pp += "perl-module-b" +RDEPENDS:perl-module-json-pp += "perl-module-bytes" +RDEPENDS:perl-module-json-pp += "perl-module-constant" +RDEPENDS:perl-module-json-pp += "perl-module-encode" +RDEPENDS:perl-module-json-pp += "perl-module-exporter" +RDEPENDS:perl-module-json-pp += "perl-module-json-pp-boolean" +RDEPENDS:perl-module-json-pp += "perl-module-math-bigfloat" +RDEPENDS:perl-module-json-pp += "perl-module-math-bigint" +RDEPENDS:perl-module-json-pp += "perl-module-overload" +RDEPENDS:perl-module-json-pp += "perl-module-strict" +RDEPENDS:perl-module-json-pp += "perl-module-subs" +RDEPENDS:perl-module-less += "perl-module-strict" +RDEPENDS:perl-module-less += "perl-module-warnings" +RDEPENDS:perl-module-lib += "perl-module-config" +RDEPENDS:perl-module-lib += "perl-module-strict" +RDEPENDS:perl-module-list-util += "perl-module-exporter" +RDEPENDS:perl-module-list-util += "perl-module-strict" +RDEPENDS:perl-module-list-util += "perl-module-warnings" +RDEPENDS:perl-module-list-util += "perl-module-xsloader" +RDEPENDS:perl-module-list-util-xs += "perl-module-list-util" +RDEPENDS:perl-module-list-util-xs += "perl-module-strict" +RDEPENDS:perl-module-list-util-xs += "perl-module-warnings" +RDEPENDS:perl-module-loaded += "perl-module-strict" +RDEPENDS:perl-module-loaded += "perl-module-vars" +RDEPENDS:perl-module-load += "perl-module-config" +RDEPENDS:perl-module-load += "perl-module-constant" +RDEPENDS:perl-module-load += "perl-module-exporter" +RDEPENDS:perl-module-load += "perl-module-filehandle" +RDEPENDS:perl-module-load += "perl-module-locale-maketext-simple" +RDEPENDS:perl-module-load += "perl-module-corelist" +RDEPENDS:perl-module-load += "perl-module-load" +RDEPENDS:perl-module-load += "perl-module-params-check" +RDEPENDS:perl-module-load += "perl-module-strict" +RDEPENDS:perl-module-load += "perl-module-vars" +RDEPENDS:perl-module-load += "perl-module-version" +RDEPENDS:perl-module-load += "perl-module-warnings" +RDEPENDS:perl-module-locale-maketext-gutsloader += "perl-module-locale-maketext" +RDEPENDS:perl-module-locale-maketext-guts += "perl-module-locale-maketext" +RDEPENDS:perl-module-locale-maketext += "perl-module-i18n-langtags" +RDEPENDS:perl-module-locale-maketext += "perl-module-i18n-langtags-detect" +RDEPENDS:perl-module-locale-maketext += "perl-module-integer" +RDEPENDS:perl-module-locale-maketext += "perl-module-strict" +RDEPENDS:perl-module-locale-maketext-simple += "perl-module-base" +RDEPENDS:perl-module-locale-maketext-simple += "perl-module-strict" +RDEPENDS:perl-module-locale += "perl-module-config" +RDEPENDS:perl-module-math-bigfloat += "perl-module-exporter" +RDEPENDS:perl-module-math-bigfloat += "perl-module-math-bigint" +RDEPENDS:perl-module-math-bigfloat += "perl-module-math-complex" +RDEPENDS:perl-module-math-bigfloat += "perl-module-overload" +RDEPENDS:perl-module-math-bigfloat += "perl-module-strict" +RDEPENDS:perl-module-math-bigfloat += "perl-module-warnings" +RDEPENDS:perl-module-math-bigfloat-trace += "perl-module-exporter" +RDEPENDS:perl-module-math-bigfloat-trace += "perl-module-math-bigfloat" +RDEPENDS:perl-module-math-bigfloat-trace += "perl-module-overload" +RDEPENDS:perl-module-math-bigfloat-trace += "perl-module-strict" +RDEPENDS:perl-module-math-bigfloat-trace += "perl-module-warnings" +RDEPENDS:perl-module-math-bigint-calc += "perl-module-constant" +RDEPENDS:perl-module-math-bigint-calc += "perl-module-integer" +RDEPENDS:perl-module-math-bigint-calc += "perl-module-math-bigint-lib" +RDEPENDS:perl-module-math-bigint-calc += "perl-module-strict" +RDEPENDS:perl-module-math-bigint-calc += "perl-module-warnings" +RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-math-bigint-calc" +RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-strict" +RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-warnings" +RDEPENDS:perl-module-math-bigint-fastcalc += "perl-module-xsloader" +RDEPENDS:perl-module-math-bigint-lib += "perl-module-overload" +RDEPENDS:perl-module-math-bigint-lib += "perl-module-strict" +RDEPENDS:perl-module-math-bigint-lib += "perl-module-warnings" +RDEPENDS:perl-module-math-bigint += "perl-module-exporter" +RDEPENDS:perl-module-math-bigint += "perl-module-math-bigfloat" +RDEPENDS:perl-module-math-bigint += "perl-module-math-complex" +RDEPENDS:perl-module-math-bigint += "perl-module-overload" +RDEPENDS:perl-module-math-bigint += "perl-module-strict" +RDEPENDS:perl-module-math-bigint += "perl-module-warnings" +RDEPENDS:perl-module-math-bigint-trace += "perl-module-exporter" +RDEPENDS:perl-module-math-bigint-trace += "perl-module-math-bigint" +RDEPENDS:perl-module-math-bigint-trace += "perl-module-overload" +RDEPENDS:perl-module-math-bigint-trace += "perl-module-strict" +RDEPENDS:perl-module-math-bigint-trace += "perl-module-warnings" +RDEPENDS:perl-module-math-bigrat += "perl-module-math-bigfloat" +RDEPENDS:perl-module-math-bigrat += "perl-module-math-bigint" +RDEPENDS:perl-module-math-bigrat += "perl-module-overload" +RDEPENDS:perl-module-math-bigrat += "perl-module-strict" +RDEPENDS:perl-module-math-bigrat += "perl-module-warnings" +RDEPENDS:perl-module-math-complex += "perl-module-config" +RDEPENDS:perl-module-math-complex += "perl-module-exporter" +RDEPENDS:perl-module-math-complex += "perl-module-overload" +RDEPENDS:perl-module-math-complex += "perl-module-strict" +RDEPENDS:perl-module-math-complex += "perl-module-warnings" +RDEPENDS:perl-module-math-trig += "perl-module-exporter" +RDEPENDS:perl-module-math-trig += "perl-module-math-complex" +RDEPENDS:perl-module-math-trig += "perl-module-strict" +RDEPENDS:perl-module-memoize-anydbm-file += "perl-module-vars" +RDEPENDS:perl-module-memoize += "perl-module-config" +RDEPENDS:perl-module-memoize += "perl-module-exporter" +RDEPENDS:perl-module-memoize += "perl-module-strict" +RDEPENDS:perl-module-memoize += "perl-module-vars" +RDEPENDS:perl-module-memoize-sdbm-file += "perl-module-sdbm-file" +RDEPENDS:perl-module-memoize-storable += "perl-module-storable" +RDEPENDS:perl-module-mime-base64 += "perl-module-exporter" +RDEPENDS:perl-module-mime-base64 += "perl-module-strict" +RDEPENDS:perl-module-mime-base64 += "perl-module-vars" +RDEPENDS:perl-module-mime-base64 += "perl-module-xsloader" +RDEPENDS:perl-module-mime-quotedprint += "perl-module-exporter" +RDEPENDS:perl-module-mime-quotedprint += "perl-module-mime-base64" +RDEPENDS:perl-module-mime-quotedprint += "perl-module-strict" +RDEPENDS:perl-module-mime-quotedprint += "perl-module-vars" +RDEPENDS:perl-module-mro += "perl-module-strict" +RDEPENDS:perl-module-mro += "perl-module-warnings" +RDEPENDS:perl-module-mro += "perl-module-xsloader" +RDEPENDS:perl-module-net-cmd += "perl-module-constant" +RDEPENDS:perl-module-net-cmd += "perl-module-errno" +RDEPENDS:perl-module-net-cmd += "perl-module-exporter" +RDEPENDS:perl-module-net-cmd += "perl-module-strict" +RDEPENDS:perl-module-net-cmd += "perl-module-warnings" +RDEPENDS:perl-module-net-config += "perl-module-exporter" +RDEPENDS:perl-module-net-config += "perl-module-socket" +RDEPENDS:perl-module-net-config += "perl-module-strict" +RDEPENDS:perl-module-net-config += "perl-module-warnings" +RDEPENDS:perl-module-net-domain += "perl-module-exporter" +RDEPENDS:perl-module-net-domain += "perl-module-net-config" +RDEPENDS:perl-module-net-domain += "perl-module-posix" +RDEPENDS:perl-module-net-domain += "perl-module-socket" +RDEPENDS:perl-module-net-domain += "perl-module-strict" +RDEPENDS:perl-module-net-domain += "perl-module-warnings" +RDEPENDS:perl-module-net-ftp-a += "perl-module-net-ftp-dataconn" +RDEPENDS:perl-module-net-ftp-a += "perl-module-strict" +RDEPENDS:perl-module-net-ftp-a += "perl-module-warnings" +RDEPENDS:perl-module-net-ftp-dataconn += "perl-module-errno" +RDEPENDS:perl-module-net-ftp-dataconn += "perl-module-net-cmd" +RDEPENDS:perl-module-net-ftp-dataconn += "perl-module-strict" +RDEPENDS:perl-module-net-ftp-dataconn += "perl-module-warnings" +RDEPENDS:perl-module-net-ftp-e += "perl-module-net-ftp-i" +RDEPENDS:perl-module-net-ftp-e += "perl-module-strict" +RDEPENDS:perl-module-net-ftp-e += "perl-module-warnings" +RDEPENDS:perl-module-net-ftp-i += "perl-module-net-ftp-dataconn" +RDEPENDS:perl-module-net-ftp-i += "perl-module-strict" +RDEPENDS:perl-module-net-ftp-i += "perl-module-warnings" +RDEPENDS:perl-module-net-ftp-l += "perl-module-net-ftp-i" +RDEPENDS:perl-module-net-ftp-l += "perl-module-strict" +RDEPENDS:perl-module-net-ftp-l += "perl-module-warnings" +RDEPENDS:perl-module-net-ftp += "perl-module-constant" +RDEPENDS:perl-module-net-ftp += "perl-module-fcntl" +RDEPENDS:perl-module-net-ftp += "perl-module-file-basename" +RDEPENDS:perl-module-net-ftp += "perl-module-io-socket" +RDEPENDS:perl-module-net-ftp += "perl-module-io-socket-ip" +RDEPENDS:perl-module-net-ftp += "perl-module-net-cmd" +RDEPENDS:perl-module-net-ftp += "perl-module-net-config" +RDEPENDS:perl-module-net-ftp += "perl-module-net-ftp-a" +RDEPENDS:perl-module-net-ftp += "perl-module-net-netrc" +RDEPENDS:perl-module-net-ftp += "perl-module-socket" +RDEPENDS:perl-module-net-ftp += "perl-module-strict" +RDEPENDS:perl-module-net-ftp += "perl-module-time-local" +RDEPENDS:perl-module-net-ftp += "perl-module-warnings" +RDEPENDS:perl-module-net-hostent += "perl-module-class-struct" +RDEPENDS:perl-module-net-hostent += "perl-module-exporter" +RDEPENDS:perl-module-net-hostent += "perl-module-socket" +RDEPENDS:perl-module-net-hostent += "perl-module-strict" +RDEPENDS:perl-module-net-netent += "perl-module-class-struct" +RDEPENDS:perl-module-net-netent += "perl-module-exporter" +RDEPENDS:perl-module-net-netent += "perl-module-socket" +RDEPENDS:perl-module-net-netent += "perl-module-strict" +RDEPENDS:perl-module-net-netrc += "perl-module-filehandle" +RDEPENDS:perl-module-net-netrc += "perl-module-strict" +RDEPENDS:perl-module-net-netrc += "perl-module-warnings" +RDEPENDS:perl-module-net-nntp += "perl-module-io-socket" +RDEPENDS:perl-module-net-nntp += "perl-module-io-socket-ip" +RDEPENDS:perl-module-net-nntp += "perl-module-net-cmd" +RDEPENDS:perl-module-net-nntp += "perl-module-net-config" +RDEPENDS:perl-module-net-nntp += "perl-module-strict" +RDEPENDS:perl-module-net-nntp += "perl-module-time-local" +RDEPENDS:perl-module-net-nntp += "perl-module-warnings" +RDEPENDS:perl-module-net-ping += "perl-module-constant" +RDEPENDS:perl-module-net-ping += "perl-module-exporter" +RDEPENDS:perl-module-net-ping += "perl-module-fcntl" +RDEPENDS:perl-module-net-ping += "perl-module-filehandle" +RDEPENDS:perl-module-net-ping += "perl-module-io-socket-inet" +RDEPENDS:perl-module-net-ping += "perl-module-posix" +RDEPENDS:perl-module-net-ping += "perl-module-socket" +RDEPENDS:perl-module-net-ping += "perl-module-strict" +RDEPENDS:perl-module-net-ping += "perl-module-time-hires" +RDEPENDS:perl-module-net-pop3 += "perl-module-io-socket" +RDEPENDS:perl-module-net-pop3 += "perl-module-io-socket-ip" +RDEPENDS:perl-module-net-pop3 += "perl-module-mime-base64" +RDEPENDS:perl-module-net-pop3 += "perl-module-net-cmd" +RDEPENDS:perl-module-net-pop3 += "perl-module-net-config" +RDEPENDS:perl-module-net-pop3 += "perl-module-net-netrc" +RDEPENDS:perl-module-net-pop3 += "perl-module-strict" +RDEPENDS:perl-module-net-pop3 += "perl-module-warnings" +RDEPENDS:perl-module-net-protoent += "perl-module-class-struct" +RDEPENDS:perl-module-net-protoent += "perl-module-exporter" +RDEPENDS:perl-module-net-protoent += "perl-module-strict" +RDEPENDS:perl-module-net-servent += "perl-module-class-struct" +RDEPENDS:perl-module-net-servent += "perl-module-exporter" +RDEPENDS:perl-module-net-servent += "perl-module-strict" +RDEPENDS:perl-module-net-smtp += "perl-module-io-socket" +RDEPENDS:perl-module-net-smtp += "perl-module-io-socket-ip" +RDEPENDS:perl-module-net-smtp += "perl-module-mime-base64" +RDEPENDS:perl-module-net-smtp += "perl-module-net-cmd" +RDEPENDS:perl-module-net-smtp += "perl-module-net-config" +RDEPENDS:perl-module-net-smtp += "perl-module-socket" +RDEPENDS:perl-module-net-smtp += "perl-module-strict" +RDEPENDS:perl-module-net-smtp += "perl-module-warnings" +RDEPENDS:perl-module-net-time += "perl-module-exporter" +RDEPENDS:perl-module-net-time += "perl-module-io-select" +RDEPENDS:perl-module-net-time += "perl-module-io-socket" +RDEPENDS:perl-module-net-time += "perl-module-net-config" +RDEPENDS:perl-module-net-time += "perl-module-strict" +RDEPENDS:perl-module-net-time += "perl-module-warnings" +RDEPENDS:perl-module-next += "perl-module-overload" +RDEPENDS:perl-module-next += "perl-module-strict" +RDEPENDS:perl-module-next += "perl-module-warnings" +RDEPENDS:perl-module-ok += "perl-module-strict" +RDEPENDS:perl-module-ok += "perl-module-test-more" +RDEPENDS:perl-module-opcode += "perl-module-exporter" +RDEPENDS:perl-module-opcode += "perl-module-strict" +RDEPENDS:perl-module-opcode += "perl-module-subs" +RDEPENDS:perl-module-opcode += "perl-module-xsloader" +RDEPENDS:perl-module-open += "perl-module-encode" +RDEPENDS:perl-module-open += "perl-module-encoding" +RDEPENDS:perl-module-open += "perl-module-warnings" +RDEPENDS:perl-module-o += "perl-module-b" +RDEPENDS:perl-module-ops += "perl-module-opcode" +RDEPENDS:perl-module-overloading += "perl-module-overload-numbers" +RDEPENDS:perl-module-overloading += "perl-module-warnings" +RDEPENDS:perl-module-overload += "perl-module-mro" +RDEPENDS:perl-module-overload += "perl-module-warnings-register" +RDEPENDS:perl-module-params-check += "perl-module-exporter" +RDEPENDS:perl-module-params-check += "perl-module-locale-maketext-simple" +RDEPENDS:perl-module-params-check += "perl-module-strict" +RDEPENDS:perl-module-params-check += "perl-module-vars" +RDEPENDS:perl-module-parent += "perl-module-strict" +RDEPENDS:perl-module-perlfaq += "perl-module-strict" +RDEPENDS:perl-module-perlfaq += "perl-module-warnings" +RDEPENDS:perl-module-perlio-encoding += "perl-module-strict" +RDEPENDS:perl-module-perlio-encoding += "perl-module-xsloader" +RDEPENDS:perl-module-perlio-mmap += "perl-module-strict" +RDEPENDS:perl-module-perlio-mmap += "perl-module-warnings" +RDEPENDS:perl-module-perlio-mmap += "perl-module-xsloader" +RDEPENDS:perl-module-perlio-scalar += "perl-module-xsloader" +RDEPENDS:perl-module-perlio-via += "perl-module-xsloader" +RDEPENDS:perl-module-perlio-via-quotedprint += "perl-module-mime-quotedprint" +RDEPENDS:perl-module-perlio-via-quotedprint += "perl-module-strict" +RDEPENDS:perl-module-pod-checker += "perl-module-base" +RDEPENDS:perl-module-pod-checker += "perl-module-exporter" +RDEPENDS:perl-module-pod-checker += "perl-module-strict" +RDEPENDS:perl-module-pod-checker += "perl-module-warnings" +RDEPENDS:perl-module-pod-escapes += "perl-module-exporter" +RDEPENDS:perl-module-pod-escapes += "perl-module-strict" +RDEPENDS:perl-module-pod-escapes += "perl-module-vars" +RDEPENDS:perl-module-pod-escapes += "perl-module-warnings" +RDEPENDS:perl-module-pod-functions += "perl-module-exporter" +RDEPENDS:perl-module-pod-functions += "perl-module-strict" +RDEPENDS:perl-module-pod-man += "perl-module-file-basename" +RDEPENDS:perl-module-pod-man += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-man += "perl-module-strict" +RDEPENDS:perl-module-pod-man += "perl-module-subs" +RDEPENDS:perl-module-pod-man += "perl-module-vars" +RDEPENDS:perl-module-pod-man += "perl-module-warnings" +RDEPENDS:perl-module-pod-parselink += "perl-module-exporter" +RDEPENDS:perl-module-pod-parselink += "perl-module-strict" +RDEPENDS:perl-module-pod-parselink += "perl-module-vars" +RDEPENDS:perl-module-pod-parselink += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-baseto += "perl-module-config" +RDEPENDS:perl-module-pod-perldoc-baseto += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-baseto += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-baseto += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-getoptsoo += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-getoptsoo += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc += "perl-module-config" +RDEPENDS:perl-module-pod-perldoc += "perl-module-encode" +RDEPENDS:perl-module-pod-perldoc += "perl-module-fcntl" +RDEPENDS:perl-module-pod-perldoc += "perl-module-file-basename" +RDEPENDS:perl-module-pod-perldoc += "perl-module-file-temp" +RDEPENDS:perl-module-pod-perldoc += "perl-module-pod-perldoc-getoptsoo" +RDEPENDS:perl-module-pod-perldoc += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc += "perl-module-text-parsewords" +RDEPENDS:perl-module-pod-perldoc += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-toansi += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-toansi += "perl-module-pod-text-color" +RDEPENDS:perl-module-pod-perldoc-toansi += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-toansi += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-toansi += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-tochecker += "perl-module-pod-checker" +RDEPENDS:perl-module-pod-perldoc-tochecker += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-tochecker += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-tochecker += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-encode" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-io-handle" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-io-select" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-ipc-open3" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-pod-man" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-pod-perldoc-topod" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-toman += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-tonroff += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-tonroff += "perl-module-pod-man" +RDEPENDS:perl-module-pod-perldoc-tonroff += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-tonroff += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-tonroff += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-topod += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-topod += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-topod += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-topod += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-tortf += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-tortf += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-tortf += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-tortf += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-toterm += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-toterm += "perl-module-pod-text-termcap" +RDEPENDS:perl-module-pod-perldoc-toterm += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-toterm += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-toterm += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-totext += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-totext += "perl-module-pod-text" +RDEPENDS:perl-module-pod-perldoc-totext += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-totext += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-totext += "perl-module-warnings" +RDEPENDS:perl-module-pod-perldoc-toxml += "perl-module-parent" +RDEPENDS:perl-module-pod-perldoc-toxml += "perl-module-strict" +RDEPENDS:perl-module-pod-perldoc-toxml += "perl-module-vars" +RDEPENDS:perl-module-pod-perldoc-toxml += "perl-module-warnings" +RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-if" +RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-integer" +RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-pod-simple-transcode" +RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-checker += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-checker += "perl-module-pod-simple-methody" +RDEPENDS:perl-module-pod-simple-checker += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-checker += "perl-module-text-wrap" +RDEPENDS:perl-module-pod-simple-checker += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-debug += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-debug += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-debug += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-dumpastext += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-dumpastext += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-text-wrap" +RDEPENDS:perl-module-pod-simple-justpod += "perl-module-pod-simple-methody" +RDEPENDS:perl-module-pod-simple-justpod += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-justpod += "perl-module-warnings" +RDEPENDS:perl-module-pod-simple-linksection += "perl-module-overload" +RDEPENDS:perl-module-pod-simple-linksection += "perl-module-pod-simple-blackbox" +RDEPENDS:perl-module-pod-simple-linksection += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-linksection += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-methody += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-methody += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-methody += "perl-module-vars" +RDEPENDS:perl-module-pod-simple += "perl-module-integer" +RDEPENDS:perl-module-pod-simple += "perl-module-pod-escapes" +RDEPENDS:perl-module-pod-simple += "perl-module-pod-simple-blackbox" +RDEPENDS:perl-module-pod-simple += "perl-module-pod-simple-linksection" +RDEPENDS:perl-module-pod-simple += "perl-module-pod-simple-tiedoutfh" +RDEPENDS:perl-module-pod-simple += "perl-module-strict" +RDEPENDS:perl-module-pod-simple += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-progress += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-pod-simple-pullparsertoken" +RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparserendtoken" +RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparserstarttoken" +RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparsertexttoken" +RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-pod-simple-pullparsertoken" +RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-pod-simple-pullparsertoken" +RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-pullparsertoken += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-rtf += "perl-module-if" +RDEPENDS:perl-module-pod-simple-rtf += "perl-module-integer" +RDEPENDS:perl-module-pod-simple-rtf += "perl-module-pod-simple-pullparser" +RDEPENDS:perl-module-pod-simple-rtf += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-rtf += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-search += "perl-module-config" +RDEPENDS:perl-module-pod-simple-search += "perl-module-cwd" +RDEPENDS:perl-module-pod-simple-search += "perl-module-file-basename" +RDEPENDS:perl-module-pod-simple-search += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-search += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-text += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-text += "perl-module-pod-simple-methody" +RDEPENDS:perl-module-pod-simple-text += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-text += "perl-module-text-wrap" +RDEPENDS:perl-module-pod-simple-text += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-tiedoutfh += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-tiedoutfh += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-transcodedumb += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-transcodedumb += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-transcode += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-transcode += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-encode" +RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-vars" +RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-strict" +RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-vars" +RDEPENDS:perl-module-pod-text-color += "perl-module-pod-text" +RDEPENDS:perl-module-pod-text-color += "perl-module-strict" +RDEPENDS:perl-module-pod-text-color += "perl-module-term-ansicolor" +RDEPENDS:perl-module-pod-text-color += "perl-module-vars" +RDEPENDS:perl-module-pod-text-color += "perl-module-warnings" +RDEPENDS:perl-module-pod-text-overstrike += "perl-module-pod-text" +RDEPENDS:perl-module-pod-text-overstrike += "perl-module-strict" +RDEPENDS:perl-module-pod-text-overstrike += "perl-module-vars" +RDEPENDS:perl-module-pod-text-overstrike += "perl-module-warnings" +RDEPENDS:perl-module-pod-text += "perl-module-encode" +RDEPENDS:perl-module-pod-text += "perl-module-exporter" +RDEPENDS:perl-module-pod-text += "perl-module-pod-simple" +RDEPENDS:perl-module-pod-text += "perl-module-strict" +RDEPENDS:perl-module-pod-text += "perl-module-vars" +RDEPENDS:perl-module-pod-text += "perl-module-warnings" +RDEPENDS:perl-module-pod-text-termcap += "perl-module-pod-text" +RDEPENDS:perl-module-pod-text-termcap += "perl-module-posix" +RDEPENDS:perl-module-pod-text-termcap += "perl-module-strict" +RDEPENDS:perl-module-pod-text-termcap += "perl-module-term-cap" +RDEPENDS:perl-module-pod-text-termcap += "perl-module-vars" +RDEPENDS:perl-module-pod-text-termcap += "perl-module-warnings" +RDEPENDS:perl-module-pod-usage += "perl-module-config" +RDEPENDS:perl-module-pod-usage += "perl-module-exporter" +RDEPENDS:perl-module-pod-usage += "perl-module-strict" +RDEPENDS:perl-module-pod-usage += "perl-module-vars" +RDEPENDS:perl-module-posix += "perl-module-exporter" +RDEPENDS:perl-module-posix += "perl-module-fcntl" +RDEPENDS:perl-module-posix += "perl-module-strict" +RDEPENDS:perl-module-posix += "perl-module-tie-hash" +RDEPENDS:perl-module-posix += "perl-module-warnings" +RDEPENDS:perl-module-posix += "perl-module-xsloader" +RDEPENDS:perl-module-re += "perl-module-exporter" +RDEPENDS:perl-module-re += "perl-module-strict" +RDEPENDS:perl-module-re += "perl-module-term-cap" +RDEPENDS:perl-module-re += "perl-module-warnings" +RDEPENDS:perl-module-re += "perl-module-xsloader" +RDEPENDS:perl-module-safe += "perl-module-b" +RDEPENDS:perl-module-safe += "perl-module-opcode" +RDEPENDS:perl-module-safe += "perl-module-strict" +RDEPENDS:perl-module-safe += "perl-module-utf8" +RDEPENDS:perl-module-sdbm-file += "perl-module-exporter" +RDEPENDS:perl-module-sdbm-file += "perl-module-strict" +RDEPENDS:perl-module-sdbm-file += "perl-module-tie-hash" +RDEPENDS:perl-module-sdbm-file += "perl-module-warnings" +RDEPENDS:perl-module-sdbm-file += "perl-module-xsloader" +RDEPENDS:perl-module-search-dict += "perl-module-exporter" +RDEPENDS:perl-module-search-dict += "perl-module-feature" +RDEPENDS:perl-module-search-dict += "perl-module-strict" +RDEPENDS:perl-module-selfloader += "perl-module-exporter" +RDEPENDS:perl-module-selfloader += "perl-module-io-handle" +RDEPENDS:perl-module-selfloader += "perl-module-strict" +RDEPENDS:perl-module-socket += "perl-module-exporter" +RDEPENDS:perl-module-socket += "perl-module-strict" +RDEPENDS:perl-module-socket += "perl-module-warnings-register" +RDEPENDS:perl-module-socket += "perl-module-xsloader" +RDEPENDS:perl-module-sort += "perl-module-strict" +RDEPENDS:perl-module-storable += "perl-module-exporter" +RDEPENDS:perl-module-storable += "perl-module-io-file" +RDEPENDS:perl-module-sub-util += "perl-module-exporter" +RDEPENDS:perl-module-sub-util += "perl-module-list-util" +RDEPENDS:perl-module-sub-util += "perl-module-strict" +RDEPENDS:perl-module-sub-util += "perl-module-warnings" +RDEPENDS:perl-module-sys-hostname += "perl-module-exporter" +RDEPENDS:perl-module-sys-hostname += "perl-module-posix" +RDEPENDS:perl-module-sys-hostname += "perl-module-strict" +RDEPENDS:perl-module-sys-hostname += "perl-module-warnings" +RDEPENDS:perl-module-sys-hostname += "perl-module-xsloader" +RDEPENDS:perl-module-sys-syslog += "perl-module-config" +RDEPENDS:perl-module-sys-syslog += "perl-module-constant" +RDEPENDS:perl-module-sys-syslog += "perl-module-dynaloader" +RDEPENDS:perl-module-sys-syslog += "perl-module-exporter" +RDEPENDS:perl-module-sys-syslog += "perl-module-fcntl" +RDEPENDS:perl-module-sys-syslog += "perl-module-file-basename" +RDEPENDS:perl-module-sys-syslog += "perl-module-posix" +RDEPENDS:perl-module-sys-syslog += "perl-module-socket" +RDEPENDS:perl-module-sys-syslog += "perl-module-strict" +RDEPENDS:perl-module-sys-syslog += "perl-module-sys-hostname" +RDEPENDS:perl-module-sys-syslog += "perl-module-vars" +RDEPENDS:perl-module-sys-syslog += "perl-module-warnings" +RDEPENDS:perl-module-sys-syslog += "perl-module-warnings-register" +RDEPENDS:perl-module-sys-syslog += "perl-module-xsloader" +RDEPENDS:perl-module-tap-base += "perl-module-base" +RDEPENDS:perl-module-tap-base += "perl-module-constant" +RDEPENDS:perl-module-tap-base += "perl-module-strict" +RDEPENDS:perl-module-tap-base += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-base += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-base += "perl-module-posix" +RDEPENDS:perl-module-tap-formatter-base += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-base += "perl-module-tap-formatter-color" +RDEPENDS:perl-module-tap-formatter-base += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-color += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-color += "perl-module-constant" +RDEPENDS:perl-module-tap-formatter-color += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-color += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-console-parallelsession += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-console-parallelsession += "perl-module-constant" +RDEPENDS:perl-module-tap-formatter-console-parallelsession += "perl-module-file-path" +RDEPENDS:perl-module-tap-formatter-console-parallelsession += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-console-parallelsession += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-console += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-console += "perl-module-posix" +RDEPENDS:perl-module-tap-formatter-console += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-console += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-console-session += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-console-session += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-console-session += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-file += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-file += "perl-module-posix" +RDEPENDS:perl-module-tap-formatter-file += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-file += "perl-module-tap-formatter-file-session" +RDEPENDS:perl-module-tap-formatter-file += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-file-session += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-file-session += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-file-session += "perl-module-warnings" +RDEPENDS:perl-module-tap-formatter-session += "perl-module-base" +RDEPENDS:perl-module-tap-formatter-session += "perl-module-strict" +RDEPENDS:perl-module-tap-formatter-session += "perl-module-warnings" +RDEPENDS:perl-module-tap-harness-env += "perl-module-constant" +RDEPENDS:perl-module-tap-harness-env += "perl-module-strict" +RDEPENDS:perl-module-tap-harness-env += "perl-module-tap-object" +RDEPENDS:perl-module-tap-harness-env += "perl-module-text-parsewords" +RDEPENDS:perl-module-tap-harness-env += "perl-module-warnings" +RDEPENDS:perl-module-tap-harness += "perl-module-base" +RDEPENDS:perl-module-tap-harness += "perl-module-file-path" +RDEPENDS:perl-module-tap-harness += "perl-module-io-handle" +RDEPENDS:perl-module-tap-harness += "perl-module-strict" +RDEPENDS:perl-module-tap-harness += "perl-module-warnings" +RDEPENDS:perl-module-tap-object += "perl-module-strict" +RDEPENDS:perl-module-tap-object += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-aggregator += "perl-module-base" +RDEPENDS:perl-module-tap-parser-aggregator += "perl-module-benchmark" +RDEPENDS:perl-module-tap-parser-aggregator += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-aggregator += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-grammar += "perl-module-base" +RDEPENDS:perl-module-tap-parser-grammar += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-grammar += "perl-module-tap-parser-resultfactory" +RDEPENDS:perl-module-tap-parser-grammar += "perl-module-tap-parser-yamlish-reader" +RDEPENDS:perl-module-tap-parser-grammar += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-iterator-array += "perl-module-base" +RDEPENDS:perl-module-tap-parser-iterator-array += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-iterator-array += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-iteratorfactory += "perl-module-base" +RDEPENDS:perl-module-tap-parser-iteratorfactory += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-iteratorfactory += "perl-module-file-basename" +RDEPENDS:perl-module-tap-parser-iteratorfactory += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-iteratorfactory += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-iterator += "perl-module-base" +RDEPENDS:perl-module-tap-parser-iterator += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-iterator += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-iterator-process += "perl-module-base" +RDEPENDS:perl-module-tap-parser-iterator-process += "perl-module-config" +RDEPENDS:perl-module-tap-parser-iterator-process += "perl-module-io-handle" +RDEPENDS:perl-module-tap-parser-iterator-process += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-iterator-process += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-iterator-stream += "perl-module-base" +RDEPENDS:perl-module-tap-parser-iterator-stream += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-iterator-stream += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-base" +RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-io-select" +RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-multiplexer += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser += "perl-module-base" +RDEPENDS:perl-module-tap-parser += "perl-module-strict" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-grammar" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-iterator" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-iteratorfactory" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-result" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-resultfactory" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-source" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-executable" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-file" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-handle" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-perl" +RDEPENDS:perl-module-tap-parser += "perl-module-tap-parser-sourcehandler-rawtap" +RDEPENDS:perl-module-tap-parser += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-bailout += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-bailout += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-bailout += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-comment += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-comment += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-comment += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-base" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-bailout" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-comment" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-plan" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-pragma" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-test" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-unknown" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-version" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-tap-parser-result-yaml" +RDEPENDS:perl-module-tap-parser-resultfactory += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-plan += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-plan += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-plan += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-pragma += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-pragma += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-pragma += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-test += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-test += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-test += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-unknown += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-unknown += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-unknown += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-version += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-version += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-version += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-result-yaml += "perl-module-base" +RDEPENDS:perl-module-tap-parser-result-yaml += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-result-yaml += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-scheduler-job += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-scheduler-job += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-scheduler += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-scheduler += "perl-module-tap-parser-scheduler-job" +RDEPENDS:perl-module-tap-parser-scheduler += "perl-module-tap-parser-scheduler-spinner" +RDEPENDS:perl-module-tap-parser-scheduler += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-scheduler-spinner += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-scheduler-spinner += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-sourcehandler-executable += "perl-module-base" +RDEPENDS:perl-module-tap-parser-sourcehandler-executable += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-sourcehandler-executable += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-sourcehandler-executable += "perl-module-tap-parser-iteratorfactory" +RDEPENDS:perl-module-tap-parser-sourcehandler-executable += "perl-module-tap-parser-iterator-process" +RDEPENDS:perl-module-tap-parser-sourcehandler-executable += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-sourcehandler-file += "perl-module-base" +RDEPENDS:perl-module-tap-parser-sourcehandler-file += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-sourcehandler-file += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-sourcehandler-file += "perl-module-tap-parser-iteratorfactory" +RDEPENDS:perl-module-tap-parser-sourcehandler-file += "perl-module-tap-parser-iterator-stream" +RDEPENDS:perl-module-tap-parser-sourcehandler-file += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-sourcehandler-handle += "perl-module-base" +RDEPENDS:perl-module-tap-parser-sourcehandler-handle += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-sourcehandler-handle += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-sourcehandler-handle += "perl-module-tap-parser-iteratorfactory" +RDEPENDS:perl-module-tap-parser-sourcehandler-handle += "perl-module-tap-parser-iterator-stream" +RDEPENDS:perl-module-tap-parser-sourcehandler-handle += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-sourcehandler += "perl-module-base" +RDEPENDS:perl-module-tap-parser-sourcehandler += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-sourcehandler += "perl-module-tap-parser-iterator" +RDEPENDS:perl-module-tap-parser-sourcehandler += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-base" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-config" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-tap-parser-iteratorfactory" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-tap-parser-iterator-process" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-text-parsewords" +RDEPENDS:perl-module-tap-parser-sourcehandler-perl += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-sourcehandler-rawtap += "perl-module-base" +RDEPENDS:perl-module-tap-parser-sourcehandler-rawtap += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-sourcehandler-rawtap += "perl-module-tap-parser-iterator-array" +RDEPENDS:perl-module-tap-parser-sourcehandler-rawtap += "perl-module-tap-parser-iteratorfactory" +RDEPENDS:perl-module-tap-parser-sourcehandler-rawtap += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-source += "perl-module-base" +RDEPENDS:perl-module-tap-parser-source += "perl-module-constant" +RDEPENDS:perl-module-tap-parser-source += "perl-module-file-basename" +RDEPENDS:perl-module-tap-parser-source += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-source += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-yamlish-reader += "perl-module-base" +RDEPENDS:perl-module-tap-parser-yamlish-reader += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-yamlish-reader += "perl-module-warnings" +RDEPENDS:perl-module-tap-parser-yamlish-writer += "perl-module-base" +RDEPENDS:perl-module-tap-parser-yamlish-writer += "perl-module-strict" +RDEPENDS:perl-module-tap-parser-yamlish-writer += "perl-module-warnings" +RDEPENDS:perl-module-term-ansicolor += "perl-module-exporter" +RDEPENDS:perl-module-term-ansicolor += "perl-module-strict" +RDEPENDS:perl-module-term-ansicolor += "perl-module-warnings" +RDEPENDS:perl-module-term-cap += "perl-module-strict" +RDEPENDS:perl-module-term-cap += "perl-module-vars" +RDEPENDS:perl-module-term-complete += "perl-module-exporter" +RDEPENDS:perl-module-term-complete += "perl-module-strict" +RDEPENDS:perl-module-term-readline += "perl-module-strict" +RDEPENDS:perl-module-term-readline += "perl-module-term-cap" +RDEPENDS:perl-module-test-builder-formatter += "perl-module-strict" +RDEPENDS:perl-module-test-builder-formatter += "perl-module-warnings" +RDEPENDS:perl-module-test-builder-module += "perl-module-exporter" +RDEPENDS:perl-module-test-builder-module += "perl-module-strict" +RDEPENDS:perl-module-test-builder-module += "perl-module-test-builder" +RDEPENDS:perl-module-test-builder += "perl-module-data-dumper" +RDEPENDS:perl-module-test-builder += "perl-module-overload" +RDEPENDS:perl-module-test-builder += "perl-module-strict" +RDEPENDS:perl-module-test-builder += "perl-module-test-builder-formatter" +RDEPENDS:perl-module-test-builder += "perl-module-test-builder-tododiag" +RDEPENDS:perl-module-test-builder += "perl-module-warnings" +RDEPENDS:perl-module-test-builder-tester-color += "perl-module-strict" +RDEPENDS:perl-module-test-builder-tester-color += "perl-module-test-builder-tester" +RDEPENDS:perl-module-test-builder-tester += "perl-module-exporter" +RDEPENDS:perl-module-test-builder-tester += "perl-module-strict" +RDEPENDS:perl-module-test-builder-tester += "perl-module-test-builder" +RDEPENDS:perl-module-test-builder-tododiag += "perl-module-strict" +RDEPENDS:perl-module-test-builder-tododiag += "perl-module-warnings" +RDEPENDS:perl-module-test-harness += "perl-module-base" +RDEPENDS:perl-module-test-harness += "perl-module-config" +RDEPENDS:perl-module-test-harness += "perl-module-constant" +RDEPENDS:perl-module-test-harness += "perl-module-strict" +RDEPENDS:perl-module-test-harness += "perl-module-tap-harness" +RDEPENDS:perl-module-test-harness += "perl-module-tap-parser-aggregator" +RDEPENDS:perl-module-test-harness += "perl-module-tap-parser-source" +RDEPENDS:perl-module-test-harness += "perl-module-tap-parser-sourcehandler-perl" +RDEPENDS:perl-module-test-harness += "perl-module-text-parsewords" +RDEPENDS:perl-module-test-harness += "perl-module-warnings" +RDEPENDS:perl-module-test-more += "perl-module-strict" +RDEPENDS:perl-module-test-more += "perl-module-test-builder-module" +RDEPENDS:perl-module-test-more += "perl-module-warnings" +RDEPENDS:perl-module-test += "perl-module-exporter" +RDEPENDS:perl-module-test += "perl-module-file-temp" +RDEPENDS:perl-module-test += "perl-module-strict" +RDEPENDS:perl-module-test-simple += "perl-module-strict" +RDEPENDS:perl-module-test-simple += "perl-module-test-builder-module" +RDEPENDS:perl-module-test-tester-capture += "perl-module-config" +RDEPENDS:perl-module-test-tester-capture += "perl-module-strict" +RDEPENDS:perl-module-test-tester-capture += "perl-module-test-builder" +RDEPENDS:perl-module-test-tester-capture += "perl-module-vars" +RDEPENDS:perl-module-test-tester-capturerunner += "perl-module-exporter" +RDEPENDS:perl-module-test-tester-capturerunner += "perl-module-strict" +RDEPENDS:perl-module-test-tester-capturerunner += "perl-module-test-tester-capture" +RDEPENDS:perl-module-test-tester-delegate += "perl-module-strict" +RDEPENDS:perl-module-test-tester-delegate += "perl-module-vars" +RDEPENDS:perl-module-test-tester-delegate += "perl-module-warnings" +RDEPENDS:perl-module-test-tester += "perl-module-exporter" +RDEPENDS:perl-module-test-tester += "perl-module-strict" +RDEPENDS:perl-module-test-tester += "perl-module-test-builder" +RDEPENDS:perl-module-test-tester += "perl-module-test-tester-capturerunner" +RDEPENDS:perl-module-test-tester += "perl-module-test-tester-delegate" +RDEPENDS:perl-module-test-tester += "perl-module-vars" +RDEPENDS:perl-module-text-abbrev += "perl-module-exporter" +RDEPENDS:perl-module-text-balanced += "perl-module-exporter" +RDEPENDS:perl-module-text-balanced += "perl-module-overload" +RDEPENDS:perl-module-text-balanced += "perl-module-selfloader" +RDEPENDS:perl-module-text-balanced += "perl-module-strict" +RDEPENDS:perl-module-text-balanced += "perl-module-vars" +RDEPENDS:perl-module-text-parsewords += "perl-module-exporter" +RDEPENDS:perl-module-text-parsewords += "perl-module-strict" +RDEPENDS:perl-module-text-tabs += "perl-module-exporter" +RDEPENDS:perl-module-text-tabs += "perl-module-strict" +RDEPENDS:perl-module-text-tabs += "perl-module-vars" +RDEPENDS:perl-module-text-wrap += "perl-module-exporter" +RDEPENDS:perl-module-text-wrap += "perl-module-re" +RDEPENDS:perl-module-text-wrap += "perl-module-strict" +RDEPENDS:perl-module-text-wrap += "perl-module-text-tabs" +RDEPENDS:perl-module-text-wrap += "perl-module-vars" +RDEPENDS:perl-module-text-wrap += "perl-module-warnings-register" +RDEPENDS:perl-module-thread += "perl-module-config" +RDEPENDS:perl-module-thread += "perl-module-exporter" +RDEPENDS:perl-module-thread += "perl-module-strict" +RDEPENDS:perl-module-thread += "perl-module-threads" +RDEPENDS:perl-module-thread += "perl-module-threads-shared" +RDEPENDS:perl-module-thread += "perl-module-warnings" +RDEPENDS:perl-module-thread-queue += "perl-module-strict" +RDEPENDS:perl-module-thread-queue += "perl-module-threads-shared" +RDEPENDS:perl-module-thread-queue += "perl-module-warnings" +RDEPENDS:perl-module-thread-semaphore += "perl-module-strict" +RDEPENDS:perl-module-thread-semaphore += "perl-module-threads-shared" +RDEPENDS:perl-module-thread-semaphore += "perl-module-warnings" +RDEPENDS:perl-module-threads += "perl-module-config" +RDEPENDS:perl-module-threads += "perl-module-overload" +RDEPENDS:perl-module-threads += "perl-module-strict" +RDEPENDS:perl-module-threads += "perl-module-warnings" +RDEPENDS:perl-module-threads += "perl-module-xsloader" +RDEPENDS:perl-module-threads-shared += "perl-module-config" +RDEPENDS:perl-module-threads-shared += "perl-module-strict" +RDEPENDS:perl-module-threads-shared += "perl-module-warnings" +RDEPENDS:perl-module-threads-shared += "perl-module-xsloader" +RDEPENDS:perl-module-tie-array += "perl-module-strict" +RDEPENDS:perl-module-tie-file += "perl-module-fcntl" +RDEPENDS:perl-module-tie-file += "perl-module-posix" +RDEPENDS:perl-module-tie-file += "perl-module-strict" +RDEPENDS:perl-module-tie-file += "perl-module-warnings" +RDEPENDS:perl-module-tie-handle += "perl-module-tie-stdhandle" +RDEPENDS:perl-module-tie-handle += "perl-module-warnings-register" +RDEPENDS:perl-module-tie-hash-namedcapture += "perl-module-strict" +RDEPENDS:perl-module-tie-hash += "perl-module-warnings-register" +RDEPENDS:perl-module-tie-memoize += "perl-module-strict" +RDEPENDS:perl-module-tie-memoize += "perl-module-tie-hash" +RDEPENDS:perl-module-tie-refhash += "perl-module-config" +RDEPENDS:perl-module-tie-refhash += "perl-module-overload" +RDEPENDS:perl-module-tie-refhash += "perl-module-strict" +RDEPENDS:perl-module-tie-refhash += "perl-module-tie-hash" +RDEPENDS:perl-module-tie-refhash += "perl-module-vars" +RDEPENDS:perl-module-tie-scalar += "perl-module-warnings-register" +RDEPENDS:perl-module-tie-stdhandle += "perl-module-strict" +RDEPENDS:perl-module-tie-stdhandle += "perl-module-tie-handle" +RDEPENDS:perl-module-tie-substrhash += "perl-module-integer" +RDEPENDS:perl-module-time-gmtime += "perl-module-exporter" +RDEPENDS:perl-module-time-gmtime += "perl-module-strict" +RDEPENDS:perl-module-time-gmtime += "perl-module-time-tm" +RDEPENDS:perl-module-time-hires += "perl-module-exporter" +RDEPENDS:perl-module-time-hires += "perl-module-strict" +RDEPENDS:perl-module-time-hires += "perl-module-xsloader" +RDEPENDS:perl-module-time-local += "perl-module-config" +RDEPENDS:perl-module-time-local += "perl-module-constant" +RDEPENDS:perl-module-time-local += "perl-module-exporter" +RDEPENDS:perl-module-time-local += "perl-module-parent" +RDEPENDS:perl-module-time-local += "perl-module-strict" +RDEPENDS:perl-module-time-localtime += "perl-module-exporter" +RDEPENDS:perl-module-time-localtime += "perl-module-strict" +RDEPENDS:perl-module-time-localtime += "perl-module-time-tm" +RDEPENDS:perl-module-time-piece += "perl-module-constant" +RDEPENDS:perl-module-time-piece += "perl-module-exporter" +RDEPENDS:perl-module-time-piece += "perl-module-integer" +RDEPENDS:perl-module-time-piece += "perl-module-overload" +RDEPENDS:perl-module-time-piece += "perl-module-strict" +RDEPENDS:perl-module-time-piece += "perl-module-time-local" +RDEPENDS:perl-module-time-piece += "perl-module-time-seconds" +RDEPENDS:perl-module-time-piece += "perl-module-xsloader" +RDEPENDS:perl-module-time-seconds += "perl-module-constant" +RDEPENDS:perl-module-time-seconds += "perl-module-exporter" +RDEPENDS:perl-module-time-seconds += "perl-module-overload" +RDEPENDS:perl-module-time-seconds += "perl-module-strict" +RDEPENDS:perl-module-time-tm += "perl-module-class-struct" +RDEPENDS:perl-module-time-tm += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-big5 += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-big5 += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-cjk-gb2312 += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-gb2312 += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-cjk-jisx0208 += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-jisx0208 += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-cjk-korean += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-korean += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-cjk-pinyin += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-pinyin += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-cjk-stroke += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-stroke += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-cjk-zhuyin += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-cjk-zhuyin += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate-locale += "perl-module-base" +RDEPENDS:perl-module-unicode-collate-locale += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate-locale += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate += "perl-module-constant" +RDEPENDS:perl-module-unicode-collate += "perl-module-strict" +RDEPENDS:perl-module-unicode-collate += "perl-module-warnings" +RDEPENDS:perl-module-unicode-collate += "perl-module-xsloader" +RDEPENDS:perl-module-unicode-normalize += "perl-module-exporter" +RDEPENDS:perl-module-unicode-normalize += "perl-module-strict" +RDEPENDS:perl-module-unicode-normalize += "perl-module-warnings" +RDEPENDS:perl-module-unicode-normalize += "perl-module-xsloader" +RDEPENDS:perl-module-unicode-ucd += "perl-module-charnames" +RDEPENDS:perl-module-unicode-ucd += "perl-module-exporter" +RDEPENDS:perl-module-unicode-ucd += "perl-module-feature" +RDEPENDS:perl-module-unicode-ucd += "perl-module-if" +RDEPENDS:perl-module-unicode-ucd += "perl-module-integer" +RDEPENDS:perl-module-unicode-ucd += "perl-module-re" +RDEPENDS:perl-module-unicode-ucd += "perl-module-strict" +RDEPENDS:perl-module-unicode-ucd += "perl-module-unicode-normalize" +RDEPENDS:perl-module-unicode-ucd += "perl-module-warnings" +RDEPENDS:perl-module-user-grent += "perl-module-class-struct" +RDEPENDS:perl-module-user-grent += "perl-module-exporter" +RDEPENDS:perl-module-user-grent += "perl-module-strict" +RDEPENDS:perl-module-user-pwent += "perl-module-class-struct" +RDEPENDS:perl-module-user-pwent += "perl-module-config" +RDEPENDS:perl-module-user-pwent += "perl-module-exporter" +RDEPENDS:perl-module-user-pwent += "perl-module-strict" +RDEPENDS:perl-module-user-pwent += "perl-module-warnings" +RDEPENDS:perl-module-version += "perl-module-strict" +RDEPENDS:perl-module-version += "perl-module-version-regex" +RDEPENDS:perl-module-version += "perl-module-warnings-register" +RDEPENDS:perl-module-version-regex += "perl-module-strict" +RDEPENDS:perl-module-xsloader += "perl-module-dynaloader" diff --git a/poky/meta/recipes-devtools/perl/liberror-perl_0.17029.bb b/poky/meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 038808f0c..e38d32ac4 100644 --- a/poky/meta/recipes-devtools/perl/liberror-perl_0.17029.bb +++ b/poky/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f3499d09ee74a050c0319391ff9d100" DEPENDS += "perl" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ perl-module-carp \ perl-module-exporter \ perl-module-scalar-util \ @@ -21,7 +21,7 @@ RDEPENDS_${PN} += " \ perl-module-warnings \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ perl-module-base \ perl-module-file-spec \ perl-module-io-handle \ @@ -39,7 +39,7 @@ S = "${WORKDIR}/Error-${PV}" inherit cpan ptest-perl -do_install_prepend() { +do_install:prepend() { # test requires "-T" (taint) command line option rm -rf ${B}/t/pod-coverage.t } diff --git a/poky/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb b/poky/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index a6fd7b1c0..8af38ba60 100644 --- a/poky/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb +++ b/poky/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -35,7 +35,7 @@ do_patch[postfuncs] += "do_patch_module_build" EXTRA_CPAN_BUILD_FLAGS = "--create_packlist=0" -do_install_append () { +do_install:append () { rm -rf ${D}${docdir}/perl/html } @@ -55,7 +55,7 @@ do_install_ptest() { rm -rf ${D}${PTEST_PATH}/_build/magicnum } -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ perl-module-carp \ perl-module-cpan \ perl-module-config \ @@ -87,7 +87,7 @@ RDEPENDS_${PN} += " \ perl-module-utf8 \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ packagegroup-core-buildessential \ perl-dev \ perl-module-blib \ @@ -104,7 +104,7 @@ RDEPENDS_${PN}-ptest += " \ perl-module-test-more \ " -RPROVIDES_${PN} += "\ +RPROVIDES:${PN} += "\ libmodule-build-base-perl \ libmodule-build-compat-perl \ libmodule-build-config-perl \ @@ -118,6 +118,6 @@ RPROVIDES_${PN} += "\ " # t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev -INSANE_SKIP_${PN}-ptest = "dev-deps" +INSANE_SKIP:${PN}-ptest = "dev-deps" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb b/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb index 2234f6a74..05383752e 100644 --- a/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb +++ b/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb @@ -24,6 +24,6 @@ S = "${WORKDIR}/${CPAN_NAME}-${PV}" inherit cpan ptest-perl -RDEPENDS_${PN}-ptest += "perl-module-test-more perl-module-ipc-open3 perl-module-lib perl-module-version" +RDEPENDS:${PN}-ptest += "perl-module-test-more perl-module-ipc-open3 perl-module-lib perl-module-version" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/perl/liburi-perl_5.08.bb b/poky/meta/recipes-devtools/perl/liburi-perl_5.08.bb index 4d22b17e0..0cc27e862 100644 --- a/poky/meta/recipes-devtools/perl/liburi-perl_5.08.bb +++ b/poky/meta/recipes-devtools/perl/liburi-perl_5.08.bb @@ -27,14 +27,14 @@ do_compile() { cpan_do_compile } -do_install_prepend() { +do_install:prepend() { # these tests require "-T" (taint) command line option rm -rf ${B}/t/cwd.t rm -rf ${B}/t/file.t } -RDEPENDS_${PN} += "perl-module-integer perl-module-mime-base64" -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN} += "perl-module-integer perl-module-mime-base64" +RDEPENDS:${PN}-ptest += " \ libtest-needs-perl \ perl-module-test-more \ perl-module-test \ diff --git a/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb b/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb index bc154bbdc..3b9206e98 100644 --- a/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb +++ b/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb @@ -21,13 +21,13 @@ inherit cpan ptest-perl # fix up sub MakeMaker project as arguments don't get propagated though # see https://rt.cpan.org/Public/Bug/Display.html?id=28632 -do_configure_append_class-target() { +do_configure:append:class-target() { sed -E \ -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' \ -i Makefile Expat/Makefile } -do_configure_append() { +do_configure:append() { sed -e 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' \ -i Makefile Expat/Makefile sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile @@ -40,7 +40,7 @@ do_compile() { cpan_do_compile } -do_compile_class-native() { +do_compile:class-native() { cpan_do_compile } @@ -53,6 +53,6 @@ do_install_ptest() { chown -R root:root ${D}${PTEST_PATH}/samples } -RDEPENDS_${PN}-ptest += "perl-module-filehandle perl-module-if perl-module-test perl-module-test-more" +RDEPENDS:${PN}-ptest += "perl-module-filehandle perl-module-if perl-module-test perl-module-test-more" BBCLASSEXTEND="native nativesdk" diff --git a/poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb b/poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb index 818ae3d57..b77ad24b5 100644 --- a/poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb +++ b/poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb @@ -26,5 +26,5 @@ do_compile() { cpan_do_compile } -RDEPENDS_${PN} += "perl-module-carp perl-module-overload perl-module-universal perl-module-io-handle" -RDEPENDS_${PN}-ptest += "libxml-parser-perl perl-module-file-glob" +RDEPENDS:${PN} += "perl-module-carp perl-module-overload perl-module-universal perl-module-io-handle" +RDEPENDS:${PN}-ptest += "libxml-parser-perl perl-module-file-glob" diff --git a/poky/meta/recipes-devtools/perl/libxml-simple-perl_2.25.bb b/poky/meta/recipes-devtools/perl/libxml-simple-perl_2.25.bb index 53788d558..e2938226a 100644 --- a/poky/meta/recipes-devtools/perl/libxml-simple-perl_2.25.bb +++ b/poky/meta/recipes-devtools/perl/libxml-simple-perl_2.25.bb @@ -21,13 +21,13 @@ EXTRA_PERLFLAGS = "-I ${PERLHOSTLIB}" inherit cpan ptest-perl -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libxml-namespacesupport-perl \ libxml-parser-perl \ libxml-sax-perl \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ perl-module-file-temp \ perl-module-test-more \ " diff --git a/poky/meta/recipes-devtools/perl/perl-ptest.inc b/poky/meta/recipes-devtools/perl/perl-ptest.inc index 98e3361fc..54c780757 100644 --- a/poky/meta/recipes-devtools/perl/perl-ptest.inc +++ b/poky/meta/recipes-devtools/perl/perl-ptest.inc @@ -47,7 +47,7 @@ do_install_ptest () { rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } -python populate_packages_prepend() { +python populate_packages:prepend() { # Put all *.t files from the lib dir in the ptest package # do_split_packages requires a pair of () in the regex, but we have nothing # to match, so use an empty pair. @@ -56,8 +56,8 @@ python populate_packages_prepend() { '${PN}-ptest%s', '%s', recursive=True, match_path=True) } -RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc sed" +RDEPENDS:${PN}-ptest += "${PN}-modules ${PN}-doc sed" # The perl-ptest package contains Perl internal modules and generating file # dependencies for it causes problems. -SKIP_FILEDEPS_${PN}-ptest = '1' +SKIP_FILEDEPS:${PN}-ptest = '1' diff --git a/poky/meta/recipes-devtools/perl/perl_5.34.0.bb b/poky/meta/recipes-devtools/perl/perl_5.34.0.bb index 434535c5e..cc01321f7 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.34.0.bb @@ -18,10 +18,10 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ " -SRC_URI_append_class-native = " \ +SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ " -SRC_URI_append_class-target = " \ +SRC_URI:append:class-target = " \ file://encodefix.patch \ " @@ -42,11 +42,11 @@ PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm" # Don't generate comments in enc2xs output files. They are not reproducible export ENC2XS_NO_COMMENTS = "1" -do_configure_prepend() { +do_configure:prepend() { cp -rfp ${STAGING_DATADIR_NATIVE}/perl-cross/* ${S} } -do_configure_class-target() { +do_configure:class-target() { ./configure --prefix=${prefix} --libdir=${libdir} \ --target=${TARGET_SYS} \ -Duseshrplib \ @@ -72,7 +72,7 @@ do_configure_class-target() { sed -i -e "s,${STAGING_LIBDIR},${libdir},g" config.h } -do_configure_class-nativesdk() { +do_configure:class-nativesdk() { ./configure --prefix=${prefix} \ --target=${TARGET_SYS} \ -Duseshrplib \ @@ -85,7 +85,7 @@ do_configure_class-nativesdk() { sed -i -e "s,${STAGING_LIBDIR},${libdir},g" config.h } -do_configure_class-native() { +do_configure:class-native() { ./configure --prefix=${prefix} \ -Dbin=${bindir}/perl-native \ -Duseshrplib \ @@ -95,7 +95,7 @@ do_configure_class-native() { ${PACKAGECONFIG_CONFARGS} } -do_configure_append() { +do_configure:append() { if [ -n "$SOURCE_DATE_EPOCH" ]; then PERL_BUILD_DATE="$(${PYTHON} -c "\ from datetime import datetime, timezone; \ @@ -140,7 +140,7 @@ do_install() { fi } -do_install_append_class-target() { +do_install:append:class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl @@ -149,7 +149,7 @@ do_install_append_class-target() { rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl @@ -157,7 +157,7 @@ do_install_append_class-nativesdk() { PERL5LIB='$PERL5LIB:${SDKPATHNATIVE}/${libdir_nativesdk}/perl5/site_perl/${PV}:${SDKPATHNATIVE}/${libdir_nativesdk}/perl5/vendor_perl/${PV}:${SDKPATHNATIVE}/${libdir_nativesdk}/perl5/${PV}' } -do_install_append_class-native () { +do_install:append:class-native () { # Those wrappers mean that perl installed from sstate (which may change # path location) works and that in the nativesdk case, the SDK can be # installed to a different location from the one it was built for. @@ -208,7 +208,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-misc = "corelist cpan enc2xs encguess h2ph h2xs instmodsh json_pp libnetcfg \ +ALTERNATIVE:${PN}-misc = "corelist cpan enc2xs encguess h2ph h2xs instmodsh json_pp libnetcfg \ piconv pl2pm pod2html pod2man pod2text pod2usage podchecker \ prove ptar ptardiff ptargrep shasum splain xsubpp zipdetails" ALTERNATIVE_LINK_NAME[corelist] = "${bindir}/corelist" @@ -238,7 +238,7 @@ ALTERNATIVE_LINK_NAME[zipdetails] = "${bindir}/zipdetails" require perl-ptest.inc -FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/libperl.so* \ +FILES:${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/libperl.so* \ ${libdir}/perl5/site_perl \ ${libdir}/perl5/${PV}/Config.pm \ ${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config.pm \ @@ -254,24 +254,24 @@ FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/ ${libdir}/perl5/${PV}/ExtUtils/xsubpp \ ${libdir}/perl5/${PV}/ExtUtils/typemap \ " -RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ +RPROVIDES:${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ perl-module-warnings-register" -FILES_${PN}-staticdev_append = " ${libdir}/perl5/${PV}/*/CORE/libperl.a" +FILES:${PN}-staticdev:append = " ${libdir}/perl5/${PV}/*/CORE/libperl.a" -FILES_${PN}-dev_append = " ${libdir}/perl5/${PV}/*/CORE" +FILES:${PN}-dev:append = " ${libdir}/perl5/${PV}/*/CORE" -FILES_${PN}-doc_append = " ${libdir}/perl5/${PV}/Unicode/Collate/*.txt \ +FILES:${PN}-doc:append = " ${libdir}/perl5/${PV}/Unicode/Collate/*.txt \ ${libdir}/perl5/${PV}/*/.packlist \ ${libdir}/perl5/${PV}/Encode/encode.h \ " PACKAGES += "${PN}-misc" -FILES_${PN}-misc = "${bindir}/*" +FILES:${PN}-misc = "${bindir}/*" PACKAGES += "${PN}-pod" -FILES_${PN}-pod = "${libdir}/perl5/${PV}/pod \ +FILES:${PN}-pod = "${libdir}/perl5/${PV}/pod \ ${libdir}/perl5/${PV}/*.pod \ ${libdir}/perl5/${PV}/*/*.pod \ ${libdir}/perl5/${PV}/*/*/*.pod \ @@ -280,20 +280,20 @@ FILES_${PN}-pod = "${libdir}/perl5/${PV}/pod \ PACKAGES += "${PN}-module-cpan ${PN}-module-unicore" -FILES_${PN}-module-cpan += "${libdir}/perl5/${PV}/CPAN \ +FILES:${PN}-module-cpan += "${libdir}/perl5/${PV}/CPAN \ " -FILES_${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore" +FILES:${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore" ALTERNATIVE_PRIORITY = "40" -ALTERNATIVE_${PN}-doc = "Thread.3" +ALTERNATIVE:${PN}-doc = "Thread.3" ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" # Create a perl-modules package recommending all the other perl # packages (actually the non modules packages and not created too) -ALLOW_EMPTY_${PN}-modules = "1" +ALLOW_EMPTY:${PN}-modules = "1" PACKAGES += "${PN}-modules " -PACKAGESPLITFUNCS_prepend = "split_perl_packages " +PACKAGESPLITFUNCS:prepend = "split_perl_packages " python split_perl_packages () { libdir = d.expand('${libdir}/perl5/${PV}') @@ -308,7 +308,7 @@ python split_perl_packages () { # modules. Don't attempt to use the result of do_split_packages() as some # modules are manually split (eg. perl-module-unicore). packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES').split()) - d.setVar(d.expand("RRECOMMENDS_${PN}-modules"), ' '.join(packages)) + d.setVar(d.expand("RRECOMMENDS:${PN}-modules"), ' '.join(packages)) # Read the pre-generated dependency file, and use it to set module dependecies for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): @@ -320,7 +320,7 @@ python split_perl_packages () { module = splitline[0] + '-native' depends = "perl-native" else: - module = splitline[0].replace("RDEPENDS_perl", "RDEPENDS_${PN}") + module = splitline[0].replace("RDEPENDS:perl", "RDEPENDS:${PN}") depends = splitline[2].strip('"').replace("perl-module", "${PN}-module") d.appendVar(d.expand(module), " " + depends) } @@ -334,8 +334,8 @@ python() { d.setVar("PACKAGES_DYNAMIC", "^nativesdk-perl-module-.*") } -RDEPENDS_${PN}-misc += "perl perl-modules" -RDEPENDS_${PN}-pod += "perl" +RDEPENDS:${PN}-misc += "perl perl-modules" +RDEPENDS:${PN}-pod += "perl" BBCLASSEXTEND = "native nativesdk" @@ -346,10 +346,10 @@ do_create_rdepends_inc() { cat <<'EOPREAMBLE' > ${WORKDIR}/perl-rdepends.inc # Some additional dependencies that the above doesn't manage to figure out -RDEPENDS_${PN}-module-file-spec += "${PN}-module-file-spec-unix" -RDEPENDS_${PN}-module-math-bigint += "${PN}-module-math-bigint-calc" -RDEPENDS_${PN}-module-thread-queue += "${PN}-module-attributes" -RDEPENDS_${PN}-module-overload += "${PN}-module-overloading" +RDEPENDS:${PN}-module-file-spec += "${PN}-module-file-spec-unix" +RDEPENDS:${PN}-module-math-bigint += "${PN}-module-math-bigint-calc" +RDEPENDS:${PN}-module-thread-queue += "${PN}-module-attributes" +RDEPENDS:${PN}-module-overload += "${PN}-module-overloading" # Generated depends list beyond this line EOPREAMBLE diff --git a/poky/meta/recipes-devtools/pkgconf/pkgconf_1.7.4.bb b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.7.4.bb index 93832105f..04991b1f0 100644 --- a/poky/meta/recipes-devtools/pkgconf/pkgconf_1.7.4.bb +++ b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.7.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" -RPROVIDES_${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name. @@ -26,13 +26,13 @@ inherit autotools EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig'" -do_install_append () { +do_install:append () { # Install a wrapper which deals, as much as possible with pkgconf vs # pkg-config compatibility issues. install -m 0755 "${WORKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" } -do_install_append_class-native () { +do_install:append:class-native () { # Install a pkg-config-native wrapper that will use the native sysroot instead # of the MACHINE sysroot, for using pkg-config when building native tools. sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ @@ -47,11 +47,11 @@ do_install_append_class-native () { # When using the RPM generated automatic package dependencies, some packages # will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by # specifying an appropriate provide. -RPROVIDES_${PN} += "pkgconfig(pkg-config)" +RPROVIDES:${PN} += "pkgconfig(pkg-config)" # Include pkg.m4 in the main package, leaving libpkgconf dev files in -dev -FILES_${PN}-dev_remove = "${datadir}/aclocal" -FILES_${PN} += "${datadir}/aclocal" +FILES:${PN}-dev:remove = "${datadir}/aclocal" +FILES:${PN} += "${datadir}/aclocal" BBCLASSEXTEND += "native nativesdk" @@ -64,4 +64,4 @@ pkgconf_sstate_fixup_esdk () { fi } -SSTATEPOSTUNPACKFUNCS_append_class-native = " pkgconf_sstate_fixup_esdk" +SSTATEPOSTUNPACKFUNCS:append:class-native = " pkgconf_sstate_fixup_esdk" diff --git a/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 964d85fa3..aa2692b92 100644 --- a/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb @@ -30,8 +30,8 @@ inherit autotools EXTRA_OECONF += "--disable-indirect-deps" PACKAGECONFIG ??= "glib" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0 pkgconfig-native" @@ -42,17 +42,17 @@ BBCLASSEXTEND = "native nativesdk" # Set an empty dev package to ensure the base PN package gets # the pkg.m4 macros, pkgconfig does not deliver any other -dev # files. -FILES_${PN}-dev = "" -FILES_${PN} += "${datadir}/aclocal/pkg.m4" +FILES:${PN}-dev = "" +FILES:${PN} += "${datadir}/aclocal/pkg.m4" # When using the RPM generated automatic package dependencies, some packages # will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by # specifying an appropriate provide. -RPROVIDES_${PN} += "pkgconfig(pkg-config)" +RPROVIDES:${PN} += "pkgconfig(pkg-config)" # Install a pkg-config-native wrapper that will use the native sysroot instead # of the MACHINE sysroot, for using pkg-config when building native tools. -do_install_append_class-native () { +do_install:append:class-native () { sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native @@ -72,4 +72,4 @@ pkgconfig_sstate_fixup_esdk () { fi } -SSTATEPOSTUNPACKFUNCS_append_class-native = " pkgconfig_sstate_fixup_esdk" +SSTATEPOSTUNPACKFUNCS:append:class-native = " pkgconfig_sstate_fixup_esdk" diff --git a/poky/meta/recipes-devtools/prelink/prelink_git.bb b/poky/meta/recipes-devtools/prelink/prelink_git.bb index e197af9ee..78d4c7181 100644 --- a/poky/meta/recipes-devtools/prelink/prelink_git.bb +++ b/poky/meta/recipes-devtools/prelink/prelink_git.bb @@ -19,11 +19,11 @@ PV = "1.0+git${SRCPV}" # # Default is prelinking is enabled. # -SUMMARY_${PN}-cron = "Cron scripts to control automatic prelinking" -DESCRIPTION_${PN}-cron = "Cron scripts to control automatic prelinking. \ +SUMMARY:${PN}-cron = "Cron scripts to control automatic prelinking" +DESCRIPTION:${PN}-cron = "Cron scripts to control automatic prelinking. \ See: ${sysconfdir}/cron.daily/prelink for configuration information." -FILES_${PN}-cron = "${sysconfdir}/cron.daily ${sysconfdir}/default" +FILES:${PN}-cron = "${sysconfdir}/cron.daily ${sysconfdir}/default" PACKAGES =+ "${PN}-cron" @@ -37,10 +37,10 @@ SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_sta UPSTREAM_CHECK_COMMITS = "1" # error: error.h: No such file or directory -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' TARGET_OS_ORIG := "${TARGET_OS}" -OVERRIDES_append = ":${TARGET_OS_ORIG}" +OVERRIDES:append = ":${TARGET_OS_ORIG}" S = "${WORKDIR}/git" @@ -144,12 +144,12 @@ python () { bb.build.addtask('do_linkerpaths', 'do_configure', 'do_patch', d) } -do_configure_prepend () { +do_configure:prepend () { # Disable documentation! echo "all:" > ${S}/doc/Makefile.am } -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink @@ -161,7 +161,7 @@ do_install_append () { # Prelinking during a cross install should be handled by the image-prelink # bbclass. If the user desires this to run on the target at first boot # they will need to create a custom boot script. -pkg_postinst_prelink() { +pkg_postinst:prelink() { #!/bin/sh if [ "x$D" != "x" ]; then @@ -171,7 +171,7 @@ fi prelink -a } -pkg_prerm_prelink() { +pkg_prerm:prelink() { #!/bin/sh if [ "x$D" != "x" ]; then diff --git a/poky/meta/recipes-devtools/pseudo/pseudo.inc b/poky/meta/recipes-devtools/pseudo/pseudo.inc index e6512bc6e..7ba414ca2 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo.inc +++ b/poky/meta/recipes-devtools/pseudo/pseudo.inc @@ -10,14 +10,14 @@ SECTION = "base" LICENSE = "LGPL2.1" DEPENDS = "sqlite3 attr" -FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo" -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" +FILES:${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo" +INSANE_SKIP:${PN} += "libdir" +INSANE_SKIP:${PN}-dbg += "libdir" PROVIDES += "virtual/fakeroot" MAKEOPTS = "" -MAKEOPTS_class-native = "'RPATH=-Wl,--rpath=XORIGIN/../../../sqlite3-native/usr/lib/'" +MAKEOPTS:class-native = "'RPATH=-Wl,--rpath=XORIGIN/../../../sqlite3-native/usr/lib/'" inherit siteinfo pkgconfig @@ -26,7 +26,7 @@ do_configure () { } NO32LIBS ??= "1" -NO32LIBS_class-nativesdk = "1" +NO32LIBS:class-nativesdk = "1" PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback --enable-epoll --enable-xattr" @@ -79,7 +79,7 @@ warn_32bit_missing() { # Two below are the same # If necessary compile for the alternative machine arch. This is only # necessary in a native build. -do_compile_prepend_class-native () { +do_compile:prepend:class-native () { maybe_make32 if $make32; then # We need the 32-bit libpseudo on a 64-bit machine... @@ -100,7 +100,7 @@ do_compile_prepend_class-native () { fi } -do_compile_prepend_class-nativesdk () { +do_compile:prepend:class-nativesdk () { maybe_make32 if $make32; then # We need the 32-bit libpseudo on a 64-bit machine. @@ -112,7 +112,7 @@ do_compile_prepend_class-nativesdk () { fi } -do_compile_append_class-native () { +do_compile:append:class-native () { if [ '${@bb.data.inherits_class('uninative', d)}' = 'True' ]; then for i in PSEUDO_PORT_UNIX_SYNCFS PSEUDO_PORT_UIDS_GENERIC PSEUDO_PORT_LINUX_NEWCLONE PSEUDO_PORT_LINUX_XATTR PSEUDO_PORT_LINUX_STATVFS; do grep $i.1 ${S}/pseudo_ports.h @@ -129,7 +129,7 @@ do_install () { oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install } -do_install_append_class-native () { +do_install:append:class-native () { chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/` install -d ${D}${sysconfdir} # The fallback files should never be modified @@ -146,7 +146,7 @@ do_install_append_class-native () { fi } -do_install_append_class-nativesdk () { +do_install:append:class-nativesdk () { maybe_make32 if $make32; then mkdir -p ${D}${prefix}/lib/pseudo/lib diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index 0ba460f3e..dacaef1a6 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" # error: use of undeclared identifier '_STAT_VER' -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb index 7ad2f061b..a4d222c3a 100644 --- a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb +++ b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb @@ -25,10 +25,10 @@ S = "${WORKDIR}/numpy-${PV}" CLEANBROKEN = "1" -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" # install what is needed for numpy.test() -RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ +RDEPENDS:${PN} = "${PYTHON_PN}-unittest \ ${PYTHON_PN}-difflib \ ${PYTHON_PN}-pprint \ ${PYTHON_PN}-pickle \ @@ -48,7 +48,7 @@ RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-multiprocessing \ " -RDEPENDS_${PN}-ptest += "${PYTHON_PN}-pytest \ +RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest \ ${PYTHON_PN}-hypothesis \ ${PYTHON_PN}-sortedcontainers \ ${PYTHON_PN}-resource \ diff --git a/poky/meta/recipes-devtools/python/python-async.inc b/poky/meta/recipes-devtools/python/python-async.inc index af887dc4e..fde864601 100644 --- a/poky/meta/recipes-devtools/python/python-async.inc +++ b/poky/meta/recipes-devtools/python/python-async.inc @@ -9,6 +9,6 @@ inherit pypi SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b" SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" -RDEPENDS_${PN} += "${PYTHON_PN}-threading" +RDEPENDS:${PN} += "${PYTHON_PN}-threading" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python-cython.inc b/poky/meta/recipes-devtools/python/python-cython.inc index 04fd2ec2b..e3f14fc49 100644 --- a/poky/meta/recipes-devtools/python/python-cython.inc +++ b/poky/meta/recipes-devtools/python/python-cython.inc @@ -14,7 +14,7 @@ UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" inherit pypi -RDEPENDS_${PN}_class-target += "\ +RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-misc \ ${PYTHON_PN}-netserver \ ${PYTHON_PN}-pkgutil \ @@ -24,7 +24,7 @@ RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-xml \ " -RDEPENDS_${PN}_class-nativesdk += "\ +RDEPENDS:${PN}:class-nativesdk += "\ nativesdk-${PYTHON_PN}-misc \ nativesdk-${PYTHON_PN}-netserver \ nativesdk-${PYTHON_PN}-pkgutil \ @@ -34,7 +34,7 @@ RDEPENDS_${PN}_class-nativesdk += "\ nativesdk-${PYTHON_PN}-xml \ " -do_install_append() { +do_install:append() { # Make sure we use /usr/bin/env python for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT diff --git a/poky/meta/recipes-devtools/python/python-gitdb.inc b/poky/meta/recipes-devtools/python/python-gitdb.inc index 53d925a49..5b24a1f4a 100644 --- a/poky/meta/recipes-devtools/python/python-gitdb.inc +++ b/poky/meta/recipes-devtools/python/python-gitdb.inc @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap" -RDEPENDS_${PN} += "${PYTHON_PN}-async \ +RDEPENDS:${PN} += "${PYTHON_PN}-async \ ${PYTHON_PN}-compression \ ${PYTHON_PN}-crypt \ ${PYTHON_PN}-io \ diff --git a/poky/meta/recipes-devtools/python/python-nose.inc b/poky/meta/recipes-devtools/python/python-nose.inc index ccec68a0e..dfae20229 100644 --- a/poky/meta/recipes-devtools/python/python-nose.inc +++ b/poky/meta/recipes-devtools/python/python-nose.inc @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6 inherit pypi -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${PYTHON_PN}-unittest \ " diff --git a/poky/meta/recipes-devtools/python/python-pbr.inc b/poky/meta/recipes-devtools/python/python-pbr.inc index bc470e727..59fbc6dce 100644 --- a/poky/meta/recipes-devtools/python/python-pbr.inc +++ b/poky/meta/recipes-devtools/python/python-pbr.inc @@ -9,6 +9,6 @@ SRC_URI += "file://0001-change-shebang-to-python3.patch" inherit pypi -RDEPENDS_${PN} += "${PYTHON_PN}-pip" +RDEPENDS:${PN} += "${PYTHON_PN}-pip" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python-pycryptodome.inc b/poky/meta/recipes-devtools/python/python-pycryptodome.inc index 48481bcf9..3f4c6e9fc 100644 --- a/poky/meta/recipes-devtools/python/python-pycryptodome.inc +++ b/poky/meta/recipes-devtools/python/python-pycryptodome.inc @@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c" inherit pypi -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-io \ ${PYTHON_PN}-math \ " -RDEPENDS_${PN}-tests += " \ +RDEPENDS:${PN}-tests += " \ ${PYTHON_PN}-unittest \ " PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = " \ +FILES:${PN}-tests = " \ ${PYTHON_SITEPACKAGES_DIR}/Crypto/SelfTest/ \ ${PYTHON_SITEPACKAGES_DIR}/Crypto/SelfTest/__pycache__/ \ " diff --git a/poky/meta/recipes-devtools/python/python-pyparsing.inc b/poky/meta/recipes-devtools/python/python-pyparsing.inc index 348b324bf..330bf7e39 100644 --- a/poky/meta/recipes-devtools/python/python-pyparsing.inc +++ b/poky/meta/recipes-devtools/python/python-pyparsing.inc @@ -9,7 +9,7 @@ UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar" inherit pypi -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-debugger \ ${PYTHON_PN}-json \ diff --git a/poky/meta/recipes-devtools/python/python-six.inc b/poky/meta/recipes-devtools/python/python-six.inc index df97f845b..aac676514 100644 --- a/poky/meta/recipes-devtools/python/python-six.inc +++ b/poky/meta/recipes-devtools/python/python-six.inc @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" inherit pypi -RDEPENDS_${PN} = "${PYTHON_PN}-io" +RDEPENDS:${PN} = "${PYTHON_PN}-io" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python-smmap.inc b/poky/meta/recipes-devtools/python/python-smmap.inc index 2a2ac76f2..7d0cff5fa 100644 --- a/poky/meta/recipes-devtools/python/python-smmap.inc +++ b/poky/meta/recipes-devtools/python/python-smmap.inc @@ -13,7 +13,7 @@ PYPI_PACKAGE = "smmap" SRC_URI[sha256sum] = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182" -RDEPENDS_${PN} += "${PYTHON_PN}-codecs \ +RDEPENDS:${PN} += "${PYTHON_PN}-codecs \ ${PYTHON_PN}-mmap \ " BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python-testtools.inc b/poky/meta/recipes-devtools/python/python-testtools.inc index e8d308b71..ef5e15cc3 100644 --- a/poky/meta/recipes-devtools/python/python-testtools.inc +++ b/poky/meta/recipes-devtools/python/python-testtools.inc @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" inherit pypi -SRC_URI[md5sum] = "e8fc7185b47cfb908c641f8c4b2a6add" -SRC_URI[sha256sum] = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8" +SRC_URI[sha256sum] = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f" DEPENDS += " \ ${PYTHON_PN}-pbr \ @@ -18,7 +17,7 @@ DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PYTHON_PN}-doctest \ ${PYTHON_PN}-extras \ ${PYTHON_PN}-pbr \ diff --git a/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.0.bb b/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.0.bb index 7edd41030..065a2c7b4 100644 --- a/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.0.bb +++ b/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.0.bb @@ -12,7 +12,7 @@ SRC_URI += " \ file://run-ptest \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-unixadmin \ " @@ -22,4 +22,4 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -RDEPENDS_${PN} = "${PYTHON_PN}-misc" +RDEPENDS:${PN} = "${PYTHON_PN}-misc" diff --git a/poky/meta/recipes-devtools/python/python3-attrs_21.2.0.bb b/poky/meta/recipes-devtools/python/python3-attrs_21.2.0.bb index e89fbc96f..d52237f26 100644 --- a/poky/meta/recipes-devtools/python/python3-attrs_21.2.0.bb +++ b/poky/meta/recipes-devtools/python/python3-attrs_21.2.0.bb @@ -7,11 +7,11 @@ SRC_URI[sha256sum] = "ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04a inherit pypi setuptools3 -RDEPENDS_${PN}_class-target += " \ +RDEPENDS:${PN}:class-target += " \ ${PYTHON_PN}-crypt \ ${PYTHON_PN}-ctypes \ " -RDEPENDS_${PN}_class-nativesdk += " \ +RDEPENDS:${PN}:class-nativesdk += " \ ${PYTHON_PN}-crypt \ ${PYTHON_PN}-ctypes \ " diff --git a/poky/meta/recipes-devtools/python/python3-cython_0.29.23.bb b/poky/meta/recipes-devtools/python/python3-cython_0.29.23.bb index 2ec4033fa..296fb39b6 100644 --- a/poky/meta/recipes-devtools/python/python3-cython_0.29.23.bb +++ b/poky/meta/recipes-devtools/python/python3-cython_0.29.23.bb @@ -1,7 +1,7 @@ inherit setuptools3 require python-cython.inc -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python3-setuptools \ " @@ -10,7 +10,7 @@ RDEPENDS_${PN} += "\ # architecture. DISTUTILS_INSTALL_ARGS += "--skip-build" -do_install_append() { +do_install:append() { # rename scripts that would conflict with the Python 2 build of Cython mv ${D}${bindir}/cython ${D}${bindir}/cython3 mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3 diff --git a/poky/meta/recipes-devtools/python/python3-dbus_1.2.16.bb b/poky/meta/recipes-devtools/python/python3-dbus_1.2.18.bb index e1700fa86..9592fbf71 100644 --- a/poky/meta/recipes-devtools/python/python3-dbus_1.2.16.bb +++ b/poky/meta/recipes-devtools/python/python3-dbus_1.2.18.bb @@ -7,8 +7,7 @@ DEPENDS = "expat dbus glib-2.0 virtual/libintl" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" -SRC_URI[md5sum] = "51a45c973d82bedff033a4b57d69d5d8" -SRC_URI[sha256sum] = "11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4" +SRC_URI[sha256sum] = "92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260" S = "${WORKDIR}/dbus-python-${PV}" @@ -19,8 +18,8 @@ inherit distutils3-base autotools pkgconfig EXTRA_OECONF += "--disable-documentation" -RDEPENDS_${PN} = "python3-io python3-logging python3-stringold python3-threading python3-xml" +RDEPENDS:${PN} = "python3-io python3-logging python3-stringold python3-threading python3-xml" -FILES_${PN}-dev += "${libdir}/pkgconfig" +FILES:${PN}-dev += "${libdir}/pkgconfig" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-dbusmock_0.23.1.bb b/poky/meta/recipes-devtools/python/python3-dbusmock_0.23.1.bb index b5fa1868b..28e99299b 100644 --- a/poky/meta/recipes-devtools/python/python3-dbusmock_0.23.1.bb +++ b/poky/meta/recipes-devtools/python/python3-dbusmock_0.23.1.bb @@ -10,7 +10,7 @@ PYPI_PACKAGE = "python-dbusmock" inherit pypi setuptools3 -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PYTHON_PN}-dbus \ ${PYTHON_PN}-pygobject \ ${PYTHON_PN}-unittest \ diff --git a/poky/meta/recipes-devtools/python/python3-git_3.1.18.bb b/poky/meta/recipes-devtools/python/python3-git_3.1.18.bb index 955418c0e..d1c50d432 100644 --- a/poky/meta/recipes-devtools/python/python3-git_3.1.18.bb +++ b/poky/meta/recipes-devtools/python/python3-git_3.1.18.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6 DEPENDS += " ${PYTHON_PN}-gitdb" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-gitdb \ ${PYTHON_PN}-io \ diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.3.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.5.bb index 83c9917a0..0460a4319 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.3.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.5.bb @@ -7,9 +7,9 @@ PYPI_PACKAGE = "hypothesis" inherit pypi setuptools3 -SRC_URI[sha256sum] = "1c8776d9fc8c598cf1b93b99bd87976f9d9b589fc58843d85a30090700f14a8a" +SRC_URI[sha256sum] = "0563b9711fd9bf478cb591580a575c369d2c396f283efa85d0f9a75b26db65b5" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-attrs \ python3-compression \ python3-core \ diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.6.1.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.6.3.bb index 7e9604aaf..198138af7 100644 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.6.1.bb +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.6.3.bb @@ -8,13 +8,13 @@ inherit pypi setuptools3 PYPI_PACKAGE = "importlib_metadata" UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" -SRC_URI[sha256sum] = "079ada16b7fc30dfbb5d13399a5113110dab1aa7c2bc62f66af75f0b717c8cac" +SRC_URI[sha256sum] = "0645585859e9a6689c523927a5032f2ba5919f1f7d0e84bd4533312320de1ff9" S = "${WORKDIR}/importlib_metadata-${PV}" DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-toml-native" -RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" -RDEPENDS_${PN}_append_class-target = " python3-misc" -RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" +RDEPENDS:${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" +RDEPENDS:${PN}:append:class-target = " python3-misc" +RDEPENDS:${PN}:append:class-nativesdk = " python3-misc" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-iniparse_0.5.bb b/poky/meta/recipes-devtools/python/python3-iniparse_0.5.bb index 4ed82eab2..b5812d90c 100644 --- a/poky/meta/recipes-devtools/python/python3-iniparse_0.5.bb +++ b/poky/meta/recipes-devtools/python/python3-iniparse_0.5.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "932e5239d526e7acb504017bb707be67019ac428a6932368e685169109 inherit pypi setuptools3 -RDEPENDS_${PN} += "python3-core python3-six" +RDEPENDS:${PN} += "python3-core python3-six" DEPENDS += "python3-six" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-jinja2_3.0.1.bb b/poky/meta/recipes-devtools/python/python3-jinja2_3.0.1.bb index b37a043cc..abb89c9a3 100644 --- a/poky/meta/recipes-devtools/python/python3-jinja2_3.0.1.bb +++ b/poky/meta/recipes-devtools/python/python3-jinja2_3.0.1.bb @@ -24,13 +24,13 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-toml \ ${PYTHON_PN}-unixadmin \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-asyncio \ ${PYTHON_PN}-crypt \ ${PYTHON_PN}-io \ diff --git a/poky/meta/recipes-devtools/python/python3-libarchive-c_3.1.bb b/poky/meta/recipes-devtools/python/python3-libarchive-c_3.1.bb index d8f7862f9..ac8466e63 100644 --- a/poky/meta/recipes-devtools/python/python3-libarchive-c_3.1.bb +++ b/poky/meta/recipes-devtools/python/python3-libarchive-c_3.1.bb @@ -12,7 +12,7 @@ inherit pypi setuptools3 SRC_URI[md5sum] = "8c62da42a8b9bd24642e5430427e6f5a" SRC_URI[sha256sum] = "618a7ecfbfb58ca15e11e3138d4a636498da3b6bc212811af158298530fbb87e" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ libarchive \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-mmap \ diff --git a/poky/meta/recipes-devtools/python/python3-magic_0.4.24.bb b/poky/meta/recipes-devtools/python/python3-magic_0.4.24.bb index a54bf2431..ae895fbd5 100644 --- a/poky/meta/recipes-devtools/python/python3-magic_0.4.24.bb +++ b/poky/meta/recipes-devtools/python/python3-magic_0.4.24.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "de800df9fb50f8ec5974761054a708af6e4246b03b4bdaee993f948947b0ebcf" -RDEPENDS_${PN} += "file \ +RDEPENDS:${PN} += "file \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-io \ ${PYTHON_PN}-logging \ diff --git a/poky/meta/recipes-devtools/python/python3-mako_1.1.4.bb b/poky/meta/recipes-devtools/python/python3-mako_1.1.4.bb index 1645f37da..21ce33b80 100644 --- a/poky/meta/recipes-devtools/python/python3-mako_1.1.4.bb +++ b/poky/meta/recipes-devtools/python/python3-mako_1.1.4.bb @@ -10,7 +10,7 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab" -RDEPENDS_${PN} = "${PYTHON_PN}-html \ +RDEPENDS:${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ ${PYTHON_PN}-threading \ " diff --git a/poky/meta/recipes-devtools/python/python3-markdown_3.3.4.bb b/poky/meta/recipes-devtools/python/python3-markdown_3.3.4.bb index 47cccbe5b..ec1d139ab 100644 --- a/poky/meta/recipes-devtools/python/python3-markdown_3.3.4.bb +++ b/poky/meta/recipes-devtools/python/python3-markdown_3.3.4.bb @@ -10,4 +10,4 @@ SRC_URI[sha256sum] = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed BBCLASSEXTEND = "native" -RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" +RDEPENDS:${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" diff --git a/poky/meta/recipes-devtools/python/python3-markupsafe_2.0.1.bb b/poky/meta/recipes-devtools/python/python3-markupsafe_2.0.1.bb index 5be43b6c5..857472cc7 100644 --- a/poky/meta/recipes-devtools/python/python3-markupsafe_2.0.1.bb +++ b/poky/meta/recipes-devtools/python/python3-markupsafe_2.0.1.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "MarkupSafe" inherit pypi setuptools3 inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} -RDEPENDS_${PN} += "${PYTHON_PN}-stringold" +RDEPENDS:${PN} += "${PYTHON_PN}-stringold" BBCLASSEXTEND = "native nativesdk" @@ -17,7 +17,7 @@ SRC_URI += " \ file://run-ptest \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/poky/meta/recipes-devtools/python/python3-more-itertools_8.8.0.bb b/poky/meta/recipes-devtools/python/python3-more-itertools_8.8.0.bb index 1c0e84d27..fe41d47e4 100644 --- a/poky/meta/recipes-devtools/python/python3-more-itertools_8.8.0.bb +++ b/poky/meta/recipes-devtools/python/python3-more-itertools_8.8.0.bb @@ -11,11 +11,11 @@ SRC_URI += " \ file://run-ptest \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-asyncio \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/poky/meta/recipes-devtools/python/python3-packaging_21.0.bb b/poky/meta/recipes-devtools/python/python3-packaging_21.0.bb index 23ecd9df5..eacc48e56 100644 --- a/poky/meta/recipes-devtools/python/python3-packaging_21.0.bb +++ b/poky/meta/recipes-devtools/python/python3-packaging_21.0.bb @@ -10,4 +10,4 @@ inherit pypi setuptools3 BBCLASSEXTEND = "native" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" +RDEPENDS:${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.6.bb b/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.6.bb index 8516bbe4d..1f1cf1ab2 100644 --- a/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.6.bb +++ b/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.6.bb @@ -7,6 +7,6 @@ SRC_URI[sha256sum] = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981 inherit pypi setuptools3 -RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-ctypes" +RDEPENDS:${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-ctypes" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-pip_21.1.3.bb b/poky/meta/recipes-devtools/python/python3-pip_21.2.1.bb index 0f105c239..f16f1e2a0 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_21.1.3.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_21.2.1.bb @@ -10,14 +10,14 @@ inherit pypi distutils3 SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[sha256sum] = "b5b1eb91b36894bd01b8e5a56a422c2f3838573da0b0a1c63a096bb454e3b23f" +SRC_URI[sha256sum] = "303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a" -do_install_append() { +do_install:append() { # Install as pip3 and leave pip2 as default rm ${D}/${bindir}/pip } -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ python3-compile \ python3-io \ python3-html \ diff --git a/poky/meta/recipes-devtools/python/python3-pluggy_0.13.1.bb b/poky/meta/recipes-devtools/python/python3-pluggy_0.13.1.bb index d3e0365ca..479c10fcd 100644 --- a/poky/meta/recipes-devtools/python/python3-pluggy_0.13.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pluggy_0.13.1.bb @@ -7,7 +7,7 @@ SRC_URI[md5sum] = "7f610e28b8b34487336b585a3dfb803d" SRC_URI[sha256sum] = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS_${PN} += "${PYTHON_PN}-importlib-metadata \ +RDEPENDS:${PN} += "${PYTHON_PN}-importlib-metadata \ ${PYTHON_PN}-more-itertools \ " @@ -17,7 +17,7 @@ SRC_URI += " \ file://run-ptest \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb b/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb index 4e16ad174..8225c6b6c 100644 --- a/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb +++ b/poky/meta/recipes-devtools/python/python3-py_1.10.0.bb @@ -11,4 +11,4 @@ inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN} += "${PYTHON_PN}-netclient" +RDEPENDS:${PN} += "${PYTHON_PN}-netclient" diff --git a/poky/meta/recipes-devtools/python/python3-pycairo_1.20.1.bb b/poky/meta/recipes-devtools/python/python3-pycairo_1.20.1.bb index d169a3ca7..9c88d998f 100644 --- a/poky/meta/recipes-devtools/python/python3-pycairo_1.20.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pycairo_1.20.1.bb @@ -24,4 +24,4 @@ CFLAGS += "-fPIC" BBCLASSEXTEND = "native" -FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb b/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb index a6b3b3e93..2d929f11d 100644 --- a/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.10.1.bb @@ -3,7 +3,7 @@ inherit setuptools3 SRC_URI[sha256sum] = "541cd3e3e252fb19a7b48f420b798b53483302b7fe4d9954c947605d0a263d62" -FILES_${PN}-tests = " \ +FILES:${PN}-tests = " \ ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \ " diff --git a/poky/meta/recipes-devtools/python/python3-pygobject_3.40.1.bb b/poky/meta/recipes-devtools/python/python3-pygobject_3.40.1.bb index f5679a4ba..a0d4f0496 100644 --- a/poky/meta/recipes-devtools/python/python3-pygobject_3.40.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pygobject_3.40.1.bb @@ -24,11 +24,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}" -RDEPENDS_${PN} += "python3-pkgutil" +RDEPENDS:${PN} += "python3-pkgutil" # python3-pycairo is checked on configuration -> DEPENDS # we don't link against python3-pycairo -> RDEPENDS PACKAGECONFIG[cairo] = "-Dpycairo=enabled,-Dpycairo=disabled, cairo python3-pycairo, python3-pycairo" BBCLASSEXTEND = "native" -PACKAGECONFIG_class-native = "" +PACKAGECONFIG:class-native = "" diff --git a/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted file mode 100644 index 1abd531c6..000000000 --- a/poky/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 -From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> -Date: Wed, 28 Aug 2019 16:12:27 +0900 -Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm - -The setup_requires argument forces the download of the egg file for setuptools-scm -during the do_compile phase. This download is incompatible with the typical fetch -and mirror structure. The only usage of scm is the generation of the _version.py -file and in the release tarball it is already correctly created - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Derek Straka <derek@asterius.io> - -Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> - -Rebase for pytest 6.1.0. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - setup.cfg | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.cfg b/setup.cfg -index 6ed0792..0137090 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -53,7 +53,6 @@ package_dir = - =src - setup_requires = - setuptools>=>=42.0 -- setuptools-scm>=3.4 - zip_safe = no - - [options.entry_points] diff --git a/poky/meta/recipes-devtools/python/python3-pytest_6.2.4.bb b/poky/meta/recipes-devtools/python/python3-pytest_6.2.4.bb index fa43e6ebf..f0fd30aed 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest_6.2.4.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest_6.2.4.bb @@ -5,13 +5,13 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" -SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " - SRC_URI[sha256sum] = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b" +DEPENDS = "python3-setuptools-scm-native" + inherit update-alternatives pypi setuptools3 -RDEPENDS_${PN}_class-target += " \ +RDEPENDS:${PN}:class-target += " \ ${PYTHON_PN}-atomicwrites \ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-debugger \ @@ -30,7 +30,7 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-wcwidth \ " -ALTERNATIVE_${PN} += "py.test pytest" +ALTERNATIVE:${PN} += "py.test pytest" NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" diff --git a/poky/meta/recipes-devtools/python/python3-pyyaml_5.4.1.bb b/poky/meta/recipes-devtools/python/python3-pyyaml_5.4.1.bb index dce1ad57d..b11baa633 100644 --- a/poky/meta/recipes-devtools/python/python3-pyyaml_5.4.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pyyaml_5.4.1.bb @@ -11,7 +11,7 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-netclient \ " diff --git a/poky/meta/recipes-devtools/python/python3-scons-native_4.1.0.bb b/poky/meta/recipes-devtools/python/python3-scons-native_4.1.0.bb index 9e127304d..73076b873 100644 --- a/poky/meta/recipes-devtools/python/python3-scons-native_4.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-scons-native_4.1.0.bb @@ -2,6 +2,6 @@ require python3-scons_${PV}.bb inherit native python3native DEPENDS = "python3-native python3-setuptools-native" -do_install_append() { +do_install:append() { create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' } diff --git a/poky/meta/recipes-devtools/python/python3-scons_4.1.0.bb b/poky/meta/recipes-devtools/python/python3-scons_4.1.0.bb index 5894a5ef3..5a5b550be 100644 --- a/poky/meta/recipes-devtools/python/python3-scons_4.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-scons_4.1.0.bb @@ -11,7 +11,7 @@ PYPI_PACKAGE = "SCons" inherit pypi setuptools3 -RDEPENDS_${PN}_class-target = "\ +RDEPENDS:${PN}:class-target = "\ python3-core \ python3-compression \ python3-fcntl \ @@ -24,4 +24,4 @@ RDEPENDS_${PN}_class-target = "\ python3-pprint \ " -FILES_${PN}-doc += "${datadir}/scons*.1" +FILES:${PN}-doc += "${datadir}/scons*.1" diff --git a/poky/meta/recipes-devtools/python/python3-setuptools-scm_6.0.1.bb b/poky/meta/recipes-devtools/python/python3-setuptools-scm_6.0.1.bb index 24409eddc..afbed17a2 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools-scm_6.0.1.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools-scm_6.0.1.bb @@ -11,14 +11,14 @@ inherit pypi setuptools3 UPSTREAM_CHECK_REGEX = "setuptools_scm-(?P<pver>.*)\.tar" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${PYTHON_PN}-debugger \ ${PYTHON_PN}-json \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-toml \ " -RDEPENDS_${PN}_class-native = "\ +RDEPENDS:${PN}:class-native = "\ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-toml-native \ " diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb index c066d8209..63c0fe97f 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=7a7126e068206290f3 inherit pypi setuptools3 -SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" +SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" SRC_URI += "file://0001-change-shebang-to-python3.patch" @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "cfca9c97e7eebbc8abe18d5e5e962a08dcad55bb63afddd82d681de4d2 DEPENDS += "${PYTHON_PN}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${PYTHON_PN}-2to3 \ ${PYTHON_PN}-compile \ ${PYTHON_PN}-compression \ @@ -36,7 +36,7 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-xml \ " -do_install_prepend() { +do_install:prepend() { install -d ${D}${PYTHON_SITEPACKAGES_DIR} } @@ -46,8 +46,8 @@ BBCLASSEXTEND = "native nativesdk" # and easy_install. Ship it in a separate package so that it can be used by # minimal distributions. PACKAGES =+ "${PYTHON_PN}-pkg-resources " -FILES_${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" -RDEPENDS_${PYTHON_PN}-pkg-resources = "\ +FILES:${PYTHON_PN}-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" +RDEPENDS:${PYTHON_PN}-pkg-resources = "\ ${PYTHON_PN}-compression \ ${PYTHON_PN}-email \ ${PYTHON_PN}-plistlib \ diff --git a/poky/meta/recipes-devtools/python/python3-subunit_1.4.0.bb b/poky/meta/recipes-devtools/python/python3-subunit_1.4.0.bb index 55066e2d0..a06ded868 100644 --- a/poky/meta/recipes-devtools/python/python3-subunit_1.4.0.bb +++ b/poky/meta/recipes-devtools/python/python3-subunit_1.4.0.bb @@ -1,4 +1,4 @@ inherit setuptools3 require python-subunit.inc -RDEPENDS_${PN} = " python3-testtools" +RDEPENDS:${PN} = " python3-testtools" diff --git a/poky/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch b/poky/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch deleted file mode 100644 index 594510342..000000000 --- a/poky/meta/recipes-devtools/python/python3-testtools/no_traceback2.patch +++ /dev/null @@ -1,23 +0,0 @@ -traceback2 adds traceback for python2. Rather than depend on traceback2, we're -python3 only so just use traceback. -This caused breakage in oe-selftest -j which uses testtools on the autobuilder -using buildtools-tarball. - -Upstream-Status: Inappropriate [Our recipe is python3 specific] -(Once py2 is EOL upstream probably could/should take this) -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: testtools-2.3.0/testtools/content.py -=================================================================== ---- testtools-2.3.0.orig/testtools/content.py -+++ testtools-2.3.0/testtools/content.py -@@ -19,8 +19,7 @@ import os - import sys - - from extras import try_import --# To let setup.py work, make this a conditional import. --traceback = try_import('traceback2') -+import traceback - - from testtools.compat import ( - _b, diff --git a/poky/meta/recipes-devtools/python/python3-testtools_2.4.0.bb b/poky/meta/recipes-devtools/python/python3-testtools_2.5.0.bb index a254b90a7..896ecee65 100644 --- a/poky/meta/recipes-devtools/python/python3-testtools_2.4.0.bb +++ b/poky/meta/recipes-devtools/python/python3-testtools_2.5.0.bb @@ -1,4 +1,2 @@ inherit setuptools3 require python-testtools.inc - -SRC_URI += "file://no_traceback2.patch" diff --git a/poky/meta/recipes-devtools/python/python3-toml_0.10.2.bb b/poky/meta/recipes-devtools/python/python3-toml_0.10.2.bb index b46eba6fd..be29cac79 100644 --- a/poky/meta/recipes-devtools/python/python3-toml_0.10.2.bb +++ b/poky/meta/recipes-devtools/python/python3-toml_0.10.2.bb @@ -10,6 +10,6 @@ inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-misc \ " diff --git a/poky/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb b/poky/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb index 3becb0dd8..83e9b5ead 100644 --- a/poky/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb +++ b/poky/meta/recipes-devtools/python/python3-typogrify_2.0.7.bb @@ -10,5 +10,5 @@ SRC_URI[sha256sum] = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed BBCLASSEXTEND = "native" -RDEPENDS_${PN} += "${PYTHON_PN}-smartypants" +RDEPENDS:${PN} += "${PYTHON_PN}-smartypants" diff --git a/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb b/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb index bb4aae2e8..a532d3c5c 100644 --- a/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb +++ b/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://run-ptest \ " -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/poky/meta/recipes-devtools/python/python3-zipp_3.5.0.bb b/poky/meta/recipes-devtools/python/python3-zipp_3.5.0.bb index ab12601e4..d6f467654 100644 --- a/poky/meta/recipes-devtools/python/python3-zipp_3.5.0.bb +++ b/poky/meta/recipes-devtools/python/python3-zipp_3.5.0.bb @@ -11,7 +11,7 @@ inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-toml-native" -RDEPENDS_${PN} += "${PYTHON_PN}-compression \ +RDEPENDS:${PN} += "${PYTHON_PN}-compression \ ${PYTHON_PN}-math \ ${PYTHON_PN}-more-itertools" diff --git a/poky/meta/recipes-devtools/python/python3_3.9.6.bb b/poky/meta/recipes-devtools/python/python3_3.9.6.bb index 986dfda83..34500642d 100644 --- a/poky/meta/recipes-devtools/python/python3_3.9.6.bb +++ b/poky/meta/recipes-devtools/python/python3_3.9.6.bb @@ -34,7 +34,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://makerace.patch \ " -SRC_URI_append_class-native = " \ +SRC_URI:append:class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ @@ -65,24 +65,27 @@ inherit autotools pkgconfig qemu ptest multilib_header update-alternatives MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" -ALTERNATIVE_${PN}-dev = "python3-config" +ALTERNATIVE:${PN}-dev = "python3-config" ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config" ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}" DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2 autoconf-archive-native" -DEPENDS_append_class-target = " python3-native" -DEPENDS_append_class-nativesdk = " python3-native" +DEPENDS:append:class-target = " python3-native" +DEPENDS:append:class-nativesdk = " python3-native" + +# force to use the mutex+cond implementation (https://bugs.python.org/issue41710) +CFLAGS += "-DHAVE_BROKEN_POSIX_SEMAPHORES" EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib}" -EXTRA_OECONF_append_class-native = " --bindir=${bindir}/${PN}" +EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" export CROSSPYTHONPATH="${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/" EXTRANATIVEPATH += "python3-native" # LTO will be enabled via packageconfig depending upong distro features -LTO_class-target = "" +LTO:class-target = "" CACHED_CONFIGUREVARS = " \ ac_cv_file__dev_ptmx=yes \ @@ -98,9 +101,9 @@ def possibly_include_pgo(d): return '' -PACKAGECONFIG_class-target ??= "readline ${@possibly_include_pgo(d)} gdbm ${@bb.utils.filter('DISTRO_FEATURES', 'lto', d)}" -PACKAGECONFIG_class-native ??= "readline gdbm" -PACKAGECONFIG_class-nativesdk ??= "readline gdbm" +PACKAGECONFIG:class-target ??= "readline ${@possibly_include_pgo(d)} gdbm ${@bb.utils.filter('DISTRO_FEATURES', 'lto', d)}" +PACKAGECONFIG:class-native ??= "readline gdbm" +PACKAGECONFIG:class-nativesdk ??= "readline gdbm" PACKAGECONFIG[readline] = ",,readline" # Use profile guided optimisation by running PyBench inside qemu-user PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" @@ -108,7 +111,7 @@ PACKAGECONFIG[tk] = ",,tk" PACKAGECONFIG[gdbm] = ",,gdbm" PACKAGECONFIG[lto] = "--with-lto,," -do_configure_prepend () { +do_configure:prepend () { mkdir -p ${B}/Modules cat > ${B}/Modules/Setup.local << EOF *disabled* @@ -117,7 +120,7 @@ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)} EOF } -CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" +CPPFLAGS:append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" EXTRA_OEMAKE = '\ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -125,7 +128,7 @@ EXTRA_OEMAKE = '\ LIB=${baselib} \ ' -do_compile_prepend_class-target() { +do_compile:prepend:class-target() { if ${@bb.utils.contains('PACKAGECONFIG', 'pgo', 'true', 'false', d)}; then qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${B}', '${STAGING_DIR_TARGET}/${base_libdir}'])}" cat >pgo-wrapper <<EOF @@ -137,15 +140,15 @@ EOF fi } -do_install_prepend() { +do_install:prepend() { ${WORKDIR}/check_build_completeness.py ${T}/log.do_compile } -do_install_append_class-target() { +do_install:append:class-target() { oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h } -do_install_append_class-native() { +do_install:append:class-native() { # Make sure we use /usr/bin/env python for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python ${D}${bindir}/${PN}`; do sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT @@ -157,7 +160,7 @@ do_install_append_class-native() { ln -s python3-native/python3 ${D}${bindir}/nativepython3 } -do_install_append() { +do_install:append() { mkdir -p ${D}${libdir}/python-sysconfigdata sysconfigfile=`find ${D} -name _sysconfig*.py` cp $sysconfigfile ${D}${libdir}/python-sysconfigdata/_sysconfigdata.py @@ -179,7 +182,7 @@ do_install_append() { rm ${D}${libdir}/python${PYTHON_MAJMIN}/test/__pycache__/test_xml_etree.cpython* } -do_install_append_class-nativesdk () { +do_install:append:class-nativesdk () { # Make sure we use /usr/bin/env python for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT @@ -257,7 +260,7 @@ python(){ if pypackage not in rprovides: rprovides.append(pypackage) - d.setVar('RPROVIDES_class-native', ' '.join(rprovides)) + d.setVar('RPROVIDES:class-native', ' '.join(rprovides)) # Then work on the target include_pycs = d.getVar('INCLUDE_PYCS') @@ -275,33 +278,33 @@ python(){ newpackages.append(pypackage) # "Build" python's manifest FILES, RDEPENDS and SUMMARY - d.setVar('FILES_' + pypackage, '') + d.setVar('FILES:' + pypackage, '') for value in python_manifest[key]['files']: - d.appendVar('FILES_' + pypackage, ' ' + value) + d.appendVar('FILES:' + pypackage, ' ' + value) # Add cached files if include_pycs == '1': for value in python_manifest[key]['cached']: - d.appendVar('FILES_' + pypackage, ' ' + value) + d.appendVar('FILES:' + pypackage, ' ' + value) for value in python_manifest[key]['rdepends']: # Make it work with or without $PN if '${PN}' in value: value=value.split('-', 1)[1] - d.appendVar('RDEPENDS_' + pypackage, ' ' + pn + '-' + value) + d.appendVar('RDEPENDS:' + pypackage, ' ' + pn + '-' + value) for value in python_manifest[key].get('rrecommends', ()): if '${PN}' in value: value=value.split('-', 1)[1] - d.appendVar('RRECOMMENDS_' + pypackage, ' ' + pn + '-' + value) + d.appendVar('RRECOMMENDS:' + pypackage, ' ' + pn + '-' + value) - d.setVar('SUMMARY_' + pypackage, python_manifest[key]['summary']) + d.setVar('SUMMARY:' + pypackage, python_manifest[key]['summary']) # Prepending so to avoid python-misc getting everything packages = newpackages + packages d.setVar('PACKAGES', ' '.join(packages)) - d.setVar('ALLOW_EMPTY_${PN}-modules', '1') - d.setVar('ALLOW_EMPTY_${PN}-pkgutil', '1') + d.setVar('ALLOW_EMPTY:${PN}-modules', '1') + d.setVar('ALLOW_EMPTY:${PN}-pkgutil', '1') } # Files needed to create a new manifest @@ -326,30 +329,30 @@ do_create_manifest() { addtask do_create_manifest after do_patch do_prepare_recipe_sysroot # manual dependency additions -RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules" -RRECOMMENDS_${PN}-crypt_append_class-target = " ${MLPREFIX}openssl ${MLPREFIX}ca-certificates" -RRECOMMENDS_${PN}-crypt_append_class-nativesdk = " ${MLPREFIX}openssl ${MLPREFIX}ca-certificates" +RRECOMMENDS:${PN}-core:append:class-nativesdk = " nativesdk-python3-modules" +RRECOMMENDS:${PN}-crypt:append:class-target = " ${MLPREFIX}openssl ${MLPREFIX}ca-certificates" +RRECOMMENDS:${PN}-crypt:append:class-nativesdk = " ${MLPREFIX}openssl ${MLPREFIX}ca-certificates" # For historical reasons PN is empty and provided by python3-modules -FILES_${PN} = "" -RPROVIDES_${PN}-modules = "${PN}" +FILES:${PN} = "" +RPROVIDES:${PN}-modules = "${PN}" -FILES_${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3" -FILES_${PN}-idle += "${bindir}/idle3 ${bindir}/idle${PYTHON_MAJMIN}" +FILES:${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3" +FILES:${PN}-idle += "${bindir}/idle3 ${bindir}/idle${PYTHON_MAJMIN}" # provide python-pyvenv from python3-venv -RPROVIDES_${PN}-venv += "${MLPREFIX}python3-pyvenv" +RPROVIDES:${PN}-venv += "${MLPREFIX}python3-pyvenv" # package libpython3 PACKAGES =+ "libpython3 libpython3-staticdev" -FILES_libpython3 = "${libdir}/libpython*.so.*" -FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" -INSANE_SKIP_${PN}-dev += "dev-elf" -INSANE_SKIP_${PN}-ptest = "dev-deps" +FILES:libpython3 = "${libdir}/libpython*.so.*" +FILES:libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" +INSANE_SKIP:${PN}-dev += "dev-elf" +INSANE_SKIP:${PN}-ptest = "dev-deps" # catch all the rest (unsorted) PACKAGES += "${PN}-misc" -RDEPENDS_${PN}-misc += "\ +RDEPENDS:${PN}-misc += "\ ${PN}-core \ ${PN}-email \ ${PN}-codecs \ @@ -358,26 +361,26 @@ RDEPENDS_${PN}-misc += "\ ${PN}-audio \ ${PN}-numbers \ " -RDEPENDS_${PN}-modules_append_class-target = " ${MLPREFIX}python3-misc" -RDEPENDS_${PN}-modules_append_class-nativesdk = " ${MLPREFIX}python3-misc" -FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} ${libdir}/python${PYTHON_MAJMIN}/lib-dynload" +RDEPENDS:${PN}-modules:append:class-target = " ${MLPREFIX}python3-misc" +RDEPENDS:${PN}-modules:append:class-nativesdk = " ${MLPREFIX}python3-misc" +FILES:${PN}-misc = "${libdir}/python${PYTHON_MAJMIN} ${libdir}/python${PYTHON_MAJMIN}/lib-dynload" # catch manpage PACKAGES += "${PN}-man" -FILES_${PN}-man = "${datadir}/man" +FILES:${PN}-man = "${datadir}/man" # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 -RDEPENDS_libpython3_append_libc-glibc = " libgcc" -RDEPENDS_${PN}-ctypes_append_libc-glibc = " ${MLPREFIX}ldconfig" -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev unzip bzip2 libgcc tzdata-europe coreutils sed" -RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9" -RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}" -RDEPENDS_${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter tcl', '', d)}" -RDEPENDS_${PN}-dev = "" -RDEPENDS_${PN}-pydoc += "${PN}-io" - -RDEPENDS_${PN}-tests_append_class-target = " ${MLPREFIX}bash" -RDEPENDS_${PN}-tests_append_class-nativesdk = " ${MLPREFIX}bash" +RDEPENDS:libpython3:append:libc-glibc = " libgcc" +RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" +RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev unzip bzip2 libgcc tzdata-europe coreutils sed" +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr.iso-8859-9" +RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}" +RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter tcl', '', d)}" +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-pydoc += "${PN}-io" + +RDEPENDS:${PN}-tests:append:class-target = " ${MLPREFIX}bash" +RDEPENDS:${PN}-tests:append:class-nativesdk = " ${MLPREFIX}bash" # Python's tests contain large numbers of files we don't need in the recipe sysroots SYSROOT_PREPROCESS_FUNCS += " py3_sysroot_cleanup" diff --git a/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index ca1ad964d..08c5ca770 100644 --- a/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Qemu helper scripts" LICENSE = "GPLv2" -RDEPENDS_${PN} = "nativesdk-qemu \ +RDEPENDS:${PN} = "nativesdk-qemu \ nativesdk-python3-shell nativesdk-python3-fcntl nativesdk-python3-logging \ " diff --git a/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index 2fc07669d..ccf1c4678 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Helper utilities needed by the runqemu script" LICENSE = "GPLv2" -RDEPENDS_${PN} = "qemu-system-native" +RDEPENDS:${PN} = "qemu-system-native" PR = "r1" LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" diff --git a/poky/meta/recipes-devtools/qemu/qemu-native.inc b/poky/meta/recipes-devtools/qemu/qemu-native.inc index 54e49d8bc..5d3ba3486 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-native.inc +++ b/poky/meta/recipes-devtools/qemu/qemu-native.inc @@ -2,10 +2,10 @@ require qemu.inc inherit native -EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" +EXTRA_OEMAKE:append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" -LDFLAGS_append = " -fuse-ld=bfd" +LDFLAGS:append = " -fuse-ld=bfd" -do_install_append() { +do_install:append() { ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} } diff --git a/poky/meta/recipes-devtools/qemu/qemu-native_6.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu-native_6.0.0.bb index d23d7a8ad..d9ef15556 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-native_6.0.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-native_6.0.0.bb @@ -4,6 +4,6 @@ DEPENDS = "glib-2.0-native zlib-native" require qemu-native.inc -EXTRA_OECONF_append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" +EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent" PACKAGECONFIG ??= "pie" diff --git a/poky/meta/recipes-devtools/qemu/qemu-system-native_6.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu-system-native_6.0.0.bb index 9d7d0cdce..1c12eb7cf 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-system-native_6.0.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-system-native_6.0.0.bb @@ -9,16 +9,16 @@ require qemu-native.inc # and avoid file clashes DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native" -EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}" +EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" PACKAGECONFIG ??= "fdt alsa kvm pie \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ " # Handle distros such as CentOS 5 32-bit that do not have kvm support -PACKAGECONFIG_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" +PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" -do_install_append() { +do_install:append() { install -Dm 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu # The following is also installed by qemu-native diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 33a8baea7..4de8a9098 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -6,7 +6,7 @@ a variety of guest operating systems" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -RDEPENDS_${PN}-ptest = "bash" +RDEPENDS:${PN}-ptest = "bash" require qemu-targets.inc inherit pkgconfig ptest @@ -44,8 +44,8 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" SRC_URI[sha256sum] = "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9" -SRC_URI_append_class-target = " file://cross.patch" -SRC_URI_append_class-nativesdk = " file://cross.patch" +SRC_URI:append:class-target = " file://cross.patch" +SRC_URI:append:class-nativesdk = " file://cross.patch" # Applies against virglrender < 0.6.0 and not qemu itself CVE_CHECK_WHITELIST += "CVE-2017-5957" @@ -58,14 +58,14 @@ CVE_CHECK_WHITELIST += "CVE-2007-0998" # https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 CVE_CHECK_WHITELIST += "CVE-2018-18438" -COMPATIBLE_HOST_mipsarchn32 = "null" -COMPATIBLE_HOST_mipsarchn64 = "null" +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" # Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html # upstream states qemu doesn't work without optimization DEBUG_BUILD = "0" -do_install_append() { +do_install:append() { # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi } @@ -112,7 +112,7 @@ B = "${WORKDIR}/build" #EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" -do_configure_prepend_class-native() { +do_configure:prepend:class-native() { # Append build host pkg-config paths for native target since the host may provide sdl BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then @@ -136,7 +136,7 @@ do_install () { # This will trigger a MMU access fault in the virtual CPU. With this change, # the qemu-mips works fine. # IMPORTANT: This piece needs to be removed once the root cause is fixed! -do_install_append() { +do_install:append() { if [ -e "${D}/${bindir}/qemu-mips" ]; then create_wrapper ${D}/${bindir}/qemu-mips \ QEMU_RESERVED_VA=0x0 @@ -156,8 +156,8 @@ make_qemu_wrapper() { } # Disable kvm/virgl/mesa on targets that do not support it -PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" -PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," @@ -203,6 +203,6 @@ PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttn PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" -INSANE_SKIP_${PN} = "arch" +INSANE_SKIP:${PN} = "arch" -FILES_${PN} += "${datadir}/icons" +FILES:${PN} += "${datadir}/icons" diff --git a/poky/meta/recipes-devtools/qemu/qemu_6.0.0.bb b/poky/meta/recipes-devtools/qemu/qemu_6.0.0.bb index 90b135a61..f8a816b12 100644 --- a/poky/meta/recipes-devtools/qemu/qemu_6.0.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu_6.0.0.bb @@ -4,17 +4,17 @@ require qemu.inc # error: a parameter list without types is only allowed in a function definition # void (*_function)(sigval_t); -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" -RDEPENDS_${PN}_class-target += "bash" +RDEPENDS:${PN}:class-target += "bash" -EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" -EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" +EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} } @@ -24,6 +24,6 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ " -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm pie \ +PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ " diff --git a/poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc index d7ecda7aa..f85de384d 100644 --- a/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/poky/meta/recipes-devtools/quilt/quilt.inc @@ -14,36 +14,36 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://0001-tests-Allow-different-output-from-mv.patch \ " -SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch" +SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" SRC_URI[md5sum] = "6800c2404a2c0598ab2eff92a636ba70" SRC_URI[sha256sum] = "314b319a6feb13bf9d0f9ffa7ce6683b06919e734a41275087ea457cc9dc6e07" inherit autotools-brokensep ptest -INHIBIT_AUTOTOOLS_DEPS_class-native = "1" -PATCHTOOL_class-native = "patch" +INHIBIT_AUTOTOOLS_DEPS:class-native = "1" +PATCHTOOL:class-native = "patch" CLEANBROKEN = "1" EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" -EXTRA_OECONF_append_class-native = " --disable-nls" +EXTRA_OECONF:append:class-native = " --disable-nls" EXTRA_AUTORECONF += "--exclude=aclocal" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash ac_cv_path_COLUMN=column" # Make sure we don't have "-w" in shebang lines: it breaks using # "/usr/bin/env perl" as parser -do_configure_prepend () { +do_configure:prepend () { find ${S} -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \; } # Don't setup symlinks to host utilities, we don't need them -do_configure_append () { +do_configure:append () { sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile } -do_configure_class-native () { +do_configure:class-native () { oe_runconf } @@ -54,7 +54,7 @@ do_install () { rm -rf ${D}/${datadir}/emacs } -do_install_append_class-native () { +do_install:append:class-native () { # Dummy quiltrc file for patch.bbclass install -d ${D}${sysconfdir}/ touch ${D}${sysconfdir}/quiltrc @@ -75,16 +75,16 @@ do_install_ptest() { PACKAGES += "guards guards-doc" -FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ +FILES:${PN} = "${sysconfdir} ${datadir}/quilt \ ${bindir}/quilt ${libdir}/quilt" -FILES_guards = "${bindir}/guards" -FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" -FILES_guards-doc = "${mandir}/man1/guards.1" +FILES:guards = "${bindir}/guards" +FILES:${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" +FILES:guards-doc = "${mandir}/man1/guards.1" -RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux less" -RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native" +RDEPENDS:${PN} = "bash patch diffstat bzip2 util-linux less" +RDEPENDS:${PN}:class-native = "diffstat-native patch-native bzip2-native" -RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ +RDEPENDS:${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ perl-module-text-parsewords perl-module-overloading \ diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb b/poky/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb index 95a6f5cf7..189da9243 100644 --- a/poky/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +++ b/poky/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb @@ -5,16 +5,16 @@ verifying, querying, and updating software packages. Each software \ package consists of an archive of files along with information about \ the package like its version, a description, etc." -SUMMARY_${PN}-dev = "Development files for manipulating RPM packages" -DESCRIPTION_${PN}-dev = "This package contains the RPM C library and header files. These \ +SUMMARY:${PN}-dev = "Development files for manipulating RPM packages" +DESCRIPTION:${PN}-dev = "This package contains the RPM C library and header files. These \ development files will simplify the process of writing programs that \ manipulate RPM packages and databases. These files are intended to \ simplify the process of creating graphical package managers or any \ other tools that need an intimate knowledge of RPM packages in order \ to function." -SUMMARY_python3-rpm = "Python bindings for apps which will manupulate RPM packages" -DESCRIPTION_python3-rpm = "The python3-rpm package contains a module that permits applications \ +SUMMARY:python3-rpm = "Python bindings for apps which will manupulate RPM packages" +DESCRIPTION:python3-rpm = "The python3-rpm package contains a module that permits applications \ written in the Python programming language to use the interface \ supplied by the RPM Package Manager libraries." @@ -48,7 +48,7 @@ SRCREV = "3659b8a04f5b8bacf6535e0124e7fe23f15286bd" S = "${WORKDIR}/git" DEPENDS = "libgcrypt file popt xz bzip2 elfutils python3" -DEPENDS_append_class-native = " file-replacement-native bzip2-replacement-native" +DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" inherit autotools gettext pkgconfig python3native export PYTHON_ABI @@ -56,24 +56,24 @@ export PYTHON_ABI AUTOTOOLS_AUXDIR = "${S}/build-aux" # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe -EXTRA_AUTORECONF_append = " --exclude=gnu-configize" +EXTRA_AUTORECONF:append = " --exclude=gnu-configize" -EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt" -EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" +EXTRA_OECONF:append = " --without-lua --enable-python --with-crypto=libgcrypt" +EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs # --localstatedir prevents rpm from writing its database to native sysroot when building images # Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset # plugins both behave badly inside builds. -EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" -EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --disable-plugins" +EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" +EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG ??= "bdb ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)}" # The inhibit plugin serves no purpose outside of the target -PACKAGECONFIG_remove_class-native = "inhibit" -PACKAGECONFIG_remove_class-nativesdk = "inhibit" +PACKAGECONFIG:remove:class-native = "inhibit" +PACKAGECONFIG:remove:class-nativesdk = "inhibit" PACKAGECONFIG[bdb] = "--enable-bdb,--disable-bdb,db" PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" @@ -98,11 +98,11 @@ WRAPPER_TOOLS = " \ ${libdir}/rpm/rpmdeps \ " -do_configure_prepend() { +do_configure:prepend() { mkdir -p ${S}/build-aux } -do_install_append_class-native() { +do_install:append:class-native() { for tool in ${WRAPPER_TOOLS}; do test -x ${D}$tool && create_wrapper ${D}$tool \ RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ @@ -112,7 +112,7 @@ do_install_append_class-native() { done } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { for tool in ${WRAPPER_TOOLS}; do test -x ${D}$tool && create_wrapper ${D}$tool \ RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \ @@ -128,11 +128,11 @@ do_install_append_class-nativesdk() { } # Rpm's make install creates var/tmp which clashes with base-files packaging -do_install_append_class-target() { +do_install:append:class-target() { rm -rf ${D}/var } -do_install_append () { +do_install:append () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ ${D}/${libdir}/rpm/macros @@ -140,17 +140,17 @@ do_install_append () { ${D}${libdir}/rpm/pythondistdeps.py } -FILES_${PN} += "${libdir}/rpm-plugins/*.so \ +FILES:${PN} += "${libdir}/rpm-plugins/*.so \ " -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" -FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \ +FILES:${PN}-dev += "${libdir}/rpm-plugins/*.la \ " PACKAGE_BEFORE_PN += "${PN}-build ${PN}-sign ${PN}-archive" -RRECOMMENDS_${PN} += "rpm-build rpm-sign rpm-archive" +RRECOMMENDS:${PN} += "rpm-sign rpm-archive" -FILES_${PN}-build = "\ +FILES:${PN}-build = "\ ${bindir}/rpmbuild \ ${bindir}/gendiff \ ${bindir}/rpmspec \ @@ -172,20 +172,20 @@ FILES_${PN}-build = "\ ${libdir}/rpm/fileattrs/* \ " -FILES_${PN}-sign = "\ +FILES:${PN}-sign = "\ ${bindir}/rpmsign \ ${libdir}/librpmsign.so.* \ " -FILES_${PN}-archive = "\ +FILES:${PN}-archive = "\ ${bindir}/rpm2archive \ " PACKAGES += "python3-rpm" PROVIDES += "python3-rpm" -FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" +FILES:python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*" -RDEPENDS_${PN}-build = "bash perl python3-core" +RDEPENDS:${PN}-build = "bash perl python3-core" PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess" diff --git a/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb b/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb index cb1866775..b6d07726d 100644 --- a/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb +++ b/poky/meta/recipes-devtools/rsync/rsync_3.2.3.bb @@ -45,15 +45,15 @@ EXTRA_OECONF = "--disable-simd --disable-md2man --disable-asm --with-nobody-grou # rsync 3.0 uses configure.sh instead of configure, and # makefile checks the existence of configure.sh -do_configure_prepend () { +do_configure:prepend () { rm -f ${S}/configure ${S}/configure.sh } -do_configure_append () { +do_configure:append () { cp -f ${S}/configure ${S}/configure.sh } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir} } diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index 1cede8d47..c953a2704 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ " DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" -DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" +DEPENDS:class-native = "openssl-native libyaml-native readline-native zlib-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ @@ -33,7 +33,7 @@ inherit autotools ptest # that the libraries aren't available and hence that the extension can't be # built. -do_configure_prepend() { +do_configure:prepend() { sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk rm -rf ${S}/ruby/ } diff --git a/poky/meta/recipes-devtools/ruby/ruby_3.0.2.bb b/poky/meta/recipes-devtools/ruby/ruby_3.0.2.bb index f88e874c7..a08273557 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_3.0.2.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.0.2.bb @@ -1,6 +1,6 @@ require ruby.inc -DEPENDS_append_libc-musl = " libucontext" +DEPENDS:append:libc-musl = " libucontext" SRC_URI += " \ file://remove_has_include_macros.patch \ @@ -26,16 +26,16 @@ EXTRA_OECONF = "\ --with-pkg-config=pkg-config \ " -EXTRA_OECONF_append_libc-musl = "\ +EXTRA_OECONF:append:libc-musl = "\ LIBS='-lucontext' \ ac_cv_func_isnan=yes \ ac_cv_func_isinf=yes \ " -EXTRA_OECONF_append_libc-musl_riscv64 = "\ +EXTRA_OECONF:append:libc-musl:riscv64 = "\ --with-coroutine=copy \ " -EXTRA_OECONF_append_libc-musl_riscv32 = "\ +EXTRA_OECONF:append:libc-musl:riscv32 = "\ --with-coroutine=copy \ " @@ -43,7 +43,7 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -do_install_append_class-target () { +do_install:append:class-target () { # Find out rbconfig.rb from .installed.list rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list` # Remove build host directories @@ -80,17 +80,17 @@ do_install_ptest () { PACKAGES =+ "${PN}-ri-docs ${PN}-rdoc" -SUMMARY_${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library" -RDEPENDS_${PN}-ri-docs = "${PN}" -FILES_${PN}-ri-docs += "${datadir}/ri" +SUMMARY:${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library" +RDEPENDS:${PN}-ri-docs = "${PN}" +FILES:${PN}-ri-docs += "${datadir}/ri" -SUMMARY_${PN}-rdoc = "RDoc documentation generator from Ruby source" -RDEPENDS_${PN}-rdoc = "${PN}" -FILES_${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc" +SUMMARY:${PN}-rdoc = "RDoc documentation generator from Ruby source" +RDEPENDS:${PN}-rdoc = "${PN}" +FILES:${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc" -FILES_${PN} += "${datadir}/rubygems" +FILES:${PN} += "${datadir}/rubygems" -FILES_${PN}-ptest_append_class-target = "\ +FILES:${PN}-ptest:append:class-target = "\ ${libdir}/ruby/include \ ${libdir}/ruby/${SHRT_VER}.0/*/-test- \ " diff --git a/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index c353d4b79..deddf11f4 100644 --- a/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb @@ -16,7 +16,7 @@ inherit allarch systemd update-rc.d INITSCRIPT_NAME = "run-postinsts" INITSCRIPT_PARAMS = "start 99 S ." -SYSTEMD_SERVICE_${PN} = "run-postinsts.service" +SYSTEMD_SERVICE:${PN} = "run-postinsts.service" do_configure() { : diff --git a/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 137e5097f..1a9e8f108 100644 --- a/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -37,9 +37,9 @@ do_install() { install -m 0644 "${S}"/squashfs_fs.h "${D}${includedir}" } -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 4cef0c012..9af773766 100644 --- a/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From 205e7661822987825c7149ada4eefdc5368828ce Mon Sep 17 00:00:00 2001 +From 1f50e0a09d828be8f5b1f28db9af0b12492a1553 Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <gabriel.barbu@enea.com> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -14,7 +14,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index b8efce8..fa9a1af 100644 +index 55566ee..a7ae6f9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,9 +23,9 @@ index b8efce8..fa9a1af 100644 ARCH_MFLAGS = +TEST_SUITE_LOG = test-suite.log AM_CFLAGS = $(WARN_CFLAGS) - AM_CPPFLAGS = $(ARCH_MFLAGS) \ - -I$(builddir) \ -@@ -692,3 +693,22 @@ BUILT_SOURCES = ksysent.h + bundled_CPPFLAGS = + if USE_BUNDLED_HEADERS +@@ -703,3 +704,22 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../src/scno.am diff --git a/poky/meta/recipes-devtools/strace/strace_5.12.bb b/poky/meta/recipes-devtools/strace/strace_5.13.bb index 6a8996535..7d93f2da9 100644 --- a/poky/meta/recipes-devtools/strace/strace_5.12.bb +++ b/poky/meta/recipes-devtools/strace/strace_5.13.bb @@ -15,11 +15,11 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://uintptr_t.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ " -SRC_URI[sha256sum] = "29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4" +SRC_URI[sha256sum] = "5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656" inherit autotools ptest -PACKAGECONFIG_class-target ??= "\ +PACKAGECONFIG:class-target ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ " @@ -28,7 +28,7 @@ PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" EXTRA_OECONF += "--enable-mpers=no --disable-gcc-Werror" -CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" +CFLAGS:append:libc-musl = " -Dsigcontext_struct=sigcontext" TESTDIR = "tests" PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD|LDFLAGS_FOR_BUILD)" @@ -46,9 +46,9 @@ do_install_ptest() { sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } -RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" +RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ locale-base-en-us.iso-8859-1 \ " diff --git a/poky/meta/recipes-devtools/subversion/subversion_1.14.1.bb b/poky/meta/recipes-devtools/subversion/subversion_1.14.1.bb index 0f8a76453..87dc35943 100644 --- a/poky/meta/recipes-devtools/subversion/subversion_1.14.1.bb +++ b/poky/meta/recipes-devtools/subversion/subversion_1.14.1.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b" DEPENDS = "apr-util serf sqlite3 file lz4" -DEPENDS_append_class-native = " file-replacement-native" +DEPENDS:append:class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://disable_macos.patch \ @@ -44,7 +44,7 @@ acpaths = "-I build/ -I build/ac-macros/" CPPFLAGS += "-P" BUILD_CPPFLAGS += "-P" -do_configure_prepend () { +do_configure:prepend () { rm -f ${S}/libtool rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4 rm -f ${S}/aclocal.m4 @@ -58,6 +58,6 @@ do_configure_prepend () { #| make: *** [install-serf-lib] Error 1 PARALLEL_MAKEINST = "" -RDEPENDS_${PN} = "serf" +RDEPENDS:${PN} = "serf" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/swig/swig.inc b/poky/meta/recipes-devtools/swig/swig.inc index 292bca393..eb8d72315 100644 --- a/poky/meta/recipes-devtools/swig/swig.inc +++ b/poky/meta/recipes-devtools/swig/swig.inc @@ -49,11 +49,11 @@ BBCLASSEXTEND = "native nativesdk" # necessary together with bison dependency until a new upstream version after # 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch -do_configure_append() { +do_configure:append() { mkdir -p ${B}/Source/CParse } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { cd ${D}${bindir} ln -s swig swig2.0 } @@ -62,6 +62,6 @@ def swiglib_relpath(d): swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') return os.path.relpath(swiglib, d.getVar('bindir')) -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} } diff --git a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index dadba9eca..0dd18d7a0 100644 --- a/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/poky/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -36,11 +36,11 @@ UPSTREAM_CHECK_REGEX = "syslinux-(?P<pver>.+)\.tar" UPSTREAM_VERSION_UNKNOWN = "1" # We can build the native parts anywhere, but the target has to be x86 -COMPATIBLE_HOST_class-target = '(x86_64|i.86).*-(linux|freebsd.*)' +COMPATIBLE_HOST:class-target = '(x86_64|i.86).*-(linux|freebsd.*)' # Don't let the sanity checker trip on the 32 bit real mode BIOS binaries -INSANE_SKIP_${PN}-misc = "arch" -INSANE_SKIP_${PN}-chain = "arch" +INSANE_SKIP:${PN}-misc = "arch" +INSANE_SKIP:${PN}-chain = "arch" # When building the installer, CC is used to link. When building the bootloader, # LD is used. However, these variables assume that GCC is used and break the @@ -49,7 +49,7 @@ TARGET_LDFLAGS = "" SECURITY_LDFLAGS = "" LDFLAGS_SECTION_REMOVAL = "" -CFLAGS_append = " -DNO_INLINE_FUNCS" +CFLAGS:append = " -DNO_INLINE_FUNCS" EXTRA_OEMAKE = " \ BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ @@ -87,17 +87,17 @@ do_install() { # # Tasks for target which ship the precompiled bootloader and installer # -do_configure_class-target() { +do_configure:class-target() { # No need to do anything as we're mostly shipping the precompiled binaries : } -do_compile_class-target() { +do_compile:class-target() { # No need to do anything as we're mostly shipping the precompiled binaries : } -do_install_class-target() { +do_install:class-target() { oe_runmake firmware="bios" install INSTALLROOT="${D}" install -d ${D}${datadir}/syslinux/ @@ -107,19 +107,19 @@ do_install_class-target() { PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" -RDEPENDS_${PN} += "mtools" -RDEPENDS_${PN}-nomtools += "libext2fs" -RDEPENDS_${PN}-misc += "perl" - -FILES_${PN} = "${bindir}/syslinux" -FILES_${PN}-nomtools = "${bindir}/syslinux-nomtools" -FILES_${PN}-extlinux = "${sbindir}/extlinux" -FILES_${PN}-mbr = "${datadir}/${BPN}/mbr.bin" -FILES_${PN}-chain = "${datadir}/${BPN}/chain.c32" -FILES_${PN}-isolinux = "${datadir}/${BPN}/isolinux.bin" -FILES_${PN}-pxelinux = "${datadir}/${BPN}/pxelinux.0" -FILES_${PN}-dev += "${datadir}/${BPN}/com32/lib*${SOLIBS} ${datadir}/${BPN}/com32/include ${datadir}/${BPN}/com32/com32.ld" -FILES_${PN}-staticdev += "${datadir}/${BPN}/com32/lib*.a ${libdir}/${BPN}/com32/lib*.a" -FILES_${PN}-misc = "${datadir}/${BPN}/* ${libdir}/${BPN}/* ${bindir}/*" +RDEPENDS:${PN} += "mtools" +RDEPENDS:${PN}-nomtools += "libext2fs" +RDEPENDS:${PN}-misc += "perl" + +FILES:${PN} = "${bindir}/syslinux" +FILES:${PN}-nomtools = "${bindir}/syslinux-nomtools" +FILES:${PN}-extlinux = "${sbindir}/extlinux" +FILES:${PN}-mbr = "${datadir}/${BPN}/mbr.bin" +FILES:${PN}-chain = "${datadir}/${BPN}/chain.c32" +FILES:${PN}-isolinux = "${datadir}/${BPN}/isolinux.bin" +FILES:${PN}-pxelinux = "${datadir}/${BPN}/pxelinux.0" +FILES:${PN}-dev += "${datadir}/${BPN}/com32/lib*${SOLIBS} ${datadir}/${BPN}/com32/include ${datadir}/${BPN}/com32/com32.ld" +FILES:${PN}-staticdev += "${datadir}/${BPN}/com32/lib*.a ${libdir}/${BPN}/com32/lib*.a" +FILES:${PN}-misc = "${datadir}/${BPN}/* ${libdir}/${BPN}/* ${bindir}/*" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb index 905a0cbb7..fd6f17b65 100644 --- a/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +++ b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \ file://no_lto.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ file://0002-musl-does-not-provide-printf-h.patch \ file://0003-musl-does-not-provide-canonicalize_file_name.patch \ @@ -31,14 +31,14 @@ inherit pkgconfig autotools systemd features_check REQUIRED_DISTRO_FEATURES = "systemd" -SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service" +SYSTEMD_SERVICE:${PN} = "systemd-bootchart.service" -do_configure_prepend() { +do_configure:prepend() { # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot rm -f ${S}/m4/intltool.m4 } -FILES_${PN} += "${systemd_unitdir}/systemd-bootchart" +FILES:${PN} += "${systemd_unitdir}/systemd-bootchart" EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ --with-rootlibdir=${base_libdir}" diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 87369c47d..48e6e02f0 100644 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -19,13 +19,13 @@ SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent \ " DEPENDS = "util-linux openssl" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" S = "${WORKDIR}/git/agent" inherit update-rc.d systemd -SYSTEMD_SERVICE_${PN} = "tcf-agent.service" +SYSTEMD_SERVICE:${PN} = "tcf-agent.service" INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." @@ -43,14 +43,14 @@ LCL_STOP_SERVICES = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ # These features don't compile for several cases. # -CFLAGS_append_arc = " ${LCL_STOP_SERVICES}" -CFLAGS_append_mips = " ${LCL_STOP_SERVICES}" -CFLAGS_append_mips64 = " ${LCL_STOP_SERVICES}" -CFLAGS_append_libc-musl = " ${LCL_STOP_SERVICES}" -CFLAGS_append_powerpc64 = " ${LCL_STOP_SERVICES}" -CFLAGS_append_powerpc64le = " ${LCL_STOP_SERVICES}" -CFLAGS_append_riscv64 = " ${LCL_STOP_SERVICES}" -CFLAGS_append_riscv32 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:arc = " ${LCL_STOP_SERVICES}" +CFLAGS:append:mips = " ${LCL_STOP_SERVICES}" +CFLAGS:append:mips64 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:libc-musl = " ${LCL_STOP_SERVICES}" +CFLAGS:append:powerpc64 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:powerpc64le = " ${LCL_STOP_SERVICES}" +CFLAGS:append:riscv64 = " ${LCL_STOP_SERVICES}" +CFLAGS:append:riscv32 = " ${LCL_STOP_SERVICES}" do_install() { oe_runmake install INSTALLROOT=${D} diff --git a/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index 8d58fafeb..1e91f0827 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb @@ -27,7 +27,7 @@ SRC_URI = "${BASE_SRC_URI} \ " SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa" -SRC_URI_class-native = "${BASE_SRC_URI}" +SRC_URI:class-native = "${BASE_SRC_URI}" UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src" @@ -59,13 +59,13 @@ do_install() { SYSROOT_DIRS += "${bindir_crossscripts}" PACKAGES =+ "tcl-lib" -FILES_tcl-lib = "${libdir}/libtcl8.6.so.*" -FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" -FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" +FILES:tcl-lib = "${libdir}/libtcl8.6.so.*" +FILES:${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" +FILES:${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" # isn't getting picked up by shlibs code -RDEPENDS_${PN} += "tcl-lib" -RDEPENDS_${PN}-ptest += "libgcc" +RDEPENDS:${PN} += "tcl-lib" +RDEPENDS:${PN}-ptest += "libgcc" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb index f9bae720c..2bc7a9230 100644 --- a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" DEPENDS = "flex-native bison-native flex" DEPENDS += "libtirpc" -DEPENDS_append_class-nativesdk = " flex-nativesdk" +DEPENDS:append:class-nativesdk = " flex-nativesdk" ASNEEDED = "" @@ -35,9 +35,9 @@ PV = "0.9.22+${SRCPV}" BBCLASSEXTEND = "native nativesdk" inherit autotools -EXTRA_OECONF_append_class-native = " --sbindir=${bindir}" -CFLAGS_append = " -I${STAGING_INCDIR}/tirpc" -EXTRA_OECONF_append = " LIBS=-ltirpc" +EXTRA_OECONF:append:class-native = " --sbindir=${bindir}" +CFLAGS:append = " -I${STAGING_INCDIR}/tirpc" +EXTRA_OECONF:append = " LIBS=-ltirpc" # Turn off these header detects else the inode search # will walk entire file systems and this is a real problem diff --git a/poky/meta/recipes-devtools/vala/vala.inc b/poky/meta/recipes-devtools/vala/vala.inc index 71da2ef07..1a1115739 100644 --- a/poky/meta/recipes-devtools/vala/vala.inc +++ b/poky/meta/recipes-devtools/vala/vala.inc @@ -8,10 +8,10 @@ DEPENDS = "bison-native flex-native glib-2.0" # Appending libxslt-native to dependencies has an effect # of rebuilding the manual, which is very slow. Let's do this # only when api-documentation distro feature is enabled. -DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}" +DEPENDS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}" # vala-native contains a native version of vapigen, which we use instead of the target one -DEPENDS_append_class-target = " vala-native" +DEPENDS:append:class-target = " vala-native" BBCLASSEXTEND = "native" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" @@ -21,13 +21,13 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" inherit autotools pkgconfig upstream-version-is-even -FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" -FILES_${PN}-doc += "${datadir}/devhelp" +FILES:${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" +FILES:${PN}-doc += "${datadir}/devhelp" # .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}" -do_configure_prepend_class-target() { +do_configure:prepend:class-target() { # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot # The wrapper will call a native vapigen cat > ${B}/vapigen-wrapper << EOF @@ -41,16 +41,16 @@ EXTRA_OECONF += " --disable-valadoc" # Vapigen wrapper needs to be available system-wide, because it will be used # to build vapi files from all other packages with vala support -do_install_append_class-target() { +do_install:append:class-target() { install -d ${D}${bindir}/ install ${B}/vapigen-wrapper ${D}${bindir}/ } # Put vapigen wrapper into target sysroot so that it can be used when building # vapi files. -SYSROOT_DIRS_append_class-target = " ${bindir}" +SYSROOT_DIRS:append:class-target = " ${bindir}" -SYSROOT_PREPROCESS_FUNCS_append_class-target = " vapigen_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess" vapigen_sysroot_preprocess() { # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks # up our wrapper. diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch b/poky/meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch new file mode 100644 index 000000000..9a5f6a3f5 --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch @@ -0,0 +1,34 @@ +From 200b6a5a0ea3e1e154663b0fc575bfe2becf177d Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <mark@klomp.org> +Date: Wed, 21 Jul 2021 17:55:40 +0200 +Subject: [PATCH] m_debuginfo/debuginfo.c VG_(get_fnname_kind) _start is below + main + +With glibc 2.34 we might see the _start symbol as the frame that +called main instead of directly after __libc_start_main or +generic_start_main. + +Fixes memcheck/tests/badjump[2], memcheck/tests/origin4-many, +helgrind/tests/tc04_free_lock, helgrind/tests/tc09_bad_unlock +and helgrind/tests/tc20_verifywrap. + +Upstream-Status: Backport +--- + coregrind/m_debuginfo/debuginfo.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c +index bc2578b377..e2218f2668 100644 +--- a/coregrind/m_debuginfo/debuginfo.c ++++ b/coregrind/m_debuginfo/debuginfo.c +@@ -2289,6 +2289,7 @@ Vg_FnNameKind VG_(get_fnname_kind) ( const HChar* name ) + VG_STREQN(18, "__libc_start_main.", name) || // gcc optimization + VG_STREQ("generic_start_main", name) || // Yellow Dog doggedness + VG_STREQN(19, "generic_start_main.", name) || // gcc optimization ++ VG_STREQ("_start", name) || + # elif defined(VGO_darwin) + // See readmacho.c for an explanation of this. + VG_STREQ("start_according_to_valgrind", name) || // Darwin, darling +-- +2.27.0 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch b/poky/meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch new file mode 100644 index 000000000..451a459ea --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch @@ -0,0 +1,171 @@ +From 52ed51fc35f8a6148c2940eb46932b02dd3b9b23 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <mark@klomp.org> +Date: Wed, 21 Jul 2021 19:53:13 +0200 +Subject: [PATCH] Generate a ENOSYS (sys_ni_syscall) for clone3 on all linux + arches + +glibc 2.34 will try to use clone3 first before falling back to +the clone syscall. So implement clone3 as sys_ni_syscall which +simply return ENOSYS without producing a warning. + +https://bugs.kde.org/show_bug.cgi?id=439590 + +Upstream-Status: Backport +--- + coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-arm-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-arm64-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-mips32-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-mips64-linux.c | 1 + + coregrind/m_syswrap/syswrap-nanomips-linux.c | 1 + + coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ + include/vki/vki-scnums-shared-linux.h | 2 ++ + 11 files changed, 20 insertions(+) + +diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c +index 45e1f3d1bb..3b2dcb8e30 100644 +--- a/coregrind/m_syswrap/syswrap-amd64-linux.c ++++ b/coregrind/m_syswrap/syswrap-amd64-linux.c +@@ -874,6 +874,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c +index 428cb7c6fc..7f41b07491 100644 +--- a/coregrind/m_syswrap/syswrap-arm-linux.c ++++ b/coregrind/m_syswrap/syswrap-arm-linux.c +@@ -1051,6 +1051,8 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c +index 024ece27f5..0d717f44be 100644 +--- a/coregrind/m_syswrap/syswrap-arm64-linux.c ++++ b/coregrind/m_syswrap/syswrap-arm64-linux.c +@@ -830,6 +830,8 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c +index 62b085ea21..b62129111b 100644 +--- a/coregrind/m_syswrap/syswrap-mips32-linux.c ++++ b/coregrind/m_syswrap/syswrap-mips32-linux.c +@@ -1136,6 +1136,8 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_ (__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c +index b73c03da16..94f38366f0 100644 +--- a/coregrind/m_syswrap/syswrap-mips64-linux.c ++++ b/coregrind/m_syswrap/syswrap-mips64-linux.c +@@ -815,6 +815,7 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY (__NR_io_uring_setup, sys_io_uring_setup), + LINXY (__NR_io_uring_enter, sys_io_uring_enter), + LINXY (__NR_io_uring_register, sys_io_uring_register), ++ GENX_ (__NR_clone3, sys_ni_syscall), + LINX_ (__NR_faccessat2, sys_faccessat2), + }; + +diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c +index 14127b181a..102c155507 100644 +--- a/coregrind/m_syswrap/syswrap-nanomips-linux.c ++++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c +@@ -824,6 +824,7 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY (__NR_io_uring_setup, sys_io_uring_setup), + LINXY (__NR_io_uring_enter, sys_io_uring_enter), + LINXY (__NR_io_uring_register, sys_io_uring_register), ++ GENX_ (__NR_clone3, sys_ni_syscall), + LINX_ (__NR_faccessat2, sys_faccessat2), + }; + +diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c +index aad14f8ba4..1e2efc6777 100644 +--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c ++++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c +@@ -1054,6 +1054,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c +index c0e3f55491..76610e1423 100644 +--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c ++++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c +@@ -1023,6 +1023,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c +index af6c4eb210..5283c19fe4 100644 +--- a/coregrind/m_syswrap/syswrap-s390x-linux.c ++++ b/coregrind/m_syswrap/syswrap-s390x-linux.c +@@ -864,6 +864,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c +index 67d866497d..418c769750 100644 +--- a/coregrind/m_syswrap/syswrap-x86-linux.c ++++ b/coregrind/m_syswrap/syswrap-x86-linux.c +@@ -1645,6 +1645,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 + LINXY(__NR_io_uring_register, sys_io_uring_register),// 427 + ++ GENX_(__NR_clone3, sys_ni_syscall), // 435 ++ + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + }; + +diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h +index c8bc31b4b3..6c70c9981d 100644 +--- a/include/vki/vki-scnums-shared-linux.h ++++ b/include/vki/vki-scnums-shared-linux.h +@@ -39,6 +39,8 @@ + #define __NR_fsmount 432 + #define __NR_fspick 433 + ++#define __NR_clone3 435 ++ + #define __NR_faccessat2 439 + + #endif +-- +2.27.0 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch b/poky/meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch new file mode 100644 index 000000000..fce66b96a --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch @@ -0,0 +1,43 @@ +From 6da22a4d246519cd1a638cfc7eff00cdd74413c4 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <mark@klomp.org> +Date: Fri, 16 Jul 2021 21:37:21 +0200 +Subject: [PATCH] gdbserver_tests: update filters for newer glibc/gdb + +With newer glibc/gdb we might see a __select call without anything +following on the line. Also when gdb cannot find a file it might +now print "Inappropriate ioctl for device" instead of the message +"No such file or directory" + +Upstream-Status: Backport +--- + gdbserver_tests/filter_gdb | 1 + + gdbserver_tests/filter_vgdb | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb +index 3bcd26d86c..4a5b5d7a5b 100755 +--- a/gdbserver_tests/filter_gdb ++++ b/gdbserver_tests/filter_gdb +@@ -111,6 +111,7 @@ s/\(0x........\) in ?? ()$/\1 in syscall .../ + # If select.c sources are present, we can also get a line containing: + # return SYSCALL_CANCEL.... + s/in __select .*/in syscall .../ ++s/in __select$/in syscall .../ + /exceptfds/d + /sysv\/linux\/select\.c/d + /return SYSCALL_CANCEL /d +diff --git a/gdbserver_tests/filter_vgdb b/gdbserver_tests/filter_vgdb +index f8028a39ad..679ca4b31c 100755 +--- a/gdbserver_tests/filter_vgdb ++++ b/gdbserver_tests/filter_vgdb +@@ -18,6 +18,7 @@ sed -e '/relaying data between gdb and process/d' \ + + # filter some debuginfo problems with ld.so and SLES11 + sed -e '/^1 rtld.c: No such file or directory\./d' | ++sed -e '/rtld.c: Inappropriate ioctl for device\./d' | + + # and filter out any remaining empty lines + sed -e '/^$/d' +-- +2.27.0 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch b/poky/meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch new file mode 100644 index 000000000..ece88406c --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch @@ -0,0 +1,1422 @@ +From a1364805fc74b5690f763033c0c9b43f27613572 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <mark@klomp.org> +Date: Fri, 16 Jul 2021 15:47:08 -0400 +Subject: [PATCH] Update helgrind and drd suppression libc and libpthread paths + in glibc 2.34 + +glibc 2.34 moved all pthread functions into the main libc library. +And it changed the (in memory) path of the main libc library to +libc.so.6 (before it was libc-2.xx.so). + +This breaks various standard suppressions for helgrind and drd. +Fix this by doing a configure check for whether we are using glibc +2.34 by checking whether pthread_create is in libc instead of in +libpthread. If we are using glibc then define GLIBC_LIBC_PATH and +GLIBC_LIBPTHREAD_PATH variables that point to the (regexp) path +of the library that contains all libc functions and pthread functions +(which will be the same path for glibc 2.34+). + +Rename glibc-2.34567-NPTL-helgrind.supp to glibc-2.X-helgrind.supp.in +and glibc-2.X-drd.supp to glibc-2.X-drd.supp.in and replace the +GLIBC_LIBC_PATH and GLIBC_LIBPTHREAD_PATH at configure time. + +The same could be done for the glibc-2.X.supp.in file, but hasn't +yet because it looks like most suppressions in that file are obsolete. + +Upstream-Status: Backport +--- + Makefile.am | 2 +- + configure.ac | 37 +++++++++++++++++-- + glibc-2.X-drd.supp => glibc-2.X-drd.supp.in | 6 ++- + ...elgrind.supp => glibc-2.X-helgrind.supp.in | 16 ++++---- + 4 files changed, 47 insertions(+), 14 deletions(-) + rename glibc-2.X-drd.supp => glibc-2.X-drd.supp.in (97%) + rename glibc-2.34567-NPTL-helgrind.supp => glibc-2.X-helgrind.supp.in (95%) + +Index: valgrind-3.17.0/Makefile.am +=================================================================== +--- valgrind-3.17.0.orig/Makefile.am ++++ valgrind-3.17.0/Makefile.am +@@ -41,7 +41,7 @@ SUPP_FILES = \ + glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \ + glibc-2.6.supp glibc-2.7.supp glibc-2.X.supp.in \ + xfree-3.supp xfree-4.supp \ +- glibc-2.34567-NPTL-helgrind.supp \ ++ glibc-2.X-helgrind.supp \ + glibc-2.2-LinuxThreads-helgrind.supp \ + glibc-2.X-drd.supp \ + darwin9.supp darwin9-drd.supp \ +Index: valgrind-3.17.0/configure.ac +=================================================================== +--- valgrind-3.17.0.orig/configure.ac ++++ valgrind-3.17.0/configure.ac +@@ -1090,6 +1090,31 @@ if test x$GLIBC_VERSION = x; then + fi + fi + ++# If this is glibc then figure out the generic (in file) libc.so and ++# libpthread.so file paths to use in suppressions. Before 2.34 libpthread ++# was a separate library, afterwards it was merged into libc.so and ++# the library is called libc.so.6 (before it was libc-2.[0-9]+.so). ++# Use this fact to set GLIBC_LIBC_PATH and GLIBC_LIBPTHREAD_PATH. ++case ${GLIBC_VERSION} in ++2*) ++ AC_MSG_CHECKING([whether pthread_create needs libpthread]) ++ AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_create])], ++ [ ++ AC_MSG_RESULT([no]) ++ GLIBC_LIBC_PATH="*/lib*/libc.so.6" ++ GLIBC_LIBPTHREAD_PATH="$GLIBC_LIBC_PATH" ++ ], [ ++ AC_MSG_RESULT([yes]) ++ GLIBC_LIBC_PATH="*/lib*/libc-2.*so*" ++ GLIBC_LIBPTHREAD_PATH="*/lib*/libpthread-2.*so*" ++ ]) ++ ;; ++*) ++ AC_MSG_CHECKING([not glibc...]) ++ AC_MSG_RESULT([${GLIBC_VERSION}]) ++ ;; ++esac ++ + AC_MSG_CHECKING([the glibc version]) + + case "${GLIBC_VERSION}" in +@@ -1102,13 +1127,13 @@ case "${GLIBC_VERSION}" in + 2.[[3-6]]) + AC_MSG_RESULT(${GLIBC_VERSION} family) + DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" +- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; + 2.[[7-9]]) + AC_MSG_RESULT(${GLIBC_VERSION} family) + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" +- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; + 2.10|2.11) +@@ -1116,7 +1141,7 @@ case "${GLIBC_VERSION}" in + AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, + [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" +- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; + 2.*) +@@ -1126,7 +1151,7 @@ case "${GLIBC_VERSION}" in + AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, + [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" +- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; + darwin) +@@ -1157,6 +1182,8 @@ case "${GLIBC_VERSION}" in + esac + + AC_SUBST(GLIBC_VERSION) ++AC_SUBST(GLIBC_LIBC_PATH) ++AC_SUBST(GLIBC_LIBPTHREAD_PATH) + + + if test "$VGCONF_OS" != "solaris"; then +@@ -4910,6 +4937,8 @@ AC_CONFIG_FILES([ + valgrind.spec + valgrind.pc + glibc-2.X.supp ++ glibc-2.X-helgrind.supp ++ glibc-2.X-drd.supp + docs/Makefile + tests/Makefile + tests/vg_regtest +Index: valgrind-3.17.0/glibc-2.X-drd.supp +=================================================================== +--- valgrind-3.17.0.orig/glibc-2.X-drd.supp ++++ /dev/null +@@ -1,330 +0,0 @@ +-# +-# Suppression patterns for ld, the dynamic loader. +-# +- +-# Suppress all data races triggered by ld. +-{ +- drd-ld +- drd:ConflictingAccess +- obj:*/lib*/ld-*.so +-} +- +-# +-# Suppression patterns for libc. +-# +- +-# Suppress all data races where the topmost frame is inside libc.so. Although +-# this could hide some real data races, unfortunately this is the only way to +-# not report any false positives on stdio functions. The glibc functions +-# manipulating FILE objects use locking primitives that cannot be intercepted +-# easily. See also the definitions of _IO_lock_lock() etc. in the file +-# nptl/sysdeps/pthread/bits/stdio-lock.h in the glibc source tree. +-{ +- drd-libc-stdio +- drd:ConflictingAccess +- obj:*/lib*/libc-* +-} +-{ +- drd-libc-thread-cancellation-test +- drd:ConflictingAccess +- fun:write +-} +-{ +- drd-libc-random +- drd:ConflictingAccess +- fun:random_r +- fun:random +-} +- +-# +-# Suppression patterns for libstdc++, the implementation of the standard C++ +-# library included with the gcc compiler. +-# +-# Note: several versions of the libstdc++ library (4.2.2, 4.3.2, 4.4.0, 4.5.0 +-# and their predecessors) contain an implementation of the std::string class +-# that triggers conflicting memory accesses. See also +-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518 +-# +- +-# { +-# drd-libstdc++-std::string::string() +-# drd:ConflictingAccess +-# fun:_ZNSsC1ERKSs +-# } +- +-{ +- drd-libstdc++-cxa_guard_release +- drd:CondErr +- fun:pthread_cond_broadcast@* +- fun:__cxa_guard_release +-} +-{ +- drd-libstdc++-std::__ostream_insert() +- drd:ConflictingAccess +- fun:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l +- fun:_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc +-} +-{ +- drd-libstdc++-std::ostream::_M_insert<long>() +- drd:ConflictingAccess +- ... +- fun:_ZNSo9_M_insertIlEERSoT_ +-} +- +- +-# +-# Suppression patterns for libpthread. +-# +- +-{ +- drd-libpthread-pthread_create +- drd:ConflictingAccess +- ... +- fun:pthread_create* +-} +-{ +- drd-libpthread-pthread_join +- drd:ConflictingAccess +- fun:pthread_join +- fun:pthread_join +-} +-{ +- drd-libpthread-__deallocate_stack +- drd:ConflictingAccess +- ... +- fun:__deallocate_stack +-} +-{ +- drd-libpthread-__free_stacks +- drd:ConflictingAccess +- fun:__free_stacks +-} +-{ +- drd-libpthread-__free_tcb +- drd:ConflictingAccess +- ... +- fun:__free_tcb +-} +-{ +- drd-libpthread-__nptl_deallocate_tsd +- drd:ConflictingAccess +- fun:__nptl_deallocate_tsd +-} +-{ +- drd-libpthread-pthread_detach +- drd:ConflictingAccess +- fun:pthread_detach +- fun:pthread_detach +-} +-{ +- drd-libpthread-pthread_once +- drd:ConflictingAccess +- fun:pthread_once +-} +-{ +- drd-libpthread-pthread_cancel_init +- drd:ConflictingAccess +- fun:pthread_cancel_init +-} +-{ +- drd-libpthread-pthread_cancel +- drd:ConflictingAccess +- fun:pthread_cancel +- fun:pthread_cancel_intercept +-} +-{ +- drd-libpthread-_Unwind_ForcedUnwind +- drd:ConflictingAccess +- ... +- fun:_Unwind_ForcedUnwind +-} +-{ +- drd-libpthread-_Unwind_GetCFA +- drd:ConflictingAccess +- fun:_Unwind_GetCFA +-} +-{ +- drd-libpthread-_Unwind_Resume +- drd:ConflictingAccess +- ... +- fun:_Unwind_Resume +-} +-{ +- drd-libpthread-? +- drd:ConflictingAccess +- obj:*/lib/libgcc_s.so.1 +-} +-{ +- drd-libpthread-nanosleep +- drd:ConflictingAccess +- fun:nanosleep +-} +- +-# +-# Suppression patterns for libgomp. +-# +- +-# Unfortunately many statements in libgomp trigger conflicting accesses. It is +-# not clear to me which of these are safe and which ones not. See also +-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40362 +-{ +- drd-libgomp +- drd:ConflictingAccess +- obj:/usr/lib*/libgomp.so* +-} +- +-# +-# Suppression patterns for libX11. +-# +- +-{ +- drd-libX11-XCreateFontSet +- drd:CondErr +- fun:pthread_cond_init* +- fun:_XReply +- fun:XListFontsWithInfo +- obj:/usr/lib*/libX11.so* +- fun:XCreateOC +- fun:XCreateFontSet +-} +- +-# +-# Suppression patterns for libxcb. +-# +- +-{ +- drd-libxcb-xcb_wait_for_reply +- drd:CondErr +- ... +- fun:pthread_cond_destroy* +- fun:xcb_wait_for_reply +-} +- +-# +-# Suppression patterns for libglib. +-# +- +-{ +- drd-libglib-access-g_threads_got_initialized +- drd:ConflictingAccess +- ... +- fun:g_slice_alloc +- fun:g_ptr_array_sized_new +-} +-{ +- drd-libglib-access-g_threads_got_initialized +- drd:ConflictingAccess +- ... +- fun:_ZN27QEventDispatcherGlibPrivateC1EP13_GMainContext +- fun:_ZN20QEventDispatcherGlibC1EP7QObject +- obj:/usr/lib*/libQtCore.so.4.* +- obj:/usr/lib*/libQtCore.so.4.* +-} +-{ +- drd-libglib-access-g_mem_initialized +- drd:ConflictingAccess +- fun:g_malloc0 +-} +-{ +- drd-libglib-g_private_get_posix_impl +- drd:ConflictingAccess +- fun:g_private_get_posix_impl +-} +-{ +- drd-libglib-g_private_set_posix_impl +- drd:ConflictingAccess +- fun:g_private_set_posix_impl +-} +-{ +- drd-libglib-g_get_language_names +- drd:ConflictingAccess +- fun:g_slice_free_chain_with_offset +-} +-{ +- drd-libglib-g_main_context_new +- drd:ConflictingAccess +- fun:fcntl +- obj:/usr/lib*/libglib-*.so* +- fun:g_main_context_new +-} +- +-# +-# Suppression patterns for libQtCore. +-# +- +-{ +- drd-libQtCore-deref-that-calls-QThreadData-destructor +- drd:ConflictingAccess +- fun:_ZN11QThreadDataD1Ev +- obj:/usr/lib*/libQtCore.so.4.* +-} +-{ +- drd-libQtCore-4.0/4.1-Q_GLOBAL_STATIC-connectionList +- drd:ConflictingAccess +- obj:/usr/lib*/libQtCore.so.4.* +- fun:_ZN11QMetaObject8activateEP7QObjectiiPPv +- fun:_ZN11QMetaObject8activateEP7QObjectPKS_iPPv +-} +-{ +- drd-libQtCore-QObjectPrivate::clearGuards(QObject*) +- drd:ConflictingAccess +- fun:_ZN14QReadWriteLock12lockForWriteEv +- fun:_ZN14QObjectPrivate11clearGuardsEP7QObject +- fun:_ZN7QObjectD2Ev +-} +-{ +- drd-libQtCore-QObjectPrivate::clearGuards(QObject*) +- drd:ConflictingAccess +- fun:_ZN14QReadWriteLock12lockForWriteEv +- fun:_ZN12QWriteLocker6relockEv +- fun:_ZN12QWriteLockerC1EP14QReadWriteLock +- fun:_ZN14QObjectPrivate11clearGuardsEP7QObject +- fun:_ZN7QObjectD2Ev +- fun:_ZN24QAbstractEventDispatcherD2Ev +- fun:_ZN20QEventDispatcherGlibD0Ev +-} +-{ +- drd-libQtCore-QMutexPool::get(void const*) +- drd:ConflictingAccess +- fun:_ZN10QMutexPool3getEPKv +-} +-{ +- drd-libQtCore-qt_gettime_is_monotonic() +- drd:ConflictingAccess +- fun:_Z23qt_gettime_is_monotonicv +-} +- +-# +-# Suppression patterns for libboost. +-# +- +-# Suppress the races on boost::once_flag::epoch and on +-# boost::detail::this_thread_epoch. See also the source file +-# boost/thread/pthread/once.hpp in the Boost source tree +-# (https://svn.boost.org/trac/boost/browser/trunk/boost/thread/pthread/once.hpp). +-{ +- drd-libboost-boost::call_once<void (*)()>(boost::once_flag&, void (*)()) +- drd:ConflictingAccess +- ... +- fun:_ZN5boost9call_onceIPFvvEEEvRNS_9once_flagET_ +-} +-{ +- drd-libboost-boost::detail::get_once_per_thread_epoch() +- drd:ConflictingAccess +- fun:_ZN5boost6detail25get_once_per_thread_epochEv +-} +-# Suppress the race reports on boost::detail::current_thread_tls_key. See also +-# https://svn.boost.org/trac/boost/ticket/3526 for more information about why +-# the access pattern of current_thread_tls_key is safe. +-{ +- drd-libboost-boost::detail::get_current_thread_data() +- drd:ConflictingAccess +- ... +- fun:_ZN5boost6detail23get_current_thread_dataEv +-} +-{ +- drd-libboost-boost::detail::set_current_thread_data(boost::detail::thread_data_base*) +- drd:ConflictingAccess +- ... +- fun:_ZN5boost6detail23set_current_thread_dataEPNS0_16thread_data_baseE +-} +Index: valgrind-3.17.0/glibc-2.X-drd.supp.in +=================================================================== +--- /dev/null ++++ valgrind-3.17.0/glibc-2.X-drd.supp.in +@@ -0,0 +1,332 @@ ++# IMPORTANT: DO NOT EDIT glibc-2.X-drd.supp, as it is as a generated ++# file. Instead edit glibc-2.X-drd.supp.in. ++# ++# Suppression patterns for ld, the dynamic loader. ++# ++ ++# Suppress all data races triggered by ld. ++{ ++ drd-ld ++ drd:ConflictingAccess ++ obj:*/lib*/ld*.so* ++} ++ ++# ++# Suppression patterns for libc. ++# ++ ++# Suppress all data races where the topmost frame is inside libc.so. Although ++# this could hide some real data races, unfortunately this is the only way to ++# not report any false positives on stdio functions. The glibc functions ++# manipulating FILE objects use locking primitives that cannot be intercepted ++# easily. See also the definitions of _IO_lock_lock() etc. in the file ++# nptl/sysdeps/pthread/bits/stdio-lock.h in the glibc source tree. ++{ ++ drd-libc-stdio ++ drd:ConflictingAccess ++ obj:@GLIBC_LIBC_PATH@ ++} ++{ ++ drd-libc-thread-cancellation-test ++ drd:ConflictingAccess ++ fun:write ++} ++{ ++ drd-libc-random ++ drd:ConflictingAccess ++ fun:random_r ++ fun:random ++} ++ ++# ++# Suppression patterns for libstdc++, the implementation of the standard C++ ++# library included with the gcc compiler. ++# ++# Note: several versions of the libstdc++ library (4.2.2, 4.3.2, 4.4.0, 4.5.0 ++# and their predecessors) contain an implementation of the std::string class ++# that triggers conflicting memory accesses. See also ++# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518 ++# ++ ++# { ++# drd-libstdc++-std::string::string() ++# drd:ConflictingAccess ++# fun:_ZNSsC1ERKSs ++# } ++ ++{ ++ drd-libstdc++-cxa_guard_release ++ drd:CondErr ++ fun:pthread_cond_broadcast@* ++ fun:__cxa_guard_release ++} ++{ ++ drd-libstdc++-std::__ostream_insert() ++ drd:ConflictingAccess ++ fun:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l ++ fun:_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc ++} ++{ ++ drd-libstdc++-std::ostream::_M_insert<long>() ++ drd:ConflictingAccess ++ ... ++ fun:_ZNSo9_M_insertIlEERSoT_ ++} ++ ++ ++# ++# Suppression patterns for libpthread. ++# ++ ++{ ++ drd-libpthread-pthread_create ++ drd:ConflictingAccess ++ ... ++ fun:pthread_create* ++} ++{ ++ drd-libpthread-pthread_join ++ drd:ConflictingAccess ++ fun:pthread_join ++ fun:pthread_join ++} ++{ ++ drd-libpthread-__deallocate_stack ++ drd:ConflictingAccess ++ ... ++ fun:__deallocate_stack ++} ++{ ++ drd-libpthread-__free_stacks ++ drd:ConflictingAccess ++ fun:__free_stacks ++} ++{ ++ drd-libpthread-__free_tcb ++ drd:ConflictingAccess ++ ... ++ fun:__free_tcb ++} ++{ ++ drd-libpthread-__nptl_deallocate_tsd ++ drd:ConflictingAccess ++ fun:__nptl_deallocate_tsd ++} ++{ ++ drd-libpthread-pthread_detach ++ drd:ConflictingAccess ++ fun:pthread_detach ++ fun:pthread_detach ++} ++{ ++ drd-libpthread-pthread_once ++ drd:ConflictingAccess ++ fun:pthread_once ++} ++{ ++ drd-libpthread-pthread_cancel_init ++ drd:ConflictingAccess ++ fun:pthread_cancel_init ++} ++{ ++ drd-libpthread-pthread_cancel ++ drd:ConflictingAccess ++ fun:pthread_cancel ++ fun:pthread_cancel_intercept ++} ++{ ++ drd-libpthread-_Unwind_ForcedUnwind ++ drd:ConflictingAccess ++ ... ++ fun:_Unwind_ForcedUnwind ++} ++{ ++ drd-libpthread-_Unwind_GetCFA ++ drd:ConflictingAccess ++ fun:_Unwind_GetCFA ++} ++{ ++ drd-libpthread-_Unwind_Resume ++ drd:ConflictingAccess ++ ... ++ fun:_Unwind_Resume ++} ++{ ++ drd-libpthread-? ++ drd:ConflictingAccess ++ obj:*/lib/libgcc_s.so.1 ++} ++{ ++ drd-libpthread-nanosleep ++ drd:ConflictingAccess ++ fun:nanosleep ++} ++ ++# ++# Suppression patterns for libgomp. ++# ++ ++# Unfortunately many statements in libgomp trigger conflicting accesses. It is ++# not clear to me which of these are safe and which ones not. See also ++# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40362 ++{ ++ drd-libgomp ++ drd:ConflictingAccess ++ obj:/usr/lib*/libgomp.so* ++} ++ ++# ++# Suppression patterns for libX11. ++# ++ ++{ ++ drd-libX11-XCreateFontSet ++ drd:CondErr ++ fun:pthread_cond_init* ++ fun:_XReply ++ fun:XListFontsWithInfo ++ obj:/usr/lib*/libX11.so* ++ fun:XCreateOC ++ fun:XCreateFontSet ++} ++ ++# ++# Suppression patterns for libxcb. ++# ++ ++{ ++ drd-libxcb-xcb_wait_for_reply ++ drd:CondErr ++ ... ++ fun:pthread_cond_destroy* ++ fun:xcb_wait_for_reply ++} ++ ++# ++# Suppression patterns for libglib. ++# ++ ++{ ++ drd-libglib-access-g_threads_got_initialized ++ drd:ConflictingAccess ++ ... ++ fun:g_slice_alloc ++ fun:g_ptr_array_sized_new ++} ++{ ++ drd-libglib-access-g_threads_got_initialized ++ drd:ConflictingAccess ++ ... ++ fun:_ZN27QEventDispatcherGlibPrivateC1EP13_GMainContext ++ fun:_ZN20QEventDispatcherGlibC1EP7QObject ++ obj:/usr/lib*/libQtCore.so.4.* ++ obj:/usr/lib*/libQtCore.so.4.* ++} ++{ ++ drd-libglib-access-g_mem_initialized ++ drd:ConflictingAccess ++ fun:g_malloc0 ++} ++{ ++ drd-libglib-g_private_get_posix_impl ++ drd:ConflictingAccess ++ fun:g_private_get_posix_impl ++} ++{ ++ drd-libglib-g_private_set_posix_impl ++ drd:ConflictingAccess ++ fun:g_private_set_posix_impl ++} ++{ ++ drd-libglib-g_get_language_names ++ drd:ConflictingAccess ++ fun:g_slice_free_chain_with_offset ++} ++{ ++ drd-libglib-g_main_context_new ++ drd:ConflictingAccess ++ fun:fcntl ++ obj:/usr/lib*/libglib-*.so* ++ fun:g_main_context_new ++} ++ ++# ++# Suppression patterns for libQtCore. ++# ++ ++{ ++ drd-libQtCore-deref-that-calls-QThreadData-destructor ++ drd:ConflictingAccess ++ fun:_ZN11QThreadDataD1Ev ++ obj:/usr/lib*/libQtCore.so.4.* ++} ++{ ++ drd-libQtCore-4.0/4.1-Q_GLOBAL_STATIC-connectionList ++ drd:ConflictingAccess ++ obj:/usr/lib*/libQtCore.so.4.* ++ fun:_ZN11QMetaObject8activateEP7QObjectiiPPv ++ fun:_ZN11QMetaObject8activateEP7QObjectPKS_iPPv ++} ++{ ++ drd-libQtCore-QObjectPrivate::clearGuards(QObject*) ++ drd:ConflictingAccess ++ fun:_ZN14QReadWriteLock12lockForWriteEv ++ fun:_ZN14QObjectPrivate11clearGuardsEP7QObject ++ fun:_ZN7QObjectD2Ev ++} ++{ ++ drd-libQtCore-QObjectPrivate::clearGuards(QObject*) ++ drd:ConflictingAccess ++ fun:_ZN14QReadWriteLock12lockForWriteEv ++ fun:_ZN12QWriteLocker6relockEv ++ fun:_ZN12QWriteLockerC1EP14QReadWriteLock ++ fun:_ZN14QObjectPrivate11clearGuardsEP7QObject ++ fun:_ZN7QObjectD2Ev ++ fun:_ZN24QAbstractEventDispatcherD2Ev ++ fun:_ZN20QEventDispatcherGlibD0Ev ++} ++{ ++ drd-libQtCore-QMutexPool::get(void const*) ++ drd:ConflictingAccess ++ fun:_ZN10QMutexPool3getEPKv ++} ++{ ++ drd-libQtCore-qt_gettime_is_monotonic() ++ drd:ConflictingAccess ++ fun:_Z23qt_gettime_is_monotonicv ++} ++ ++# ++# Suppression patterns for libboost. ++# ++ ++# Suppress the races on boost::once_flag::epoch and on ++# boost::detail::this_thread_epoch. See also the source file ++# boost/thread/pthread/once.hpp in the Boost source tree ++# (https://svn.boost.org/trac/boost/browser/trunk/boost/thread/pthread/once.hpp). ++{ ++ drd-libboost-boost::call_once<void (*)()>(boost::once_flag&, void (*)()) ++ drd:ConflictingAccess ++ ... ++ fun:_ZN5boost9call_onceIPFvvEEEvRNS_9once_flagET_ ++} ++{ ++ drd-libboost-boost::detail::get_once_per_thread_epoch() ++ drd:ConflictingAccess ++ fun:_ZN5boost6detail25get_once_per_thread_epochEv ++} ++# Suppress the race reports on boost::detail::current_thread_tls_key. See also ++# https://svn.boost.org/trac/boost/ticket/3526 for more information about why ++# the access pattern of current_thread_tls_key is safe. ++{ ++ drd-libboost-boost::detail::get_current_thread_data() ++ drd:ConflictingAccess ++ ... ++ fun:_ZN5boost6detail23get_current_thread_dataEv ++} ++{ ++ drd-libboost-boost::detail::set_current_thread_data(boost::detail::thread_data_base*) ++ drd:ConflictingAccess ++ ... ++ fun:_ZN5boost6detail23set_current_thread_dataEPNS0_16thread_data_baseE ++} +Index: valgrind-3.17.0/glibc-2.34567-NPTL-helgrind.supp +=================================================================== +--- valgrind-3.17.0.orig/glibc-2.34567-NPTL-helgrind.supp ++++ /dev/null +@@ -1,301 +0,0 @@ +- +-# FIXME 22 Jan 09: helgrind-glibc2X-005 overlaps with a lot of +-# other stuff. They should be removed. +- +-##----------------------------------------------------------------------## +-# Suppressions for the Helgrind tool when using +-# a glibc-2.{3,4,5,6,7,8,9} system +- +-#################################################### +-# glibc-2.X specific +-# These are generic cover-alls which catch a lot of stuff +-# in various combinations of ld, libc and libpthread +-# +-# Note this is heavyhanded and not very clever: +-# +-# - suppress anything that has its top frame in ld.so +-# That's fine, since it's mostly dynamic linking stuff, +-# which has various deliberate (harmless) races +-# +-# - suppress anything that has its top frame in libc.so. +-# This really isn't clever, since it could hide some +-# legitimate races. But the problem is, if we don't do +-# this, then loads of errors to do with stdio are reported, because +-# H fails to see glibc's internal locking/unlocking of FILE*s +-# as required by POSIX. A better solution is needed. +-# +-# - some of the stdio functions in newer glibc manipulate stdio +-# FILE*s state through mempcpy, which we intercept, so we also need +-# to suppress such manipulations. +- +-#{ +-# helgrind-glibc2X-001 +-# Helgrind:Race +-# obj:*/lib*/ld-2.*so* +-#} +- +-# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 +- +-# helgrind-glibc2X-003 was merged into helgrind-glibc2X-001 +- +-{ +- helgrind-glibc2X-004 +- Helgrind:Race +- obj:*/lib*/libc-2.*so* +-} +- +-{ +- helgrind-glibc-io-xsputn-mempcpy +- Helgrind:Race +- fun:__GI_mempcpy +- fun:_IO_*xsputn* +- obj:*/lib*/libc-2.*so* +-} +- +-{ +- helgrind-glibc2X-005 +- Helgrind:Race +- obj:*/lib*/libpthread-2.*so* +-} +- +-# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 +- +-# helgrind-glibc2X-007 was merged into helgrind-glibc2X-001 +- +-# helgrind-glibc2X-008 was merged into helgrind-glibc2X-004 +- +-# helgrind-glibc2X-009 was merged into helgrind-glibc2X-004 +- +-# helgrind-glibc2X-010 was merged into helgrind-glibc2X-001 +- +-# helgrind-glibc2X-011 was merged into helgrind-glibc2X-004 +- +-# helgrind-glibc2X-012 was merged into helgrind-glibc2X-001 +- +-# helgrind-glibc2X-013 was merged into helgrind-glibc2X-001 +- +-# helgrind-glibc2X-014 was merged into helgrind-glibc2X-001 +- +-# helgrind-glibc2X-015 was merged into helgrind-glibc2X-004 +- +-# helgrind-glibc2X-016 was merged into helgrind-glibc2X-004 +- +-# These are very ugly. They are needed to suppress errors inside (eg) +-# NPTL's pthread_cond_signal. Why only one stack frame -- at least we +-# should see the wrapper calling the real functions, right? +-# Unfortunately, no: the real functions are handwritten assembly (in +-# the glibc-2.5 sources) and does not create a proper stack frame. +-# Therefore it's only one level of unwinding before we're back out in +-# user code rather than the 2 levels you'd expect. +-{ +- helgrind-glibc2X-101 +- Helgrind:Race +- obj:*/lib*/libpthread-2.*so* +- fun:pthread_* +-} +-{ +- helgrind-glibc2X-102 +- Helgrind:Race +- fun:mythread_wrapper +- obj:*/lib*/libpthread-2.*so* +-} +-{ +- helgrind-glibc2X-103 +- Helgrind:Race +- fun:pthread_cond_*@@GLIBC_2.* +-} +-{ +- helgrind-glibc2X-104 +- Helgrind:Race +- fun:__lll_mutex_* +-} +-{ +- helgrind-glibc2X-105 +- Helgrind:Race +- fun:pthread_rwlock_*lock* +-} +-{ +- helgrind-glibc2X-106 +- Helgrind:Race +- fun:__lll_lock_wait +-} +-{ +- helgrind-glibc2X-107 +- Helgrind:Race +- obj:*/lib*/libpthread-2.*so* +- fun:sem_* +-} +-{ +- helgrind-glibc2X-108 +- Helgrind:Race +- fun:clone +-} +-{ +- helgrind-glibc2X-109 +- Helgrind:Race +- fun:start_thread +-} +-{ +- helgrind-glibc2X-110 +- Helgrind:Race +- obj:*/lib*/libc-2.*so* +- fun:pthread_* +-} +-{ +- helgrind-glibc2X-111 +- Helgrind:Race +- fun:__lll_*lock_* +-} +-{ +- helgrind-glibc2X-113 +- Helgrind:Race +- fun:pthread_barrier_wait* +-} +- +- +-#################################################### +-# qt4 specific (GNU mangling) +-# +-{ +- helgrind-qt4---QMutex::lock()-QMutex::lock() +- Helgrind:Race +- ... +- fun:_ZN6QMutex4lockEv +- fun:_ZN6QMutex4lockEv +-} +- +-{ +- helgrind-qt4---QMutex::unlock()-QMutex::unlock() +- Helgrind:Race +- ... +- fun:_ZN6QMutex6unlockEv +- fun:_ZN6QMutex6unlockEv +-} +- +-{ +- helgrind-qt4---pthread_setspecific-QThreadPrivate::start(void*) +- Helgrind:Race +- fun:pthread_setspecific +- fun:_ZN14QThreadPrivate5startEPv +-} +- +- +-#################################################### +-# Other stuff. +-# +-# pthread_exit apparently calls some kind of unwind +-# mechanism - maybe to remove some number of frames +-# from the thread's stack, so as to get back to the +-# outermost frame for the thread? Anyway.. +- +-{ +- helgrind---*Unwind*-...-pthread_exit +- Helgrind:Race +- fun:*Unwind* +- ... +- fun:pthread_exit +-} +- +-{ +- helgrind---...-*Unwind*-*pthread_unwind* +- Helgrind:Race +- ... +- fun:*Unwind* +- fun:*pthread_unwind* +-} +- +-{ +- helgrind---...-*Unwind*-*pthread_unwind* +- Helgrind:Race +- ... +- fun:_Unwind* +- ... +- fun:_Unwind_Backtrace +-} +- +- +- +- +-#################################################### +-# To do with thread stack allocation and deallocation? +-# +-{ +- helgrind---free_stacks-__deallocate_stack +- Helgrind:Race +- fun:free_stacks +- fun:__deallocate_stack +-} +- +-{ +- helgrind---__deallocate_stack-start_thread-clone +- Helgrind:Race +- fun:__deallocate_stack +- fun:start_thread +- fun:clone +-} +- +- +-#################################################### +-# To do with pthread_{set,get}specific +-# +-{ +- helgrind---pthread_setspecific +- Helgrind:Race +- fun:pthread_setspecific +-} +- +-{ +- helgrind---pthread_getspecific +- Helgrind:Race +- fun:pthread_getspecific +-} +- +- +-#################################################### +-# To do with dynamic linking +-# +-# helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001 +- +-{ +- helgrind---_dl_allocate_tls +- Helgrind:Race +- fun:mempcpy +- fun:_dl_allocate_tls_init +- ... +- fun:pthread_create@@GLIBC_2.2* +- fun:pthread_create_WRK +- fun:pthread_create@* +-} +- +-{ +- helgrind---_dl_allocate_tls2 +- Helgrind:Race +- fun:memcpy +- fun:__mempcpy_inline +- fun:_dl_allocate_tls_init +- ... +- fun:pthread_create@@GLIBC_2.2* +- fun:pthread_create_WRK +- fun:pthread_create@* +-} +- +-#################################################### +-# To do with GNU libgomp +-# +-{ +- helgrind---libgomp43-1 +- Helgrind:Race +- fun:gomp_ordered_sync +-} +- +-{ +- helgrind---libgomp43-1 +- Helgrind:Race +- fun:gomp_ordered_next +-} +- +-{ +- helgrind---libgomp43-1 +- Helgrind:Race +- fun:gomp_ordered_last +-} +Index: valgrind-3.17.0/glibc-2.X-helgrind.supp.in +=================================================================== +--- /dev/null ++++ valgrind-3.17.0/glibc-2.X-helgrind.supp.in +@@ -0,0 +1,303 @@ ++# IMPORTANT: DO NOT EDIT glibc-2.X-helgrind.supp, as it is as a generated ++# file. Instead edit glibc-2.X-helgrind.supp.in. ++ ++# FIXME 22 Jan 09: helgrind-glibc2X-005 overlaps with a lot of ++# other stuff. They should be removed. ++ ++##----------------------------------------------------------------------## ++# Suppressions for the Helgrind tool when using ++# a glibc-2.{3,4,5,6,7,8,9} system ++ ++#################################################### ++# glibc-2.X specific ++# These are generic cover-alls which catch a lot of stuff ++# in various combinations of ld, libc and libpthread ++# ++# Note this is heavyhanded and not very clever: ++# ++# - suppress anything that has its top frame in ld.so ++# That's fine, since it's mostly dynamic linking stuff, ++# which has various deliberate (harmless) races ++# ++# - suppress anything that has its top frame in libc.so. ++# This really isn't clever, since it could hide some ++# legitimate races. But the problem is, if we don't do ++# this, then loads of errors to do with stdio are reported, because ++# H fails to see glibc's internal locking/unlocking of FILE*s ++# as required by POSIX. A better solution is needed. ++# ++# - some of the stdio functions in newer glibc manipulate stdio ++# FILE*s state through mempcpy, which we intercept, so we also need ++# to suppress such manipulations. ++ ++#{ ++# helgrind-glibc2X-001 ++# Helgrind:Race ++# obj:*/lib*/ld-2.*so* ++#} ++ ++# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 ++ ++# helgrind-glibc2X-003 was merged into helgrind-glibc2X-001 ++ ++{ ++ helgrind-glibc2X-004 ++ Helgrind:Race ++ obj:@GLIBC_LIBC_PATH@ ++} ++ ++{ ++ helgrind-glibc-io-xsputn-mempcpy ++ Helgrind:Race ++ fun:__GI_mempcpy ++ fun:_IO_*xsputn* ++ obj:@GLIBC_LIBC_PATH@ ++} ++ ++{ ++ helgrind-glibc2X-005 ++ Helgrind:Race ++ obj:@GLIBC_LIBPTHREAD_PATH@ ++} ++ ++# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 ++ ++# helgrind-glibc2X-007 was merged into helgrind-glibc2X-001 ++ ++# helgrind-glibc2X-008 was merged into helgrind-glibc2X-004 ++ ++# helgrind-glibc2X-009 was merged into helgrind-glibc2X-004 ++ ++# helgrind-glibc2X-010 was merged into helgrind-glibc2X-001 ++ ++# helgrind-glibc2X-011 was merged into helgrind-glibc2X-004 ++ ++# helgrind-glibc2X-012 was merged into helgrind-glibc2X-001 ++ ++# helgrind-glibc2X-013 was merged into helgrind-glibc2X-001 ++ ++# helgrind-glibc2X-014 was merged into helgrind-glibc2X-001 ++ ++# helgrind-glibc2X-015 was merged into helgrind-glibc2X-004 ++ ++# helgrind-glibc2X-016 was merged into helgrind-glibc2X-004 ++ ++# These are very ugly. They are needed to suppress errors inside (eg) ++# NPTL's pthread_cond_signal. Why only one stack frame -- at least we ++# should see the wrapper calling the real functions, right? ++# Unfortunately, no: the real functions are handwritten assembly (in ++# the glibc-2.5 sources) and does not create a proper stack frame. ++# Therefore it's only one level of unwinding before we're back out in ++# user code rather than the 2 levels you'd expect. ++{ ++ helgrind-glibc2X-101 ++ Helgrind:Race ++ obj:@GLIBC_LIBPTHREAD_PATH@ ++ fun:pthread_* ++} ++{ ++ helgrind-glibc2X-102 ++ Helgrind:Race ++ fun:mythread_wrapper ++ obj:@GLIBC_LIBPTHREAD_PATH@ ++} ++{ ++ helgrind-glibc2X-103 ++ Helgrind:Race ++ fun:pthread_cond_*@@GLIBC_2.* ++} ++{ ++ helgrind-glibc2X-104 ++ Helgrind:Race ++ fun:__lll_mutex_* ++} ++{ ++ helgrind-glibc2X-105 ++ Helgrind:Race ++ fun:pthread_rwlock_*lock* ++} ++{ ++ helgrind-glibc2X-106 ++ Helgrind:Race ++ fun:__lll_lock_wait ++} ++{ ++ helgrind-glibc2X-107 ++ Helgrind:Race ++ obj:@GLIBC_LIBPTHREAD_PATH@ ++ fun:sem_* ++} ++{ ++ helgrind-glibc2X-108 ++ Helgrind:Race ++ fun:clone ++} ++{ ++ helgrind-glibc2X-109 ++ Helgrind:Race ++ fun:start_thread ++} ++{ ++ helgrind-glibc2X-110 ++ Helgrind:Race ++ obj:@GLIBC_LIBC_PATH@ ++ fun:pthread_* ++} ++{ ++ helgrind-glibc2X-111 ++ Helgrind:Race ++ fun:__lll_*lock_* ++} ++{ ++ helgrind-glibc2X-113 ++ Helgrind:Race ++ fun:pthread_barrier_wait* ++} ++ ++ ++#################################################### ++# qt4 specific (GNU mangling) ++# ++{ ++ helgrind-qt4---QMutex::lock()-QMutex::lock() ++ Helgrind:Race ++ ... ++ fun:_ZN6QMutex4lockEv ++ fun:_ZN6QMutex4lockEv ++} ++ ++{ ++ helgrind-qt4---QMutex::unlock()-QMutex::unlock() ++ Helgrind:Race ++ ... ++ fun:_ZN6QMutex6unlockEv ++ fun:_ZN6QMutex6unlockEv ++} ++ ++{ ++ helgrind-qt4---pthread_setspecific-QThreadPrivate::start(void*) ++ Helgrind:Race ++ fun:pthread_setspecific ++ fun:_ZN14QThreadPrivate5startEPv ++} ++ ++ ++#################################################### ++# Other stuff. ++# ++# pthread_exit apparently calls some kind of unwind ++# mechanism - maybe to remove some number of frames ++# from the thread's stack, so as to get back to the ++# outermost frame for the thread? Anyway.. ++ ++{ ++ helgrind---*Unwind*-...-pthread_exit ++ Helgrind:Race ++ fun:*Unwind* ++ ... ++ fun:pthread_exit ++} ++ ++{ ++ helgrind---...-*Unwind*-*pthread_unwind* ++ Helgrind:Race ++ ... ++ fun:*Unwind* ++ fun:*pthread_unwind* ++} ++ ++{ ++ helgrind---...-*Unwind*-*pthread_unwind* ++ Helgrind:Race ++ ... ++ fun:_Unwind* ++ ... ++ fun:_Unwind_Backtrace ++} ++ ++ ++ ++ ++#################################################### ++# To do with thread stack allocation and deallocation? ++# ++{ ++ helgrind---free_stacks-__deallocate_stack ++ Helgrind:Race ++ fun:free_stacks ++ fun:__deallocate_stack ++} ++ ++{ ++ helgrind---__deallocate_stack-start_thread-clone ++ Helgrind:Race ++ fun:__deallocate_stack ++ fun:start_thread ++ fun:clone ++} ++ ++ ++#################################################### ++# To do with pthread_{set,get}specific ++# ++{ ++ helgrind---pthread_setspecific ++ Helgrind:Race ++ fun:pthread_setspecific ++} ++ ++{ ++ helgrind---pthread_getspecific ++ Helgrind:Race ++ fun:pthread_getspecific ++} ++ ++ ++#################################################### ++# To do with dynamic linking ++# ++# helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001 ++ ++{ ++ helgrind---_dl_allocate_tls ++ Helgrind:Race ++ fun:mempcpy ++ fun:_dl_allocate_tls_init ++ ... ++ fun:pthread_create@@GLIBC_2.2* ++ fun:pthread_create_WRK ++ fun:pthread_create@* ++} ++ ++{ ++ helgrind---_dl_allocate_tls2 ++ Helgrind:Race ++ fun:memcpy ++ fun:__mempcpy_inline ++ fun:_dl_allocate_tls_init ++ ... ++ fun:pthread_create@@GLIBC_2.2* ++ fun:pthread_create_WRK ++ fun:pthread_create@* ++} ++ ++#################################################### ++# To do with GNU libgomp ++# ++{ ++ helgrind---libgomp43-1 ++ Helgrind:Race ++ fun:gomp_ordered_sync ++} ++ ++{ ++ helgrind---libgomp43-1 ++ Helgrind:Race ++ fun:gomp_ordered_next ++} ++ ++{ ++ helgrind---libgomp43-1 ++ Helgrind:Race ++ fun:gomp_ordered_last ++} diff --git a/poky/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb index 60b248681..2805ad0eb 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb @@ -45,6 +45,10 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-Add-missing-musl.supp.patch \ file://0001-drd-tests-swapcontext-Add-SIGALRM-handler-to-avoid-s.patch \ + file://6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch \ + file://200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch \ + file://a1364805fc74b5690f763033c0c9b43f27613572.patch \ + file://52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch \ " SRC_URI[md5sum] = "afe11b5572c3121a781433b7c0ab741b" SRC_URI[sha256sum] = "ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2" @@ -54,7 +58,7 @@ COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' # patch 0001-memcheck-vgtests-remove-fullpath-after-flags.patch removes relative path # argument. Change expected stderr files accordingly. -do_patch_append() { +do_patch:append() { bb.build.exec_func('do_sed_paths', d) } @@ -64,23 +68,23 @@ do_sed_paths() { } # valgrind supports armv7 and above -COMPATIBLE_HOST_armv4 = 'null' -COMPATIBLE_HOST_armv5 = 'null' -COMPATIBLE_HOST_armv6 = 'null' +COMPATIBLE_HOST:armv4 = 'null' +COMPATIBLE_HOST:armv5 = 'null' +COMPATIBLE_HOST:armv6 = 'null' # valgrind fails with powerpc soft-float -COMPATIBLE_HOST_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', 'null', '.*-linux', d)}" +COMPATIBLE_HOST:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', 'null', '.*-linux', d)}" # X32 isn't supported by valgrind at this time -COMPATIBLE_HOST_linux-gnux32 = 'null' -COMPATIBLE_HOST_linux-muslx32 = 'null' +COMPATIBLE_HOST:linux-gnux32 = 'null' +COMPATIBLE_HOST:linux-muslx32 = 'null' # Disable for some MIPS variants -COMPATIBLE_HOST_mipsarchr6 = 'null' -COMPATIBLE_HOST_linux-gnun32 = 'null' +COMPATIBLE_HOST:mipsarchr6 = 'null' +COMPATIBLE_HOST:linux-gnun32 = 'null' # Disable for powerpc64 with musl -COMPATIBLE_HOST_libc-musl_powerpc64 = 'null' +COMPATIBLE_HOST:libc-musl:powerpc64 = 'null' # brokenseip is unfortunately required by ptests to pass inherit autotools-brokensep ptest multilib_header @@ -89,7 +93,7 @@ EXTRA_OECONF = "--enable-tls --without-mpicc" EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" # valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option -EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" +EXTRA_OECONF:append:arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" EXTRA_OEMAKE = "-w" @@ -101,49 +105,49 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" # which fixes build path issue in DWARF. SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" -do_configure_prepend () { +do_configure:prepend () { rm -rf ${S}/config.h sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am sed -i -e 's:$(top_builddir):$(pkglibdir)/ptest:g' ${S}/memcheck/tests/Makefile.am } -do_install_append () { +do_install:append () { install -m 644 ${B}/default.supp ${D}/${libexecdir}/valgrind/ oe_multilib_header valgrind/config.h } VALGRINDARCH ?= "${TARGET_ARCH}" -VALGRINDARCH_aarch64 = "arm64" -VALGRINDARCH_x86-64 = "amd64" -VALGRINDARCH_x86 = "x86" -VALGRINDARCH_mips = "mips32" -VALGRINDARCH_mipsel = "mips32" -VALGRINDARCH_mips64el = "mips64" -VALGRINDARCH_powerpc = "ppc" -VALGRINDARCH_powerpc64 = "ppc64" -VALGRINDARCH_powerpc64le = "ppc64le" +VALGRINDARCH:aarch64 = "arm64" +VALGRINDARCH:x86-64 = "amd64" +VALGRINDARCH:x86 = "x86" +VALGRINDARCH:mips = "mips32" +VALGRINDARCH:mipsel = "mips32" +VALGRINDARCH:mips64el = "mips64" +VALGRINDARCH:powerpc = "ppc" +VALGRINDARCH:powerpc64 = "ppc64" +VALGRINDARCH:powerpc64le = "ppc64le" INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so" -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" # valgrind needs debug information for ld.so at runtime in order to # redirect functions like strlen. -RRECOMMENDS_${PN} += "${TCLIBC}-dbg" +RRECOMMENDS:${PN} += "${TCLIBC}-dbg" -RDEPENDS_${PN}-ptest += " bash coreutils curl file \ +RDEPENDS:${PN}-ptest += " bash coreutils curl file \ gdb libgomp \ perl \ perl-module-file-basename perl-module-file-glob perl-module-getopt-long \ perl-module-overloading perl-module-cwd perl-module-ipc-open3 \ perl-module-carp perl-module-symbol \ procps sed ${PN}-dbg ${PN}-src ${TCLIBC}-src gcc-runtime-dbg" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" # One of the tests contains a bogus interpreter path on purpose. # Skip file dependency check -SKIP_FILEDEPS_${PN}-ptest = '1' -INSANE_SKIP_${PN}-ptest = "debug-deps" +SKIP_FILEDEPS:${PN}-ptest = '1' +INSANE_SKIP:${PN}-ptest = "debug-deps" do_compile_ptest() { oe_runmake check diff --git a/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index d988e1ffc..1214901b6 100644 --- a/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -18,14 +18,14 @@ CLEANBROKEN = "1" DEPENDS = "libxml2-native" -RDEPENDS_${PN} = "docbook-xml-dtd4 \ +RDEPENDS:${PN} = "docbook-xml-dtd4 \ docbook-xsl-stylesheets \ util-linux \ libxml2 \ libxslt \ bash \ " -RDEPENDS_${PN}_append_class-target = " \ +RDEPENDS:${PN}:append:class-target = " \ libxml2-utils \ libxslt-bin \ coreutils \ @@ -34,9 +34,9 @@ CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep" BBCLASSEXTEND = "native" -EXTRA_OECONF_append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" +EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog } |