Skip to contentSkip to conversation

10-June

GIT PULL Saul Wold 5 participants 14 messages Jun 10, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

Richard,

This has the contiuation of the static library work (staticdev) along with some community contribtions.

Thanks
Sau!

The following changes since commit f183c7cfe377fa6ed2777605c3590a9dda2060df:

native/nativesdk: Clean up the depends ordering after bitbake override handling updates (2011-06-09 22:48:56 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Kang Kai (1):
ghostscript: update SRC_URI

Nitin A Kamble (1):
gcc: rebase the patch to avoid patch rejection

Phil Blundell (1):
busybox: backport distro-features handling from oe master

Saul Wold (1):
multiple recipes converted to -staticdev packages

 meta/recipes-bsp/pciutils/pciutils_3.1.7.bb        |    7 +-
 .../wireless-tools/wireless-tools_29.bb            |    9 +-
 meta/recipes-core/busybox/busybox.inc              |   80 +-
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 meta/recipes-core/eglibc/eglibc-package.inc        |    8 +-
 meta/recipes-core/eglibc/eglibc_2.12.bb            |    2 +-
 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |   16 +-
 meta/recipes-core/glibc/glibc-package.inc          |    9 +-
 meta/recipes-core/glibc/glibc_2.10.1.bb            |    2 +-
 .../meta/external-csl-toolchain_2008q3-72.bb       |    8 +-
 meta/recipes-core/uclibc/uclibc.inc                |   10 +-
 meta/recipes-core/udev/udev-new.inc                |   14 +-
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |   11 +-
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    2 +-
 meta/recipes-devtools/binutils/binutils.inc        |    1 -
 meta/recipes-devtools/gcc/gcc-4.6.0.inc            |    2 +-
 ...-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch |161900 +-------------------
 meta/recipes-devtools/gcc/gcc-package-runtime.inc  |   24 +-
 meta/recipes-devtools/gcc/libgcc_4.6.0.bb          |    2 +-
 meta/recipes-devtools/opkg/opkg_0.1.8.bb           |    8 +-
 meta/recipes-devtools/opkg/opkg_svn.bb             |    8 +-
 meta/recipes-devtools/python/python_2.6.6.bb       |    2 -
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |   18 +-
 meta/recipes-extended/augeas/augeas.inc            |    4 +-
 meta/recipes-extended/augeas/augeas_0.8.1.bb       |    2 +-
 meta/recipes-extended/gamin/gamin_0.1.10.bb        |    9 +-
 .../ghostscript/ghostscript_9.02.bb                |    7 +-
 .../tcp-wrappers/tcp-wrappers_7.6.bb               |    9 +-
 meta/recipes-graphics/cairo/cairo_1.10.2.bb        |    9 +-
 meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb     |    7 +-
 meta/recipes-multimedia/liba52/liba52_0.7.4.bb     |    5 +-
 meta/recipes-support/attr/acl_2.2.51.bb            |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb           |    2 +-
 meta/recipes-support/attr/ea-acl.inc               |    8 +-
 meta/recipes-support/curl/curl_7.21.6.bb           |    8 +-
 meta/recipes-support/sqlite/sqlite3.inc            |    7 +-
 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb     |    2 +-
 38 files changed, 2605 insertions(+), 159623 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

[CONSOLIDATED PULL 1/4] ghostscript: update SRC_URI

From: Kang Kai <[email protected]>

Build ghostscript-native fails on a i686 machine because it can't get the source objarch.h and soobjarch.h, and .h files are not needed for native package, so update the SRC_URI to fix it.

---
 .../ghostscript/ghostscript_9.02.bb                |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
meta/recipes-extended/ghostscript/ghostscript_9.02.bb +5 -2
index e3d32dd..bee5684 100644
@@ -15,17 +15,20 @@ SECTION = "console/utils"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "${PN}-native tiff jpeg fontconfig cups"
 DEPENDS_virtclass-native = ""
 
-SRC_URI = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2 \
+SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
+
+SRC_URI = "${SRC_URI_BASE} \
            file://ghostscript-9.02-prevent_recompiling.patch \
            file://ghostscript-9.02-genarch.patch \
            file://objarch.h \
            file://soobjarch.h \
            "
+SRC_URI_virtclass-native = "${SRC_URI_BASE}"
 
 SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
 SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
Signature · 1 line
1.7.3.4
author
#2 lore raw

[CONSOLIDATED PULL 2/4] busybox: backport distro-features handling from oe master

In reply to Saul Wold

From: Phil Blundell <[email protected]>

This is a backport from oe master of the code which adjusts the busybox config according to DISTRO_FEATURES etc.

---
 meta/recipes-core/busybox/busybox.inc       |   80 ++++++++++++++++++++++++++-
 meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
 2 files changed, 79 insertions(+), 3 deletions(-)
meta/recipes-core/busybox/busybox.inc +78 -2
index 86fbdae..b697e88 100644
@@ -35,8 +35,85 @@ RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
 
 inherit cml1 update-rc.d
 
+# internal helper
+def busybox_cfg(feature, features, tokens, cnf, rem):
+	if type(tokens) == type(""):
+		tokens = [tokens]
+	rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens])
+	if type(features) == type([]) and feature in features:
+		cnf.extend([token + '=y' for token in tokens])
+	else:
+		cnf.extend(['# ' + token + ' is not set' for token in tokens])
+
+# Map distro and machine features to config settings
+def features_to_busybox_settings(d):
+	cnf, rem = ([], [])
+	distro_features = bb.data.getVar('DISTRO_FEATURES', d).split()
+	machine_features = bb.data.getVar('MACHINE_FEATURES', d).split()
+	busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem)
+	busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem)
+	busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
+	busybox_cfg('nls',  distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem)
+	busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
+	busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
+	busybox_cfg('kernel24', machine_features, 'CONFIG_FEATURE_2_4_MODULES', cnf, rem)
+	return "\n".join(cnf), "\n".join(rem)
+
+# X, Y = ${@features_to_uclibc_settings(d)}
+# unfortunately doesn't seem to work with bitbake, workaround:
+def features_to_busybox_conf(d):
+	cnf, rem = features_to_busybox_settings(d)
+	return cnf
+def features_to_busybox_del(d):
+	cnf, rem = features_to_busybox_settings(d)
+	return rem
+
+configmangle = '/CROSS_COMPILER_PREFIX/d; \
+		/CONFIG_EXTRA_CFLAGS/d; \
+		'
+OE_FEATURES := "${@features_to_busybox_conf(d)}"
+OE_DEL      := "${@features_to_busybox_del(d)}"
+DO_IPv4 := ${@base_contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}
+DO_IPv6 := ${@base_contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}
+
+python () {
+  if "${OE_DEL}":
+    bb.data.setVar('configmangle_append', "${OE_DEL}" + "\n", d)
+  if "${OE_FEATURES}":
+    bb.data.setVar('configmangle_append',
+                   "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
+                   ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))),
+                   d)
+  bb.data.setVar('configmangle_append',
+                 "/^### CROSS$/a\\\n%s\n" %
+                  ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
+			       "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\""
+                        ])
+                  ),
+                 d)
+}
+
+do_prepare_config () {
+	sed -e 's#@DATADIR@#${datadir}#g' \
+		< ${WORKDIR}/defconfig > ${S}/.config
+	sed -i -e '/CONFIG_STATIC/d' .config
+	echo "# CONFIG_STATIC is not set" >> .config
+	for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \
+		${S}/.config
+	sed -i -e '${configmangle}' ${S}/.config
+	if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then
+	  # disable networking applets
+	  mv ${S}/.config ${S}/.config.oe-tmp
+	  awk 'BEGIN{net=0}
+	  /^# Networking Utilities/{net=1}
+	  /^#$/{if(net){net=net+1}}
+	  {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
+		  ${S}/.config.oe-tmp > ${S}/.config
+	fi
+}
+
 do_configure () {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	do_prepare_config
 	cml1_do_configure
 }
 
@@ -184,4 +261,3 @@ pkg_prerm_${PN}-syslog () {
 	update-alternatives --remove syslog-init syslog.${PN}
 	update-alternatives --remove syslog-conf syslog.conf.${PN}
 }
-
meta/recipes-core/busybox/busybox_1.18.4.bb +1 -1
index a5080d5..a999490 100644
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
Signature · 1 line
1.7.3.4
author
#3 lore raw

[CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

In reply to Saul Wold
---
 meta/recipes-bsp/pciutils/pciutils_3.1.7.bb        |    7 ++++-
 .../wireless-tools/wireless-tools_29.bb            |    9 +++++--
 meta/recipes-core/eglibc/eglibc-package.inc        |    8 ++++--
 meta/recipes-core/eglibc/eglibc_2.12.bb            |    2 +-
 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |   16 ++++++------
 meta/recipes-core/glibc/glibc-package.inc          |    9 +++++--
 meta/recipes-core/glibc/glibc_2.10.1.bb            |    2 +-
 .../meta/external-csl-toolchain_2008q3-72.bb       |    8 ++++--
 meta/recipes-core/uclibc/uclibc.inc                |   10 +++++--
 meta/recipes-core/udev/udev-new.inc                |   14 ++++++++---
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |   11 +++++++-
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    2 +-
 meta/recipes-devtools/binutils/binutils.inc        |    1 -
 meta/recipes-devtools/gcc/gcc-4.6.0.inc            |    2 +-
 meta/recipes-devtools/gcc/gcc-package-runtime.inc  |   24 ++++++++++++++-----
 meta/recipes-devtools/gcc/libgcc_4.6.0.bb          |    2 +-
 meta/recipes-devtools/opkg/opkg_0.1.8.bb           |    8 ++++--
 meta/recipes-devtools/opkg/opkg_svn.bb             |    8 ++++--
 meta/recipes-devtools/python/python_2.6.6.bb       |    2 -
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |   18 ++++++++------
 meta/recipes-extended/augeas/augeas.inc            |    4 ++-
 meta/recipes-extended/augeas/augeas_0.8.1.bb       |    2 +-
 meta/recipes-extended/gamin/gamin_0.1.10.bb        |    9 ++++---
 .../tcp-wrappers/tcp-wrappers_7.6.bb               |    9 +++++--
 meta/recipes-graphics/cairo/cairo_1.10.2.bb        |    9 ++++---
 meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb     |    7 +----
 meta/recipes-multimedia/liba52/liba52_0.7.4.bb     |    5 ++-
 meta/recipes-support/attr/acl_2.2.51.bb            |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb           |    2 +-
 meta/recipes-support/attr/ea-acl.inc               |    8 ++++--
 meta/recipes-support/curl/curl_7.21.6.bb           |    8 ++++--
 meta/recipes-support/sqlite/sqlite3.inc            |    7 +++--
 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb     |    2 +-
 34 files changed, 146 insertions(+), 93 deletions(-)
meta/recipes-bsp/pciutils/pciutils_3.1.7.bb +5 -2
index 4e6d4e1..f2bbe99 100644
@@ -9,7 +9,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "zlib"
 RDEPENDS_${PN} = "${PN}-ids"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
            file://configure.patch \
@@ -49,9 +49,12 @@ do_install () {
 	ln -s ../sbin/lspci ${D}${bindir}/lspci
 }
 
-PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg"
+PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg libpci-staticdev"
 FILES_pciutils-ids = "${datadir}/pci.ids*"
 FILES_libpci = "${libdir}/libpci.so.*"
 FILES_libpci-dbg = "${libdir}/.debug"
 FILES_libpci-dev = "${libdir}/libpci.a ${libdir}/libpci.la ${libdir}/libpci.so \
                     ${includedir}/pci ${libdir}/pkgconfig"
+FILES_libpci-staticdev = "${libdir}/libpci.a"
+DEPENDS_libpci-staticdev = "libpci-dev (= ${EXTENDPKGV})"
+
meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb +6 -3
index 70bf91b..d5b0f98 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "base"
 PRIORITY = "optional"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
            file://man.patch;apply=yes \
@@ -41,14 +41,17 @@ do_install() {
 }
 
 PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
+libiw libiw-dev libiw-doc libiw-staticdev ifrename-doc ifrename ${PN} ${PN}-doc"
 
 FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
 FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
 FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw-dev = "${libdir}/*.so ${includedir}"
 FILES_libiw-doc = "${mandir}/man7"
+FILES_libiw-staticdev = "${libdir}/*.a"
+RDEPENDS_libiw-staticdev = "libiw-dev (= ${EXTENDPKGV})"
 FILES_ifrename = "${sbindir}/ifrename"
 FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
 FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
 FILES_${PN}-doc = "${mandir}"
+
meta/recipes-core/eglibc/eglibc-package.inc +5 -3
index 76ebdc3..dca7614 100644
@@ -37,7 +37,7 @@ USE_LDCONFIG ?= "1"
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile"
+PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils ${PN}-pic ${PN}-dev ${PN}-staticdev eglibc-doc eglibc-locale libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile"
 
 PACKAGES_DYNAMIC = " \
 		    glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \
@@ -73,6 +73,7 @@ RPROVIDES_eglibc-locale = "glibc-locale"
 RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
 RPROVIDES_eglibc-thread-db = "glibc-thread-db"
 RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
+RPROVIDES_eglibc-staticdev = "glibc-staticdev"
 RPROVIDES_eglibc-dbg = "glibc-dbg"
 libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
 
@@ -84,8 +85,9 @@ FILES_libmemusage = "${base_libdir}/libmemusage.so"
 FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "/sbin/sln"
 FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
-FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
-	${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"
+RDEPENDS_eglibc-staticdev = "eglibc-dev (= ${EXTENDPKGV})"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
 FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_eglibc-gconv = "${libdir}/gconv/*"
meta/recipes-core/eglibc/eglibc_2.12.bb +1 -1
index e69cd0f..fc2811c 100644
@@ -2,7 +2,7 @@ require eglibc.inc
 
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
-PR = "r14"
+PR = "r15"
 
 SRCREV = "11982"
 
meta/recipes-core/gettext/gettext_0.18.1.1.bb +8 -8
index 5f5f164..923880f 100644
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r0"
+PR = "r1"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat git-native"
 DEPENDS_virtclass-native = "git-native"
 PROVIDES = "virtual/libintl virtual/gettext"
@@ -50,7 +50,7 @@ acpaths = '-I ${S}/gettext-runtime/m4 \
 # 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
 # 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
 # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
-PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
+PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc"
 
 FILES_gettext-runtime = "${bindir}/gettext \
                          ${bindir}/ngettext \
@@ -62,12 +62,12 @@ FILES_gettext-runtime = "${bindir}/gettext \
 FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \
                                              ${libdir}/charset.alias \
                                            "
-FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
-                      ${includedir}/autosprintf.h \
-                     "
-FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \
-                                                 ${includedir}/libintl.h \
-                                               "
+FILES_gettext-runtime-dev += "${includedir}/autosprintf.h"
+FILES_gettext-runtime-staticdev = "${libdir}/libasprintf.a"
+FILES_gettext-runtime-dev_append_libc-uclibc = " ${includedir}/libintl.h"
+FILES_gettext-runtime-staticdev_append_libc-uclibc = " ${libdir}/libintl.a"
+RDEPENDS_gettext-runtime-staticdev = "gettext-runtime-dev (= ${EXTENDPKGV})"
+
 FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
                              ${mandir}/man1/ngettext.* \
                              ${mandir}/man1/envsubst.* \
meta/recipes-core/glibc/glibc-package.inc +6 -3
index 27dc427..b6b033d 100644
@@ -37,7 +37,7 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \
 	ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \
 	${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \
-	${PN}-pcprofile"
+	${PN}-pcprofile ${PN}-staticdev"
 
 PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \
 	glibc-binary-localedata-*"
@@ -57,8 +57,9 @@ glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
                   ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
                   ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
 glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
-                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
-                ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+                ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.o ${datadir}/aclocal"
+
+glibcstaticdev = "${libdir}/*.a ${base_libdir}/*.a"
 
 FILES_glibc = "${glibcfiles}"
 FILES_${PN} = "${glibcfiles}"
@@ -68,6 +69,8 @@ FILES_glibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "${base_sbindir}/sln"
 FILES_glibc-dev = "${glibcdevfiles}"
 FILES_${PN}-dev = "${glibcdevfiles}"
+FILES_glibc-staticdev = "${glibcstaticdev}"
+FILES_${PN}-staticdev = "${glibcstaticdev}"
 FILES_glibc-dbg = "${glibcdbgfiles}"
 FILES_${PN}-dbg = "${glibcdbgfiles}"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
meta/recipes-core/glibc/glibc_2.10.1.bb +1 -1
index 33ebe24..e76f3c0 100644
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "r6"
+PR = "r7"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb +5 -3
index f714928..99988d3 100644
@@ -18,7 +18,7 @@ PROVIDES = "\
 	virtual/linux-libc-headers "
 RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
-PR = "r1"
+PR = "r2"
 
 #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
 
@@ -42,16 +42,18 @@ GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile"
 
 inherit libc-package
 
-PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
+PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev libstdc++-staticdev linux-libc-headers"
 FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
 FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
 FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "${includedir}/c++/${PV} \
 	${libdir}/libstdc++.so \
 	${libdir}/libstdc++.la \
+	${libdir}/libsupc++.la"
+FILES_libstdc++-staticdev = " \
 	${libdir}/libstdc++.a \
-	${libdir}/libsupc++.la \
 	${libdir}/libsupc++.a"
+RDEPENDS_libstdc++-staticdev = "libstdc++-dev ( = ${EXTENDPKGV})"
 FILES_linux-libc-headers = "${includedir}/asm* \
 	${includedir}/linux \
 	${includedir}/mtd \
meta/recipes-core/uclibc/uclibc.inc +7 -3
index c1bc422..9c59084 100644
@@ -14,7 +14,7 @@ PRIORITY = "required"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 		    file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
 file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
-INC_PR = "r2"
+INC_PR = "r3"
 
 require uclibc-config.inc
 STAGINGCC = "gcc-cross-intermediate"
@@ -82,12 +82,16 @@ FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
 FILES_ldd = "${bindir}/ldd"
 FILES_uclibc-dev_append = "\
         ${libdir}/lib*.so \
-        ${libdir}/*_nonshared.a \
         ${libdir}/[S]*crt[1in].o \
         ${libdir}/crtreloc*.o \
-        ${libdir}/lib*.a \
         ${includedir}/*.h ${includedir}/*/*.h \
        "
+
+FILES_uclibc-staticdev_append = "\
+        ${libdir}/*_nonshared.a \
+        ${libdir}/lib*.a \
+       "
+
 FILES_uclibc-utils = "${bindir} ${sbindir}"
 FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
 FILES_uclibc-gconv = "${libdir}/gconv"
meta/recipes-core/udev/udev-new.inc +10 -4
index 1b94f1b..7492bc4 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
+INC_PR = "r3"
+
 DEPENDS = "acl glib-2.0 libusb usbutils pciutils linux-libc-headers gperf-native libxslt-native"
 RPROVIDES_${PN} = "hotplug"
 RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
@@ -35,8 +37,8 @@ libexecdir = "${base_libdir}/udev"
 EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
                 --with-pci-ids-path=${datadir}/pci.ids"
 
-PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
-PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
+PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg libudev-staticdev"
+PACKAGES =+ "libgudev libgudev-dev libgudev-dbg libgudev-staticdev"
 
 INITSCRIPT_PACKAGES = "udev udev-cache"
 INITSCRIPT_NAME_udev = "udev"
@@ -50,11 +52,15 @@ FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
 FILES_libudev = "${base_libdir}/libudev.so.*"
 FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
 FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
-                     ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
+                     ${libdir}/pkgconfig/libudev.pc"
+FILES_libudev-staticdev = "${libdir}/libudev.a"
+RDEPENDS_libudev-staticdev = "libudev-dev (= ${EXTENDPKGV})"
 FILES_libgudev = "${libdir}/libgudev*.so.*"
 FILES_libgudev-dbg = "${libdir}/.debug/libgudev*.so.*"
 FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
-                     ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
+                     ${libdir}/pkgconfig/gudev*.pc"
+FILES_libgudev-staticdev = "${libdir}/libgudev.a"
+RDEPENDS_libgudev-staticdev = "libgudev-dev (= ${EXTENDPKGV})"
 FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
 
 do_install_append () {
meta/recipes-core/udev/udev_164.bb +1 -1
index 76fd907..bee0bad 100644
@@ -1,6 +1,6 @@
 include udev-new.inc
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
 SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
meta/recipes-core/util-linux/util-linux.inc +9 -2
index b77266a..ed4bcdb 100644
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                     file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
+INC_PR = "r0"
+
 inherit autotools gettext pkgconfig
 DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native = " lzo-native"
@@ -28,7 +30,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-
 PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
              util-linux-swaponoff util-linux-losetup util-linux-umount \
              util-linux-mount util-linux-readprofile util-linux-libblkid \
-             util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
+             util-linux-libblkid-dev util-linux-libblkid-staticdev \
+             util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticdev \
              util-linux-uuidgen util-linux-lscpu"
 
 EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
@@ -50,8 +53,12 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen"
 
 FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
 FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
+FILES_util-linux-libblkid-staticdev = "${libdir}/libblkid.a"
+RDEPENDS_util-linux-libblkid-staticdev = "util-linux-libblkid-dev (= ${EXTENDPKGV})"
 FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
+RDEPENDS_util-linux-libuuid-staticdev = "util-linux-libuuid-dev (= ${EXTENDPKGV})"
 FILES_util-linux-lscpu = "${bindir}/lscpu"
 
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
meta/recipes-core/util-linux/util-linux_2.19.1.bb +1 -1
index 132f28b..3c5747c 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r1"
+PR = "${INC_PR}.0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
meta/recipes-devtools/binutils/binutils.inc +0 -1
index 08c14b2..82d9511 100644
@@ -24,7 +24,6 @@ FILES_${PN} = " \
 
 FILES_${PN}-dev = " \
 	${includedir} \
-	${libdir}/*.a \
 	${libdir}/*.la \
 	${libdir}/libbfd.so \
 	${libdir}/libopcodes.so"
meta/recipes-devtools/gcc/gcc-4.6.0.inc +1 -1
index cb9eb8e..5db6fda 100644
@@ -7,7 +7,7 @@ require gcc-common.inc
 
 require gcc-4_6-branch-backports.inc
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS =+ "mpfr gmp libmpc"
 NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native"
meta/recipes-devtools/gcc/gcc-package-runtime.inc +17 -7
index 51483f9..0109518 100644
@@ -3,14 +3,19 @@ PACKAGES = "\
   libstdc++ \
   libstdc++-precompile-dev \
   libstdc++-dev \
+  libstdc++-staticdev \
   libg2c \
   libg2c-dev \
+  libg2c-staticdev \
   libssp \
   libssp-dev \
+  libssp-staticdev \
   libgfortran \
   libgfortran-dev \
+  libgfortran-staticdev \
   libmudflap \
   libmudflap-dev \
+  libmudflap-staticdev \
 "
 # The base package doesn't exist, so we clear the recommends.
 RRECOMMENDS_${PN}-dbg = ""
@@ -23,36 +28,41 @@ FILES_${PN}-dbg += "\
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
 FILES_libg2c-dev = "\
   ${libdir}/libg2c.so \
+FILES_libg2c-staticdev = "\
   ${libdir}/libg2c.a \
   ${libdir}/libfrtbegin.a"
-
+DEPENDS_libg2c-staticdev = "libg2c-dev (= ${EXTENDPKGV})"
 FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "\
   ${includedir}/c++/ \
   ${libdir}/libstdc++.so \
   ${libdir}/libstdc++.la \
-  ${libdir}/libstdc++.a \
   ${libdir}/libsupc++.la \
+FILES_libstdc++-staticdev = " \
+  ${libdir}/libstdc++.a \
   ${libdir}/libsupc++.a"
+DEPENDS_libstdc++-staticdev = "libstdc++-dev (= ${EXTENDPKGV})"
 
 FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
 
 FILES_libssp = "${libdir}/libssp.so.*"
 FILES_libssp-dev = " \
   ${libdir}/libssp*.so \
-  ${libdir}/libssp*.a \
   ${libdir}/libssp*.la \
   ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp"
+FILES_libssp-staticdev = "${libdir}/libssp*.a"
+DEPENDS_libssp-staticdev = "libssp-dev (= ${EXTENDPKGV})"
 
 FILES_libgfortran = "${libdir}/libgfortran.so.*"
-FILES_libgfortran-dev = " \
+FILES_libgfortran-dev = "${libdir}/libgfortran.so"
+FILES_libgfortran-staticdev = " \
   ${libdir}/libgfortran.a \
-  ${libdir}/libgfortran.so \
   ${libdir}/libgfortranbegin.a"
+DEPENDS_libfortran-staticdev = "libfortran-dev (= ${EXTENDPKGV})"
 
 FILES_libmudflap = "${libdir}/libmudflap*.so.*"
 FILES_libmudflap-dev = "\
   ${libdir}/libmudflap*.so \
-  ${libdir}/libmudflap*.a \
   ${libdir}/libmudflap*.la"
-
+FILES_libmudflap-staticdev = "${libdir}/libmudflap*.a"
+DEPENDS_libmudflap-staticdev = "libmudflap-dev (= ${EXTENDPKGV})"
meta/recipes-devtools/gcc/libgcc_4.6.0.bb +1 -1
index b6cf268..3f7ce0a 100644
@@ -1,6 +1,6 @@
 require gcc-${PV}.inc
 
-PR = "r0"
+PR = "r1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
meta/recipes-devtools/opkg/opkg_0.1.8.bb +5 -3
index 18cf042..710a61f 100644
@@ -13,13 +13,15 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
            file://headerfix.patch \
 "
 
-PR = "r4"
+PR = "r5"
 
-PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
+PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
 
 FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
-FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
 FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
+FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so"
+FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a"
+RDEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})"
 
 # We need to create the lock directory
 do_install_append() {
meta/recipes-devtools/opkg/opkg_svn.bb +5 -3
index 5f07c17..934700f 100644
@@ -17,12 +17,14 @@ S = "${WORKDIR}/trunk"
 
 SRCREV = "609"
 PV = "0.1.8+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
-PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
+PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
 
 FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
-FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so"
+FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a"
+DEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})"
 FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
 
 # We need to create the lock directory
meta/recipes-devtools/python/python_2.6.6.bb +0 -2
index 24f1d33..db0e151 100644
@@ -121,10 +121,8 @@ FILES_${PN}-dev = "\
   ${includedir} \
   ${libdir}/lib*${SOLIBSDEV} \
   ${libdir}/*.la \
-  ${libdir}/*.a \
   ${libdir}/*.o \
   ${libdir}/pkgconfig \
-  ${base_libdir}/*.a \
   ${base_libdir}/*.o \
   ${datadir}/aclocal \
   ${datadir}/pkgconfig \
meta/recipes-devtools/rpm/rpm_5.4.0.bb +10 -8
index 0c88f91..344c1a3 100644
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = ""
-PR = "r17"
+PR = "r18"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...
@@ -166,7 +166,7 @@ EXTRA_OECONF = "--verbose \
 
 CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
 
 SOLIBS = "5.4.so"
 
@@ -301,26 +301,28 @@ FILES_perl-module-rpm-dev = "${prefix}/share/man/man3/RPM* \
 		"
 
 FILE_${PN}-dev = "${includedir}/rpm \
-		${libdir}/librpm.a \
 		${libdir}/librpm.la \
 		${libdir}/librpm.so \
-		${libdir}/librpmconstant.a \
 		${libdir}/librpmconstant.la \
 		${libdir}/librpmconstant.so \
-		${libdir}/librpmdb.a \
 		${libdir}/librpmdb.la \
 		${libdir}/librpmdb.so \
-		${libdir}/librpmio.a \
 		${libdir}/librpmio.la \
 		${libdir}/librpmio.so \
-		${libdir}/librpmmisc.a \
 		${libdir}/librpmmisc.la \
 		${libdir}/librpmmisc.so \
-		${libdir}/librpmbuild.a \
 		${libdir}/librpmbuild.la \
 		${libdir}/librpmbuild.so \
 		${libdir}/pkgconfig/rpm.pc \
 		"
+FILE_${PN}-staticdev = " \
+		${libdir}/librpm.a \
+		${libdir}/librpmconstant.a \
+		${libdir}/librpmdb.a \
+		${libdir}/librpmio.a \
+		${libdir}/librpmmisc.a \
+		${libdir}/librpmbuild.a \
+                "
 
 ###%{_rpmhome}/lib/libxar.a
 ###%{_rpmhome}/lib/libxar.la
meta/recipes-extended/augeas/augeas.inc +3 -1
index 619cd20..8370340 100644
@@ -15,8 +15,10 @@ PACKAGES =+ "${PN}-lenses lib${PN} lib${PN}-dev lib${PN}-dbg"
 
 FILES_${PN}-lenses = "${datadir}/augeas/lenses"
 FILES_lib${PN} = "${libdir}/*.so.*"
-FILES_lib${PN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
+FILES_lib${PN}-dev = "${libdir}/*.so ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
 FILES_lib${PN}-dbg = "${libdir}/.debug"
+FILES_lib${PN}-staticdev = "${libdir}/*.a"
+RDEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"
 
 RDEPENDS_lib${PN} += "${PN}-lenses"
 RRECOMMENDS_lib${PN} += "${PN}"
meta/recipes-extended/augeas/augeas_0.8.1.bb +1 -1
index 51eeb33..ee45098 100644
@@ -1,6 +1,6 @@
 require augeas.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "62d47bdc60e175f93aed3b81cb8e2785"
 SRC_URI[sha256sum] = "916fef67e8eed6d1abe02433830301bd01dfc8228e9cfffb490347545155c4d7"
meta/recipes-extended/gamin/gamin_0.1.10.bb +5 -4
index b6394d2..d901f5b 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62"
 
 DEPENDS = "glib-2.0"
 PROVIDES = "fam"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
            file://no-abstract-sockets.patch"
@@ -20,15 +20,16 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--without-python"
 
-PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg"
+PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg lib${PN}-staticdev"
 FILES_${PN} = "${libexecdir}"
 FILES_${PN}-dbg = "${libexecdir}/.debug"
 FILES_lib${PN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
-                      ${libdir}/lib*.a ${libdir}/lib*.so"
+FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la ${libdir}/lib*.so"
 FILES_lib${PN}-dbg = "${libdir}/.debug/"
+FILES_lib${PN}-staticdev = "${libdir}/lib*.a"
 
 RDEPENDS_lib${PN} = "${PN}"
+RDEPENDS_lib${PN}-staticdev = "lib${PN}-dev ( = ${EXTENDPKGV})"
 
 LEAD_SONAME = "libgamin-1.so"
 
meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +6 -3
index d5e334e..f3b8576 100644
@@ -6,13 +6,16 @@ SECTION = "console/network"
 
 LICENSE = "tcp-wrappers"
 LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa"
-PR ="r0"
+PR ="r1"
 
 
-PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
+PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev \
+            tcp-wrappers tcp-wrappers-doc"
 FILES_libwrap = "${base_libdir}/lib*.so.*"
 FILES_libwrap-doc = "${mandir}/man3 ${mandir}/man5"
-FILES_libwrap-dev = "${libdir}/lib*.so ${libdir}/lib*.a ${includedir}"
+FILES_libwrap-dev = "${libdir}/lib*.so ${includedir}"
+FILES_libwrap-staticdev = "${libdir}/lib*.a"
+RDEPENDS_libwrap-staticdev = "libwrap-dev (= ${EXTENDPKGV})"
 FILES_tcp-wrappers = "${bindir}"
 FILES_tcp-wrappers-doc = "${mandir}/man8"
 
meta/recipes-graphics/cairo/cairo_1.10.2.bb +5 -4
index 572e1f6..a54412c 100644
@@ -2,7 +2,7 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
@@ -19,7 +19,7 @@ ALLOW_EMPTY = "1"
 # debian_package_name_hook. To keep backword compatibility,
 # it is necessary to explicitly name the package as libcairo2 here
 #
-PACKAGES =+ "libcairo2 libcairo2-dev libcairo2-dbg \
+PACKAGES =+ "libcairo2 libcairo2-dev libcairo2-dbg libcairo2-staticdev \
 		     libcairo-gobject2 \
 			 libcairo-script-interpreter2 \
 		     cairo-perf-utils \
@@ -45,9 +45,10 @@ to replay rendering."
 DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
 
 FILES_libcairo2 = "${libdir}/libcairo.so*"
-FILES_libcairo2-dev = "${includedir} ${libdir}/*.la ${libdir}/*.a \
-					   ${libdir}/*.o ${libdir}/pkgconfig"
+FILES_libcairo2-dev = "${includedir} ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig"
 FILES_libcairo2-dbg = "${libdir}/.debug ${libdir}/cairo/.debug"
+FILES_libcairo2-staticdev = "${libdir}/*.a"
+RDEPENDS_libcairo2-staticdev = "libcairo2-dev ( = ${EXTENDPKGV})"
 FILES_libcairo-gobject2 = "${libdir}/libcairo-gobject.so*"
 FILES_libcairo-script-interpreter2 = "${libdir}/libcairo-script-interpreter.so*"
 FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.*"
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb +2 -5
index 1a56702..997db3e 100644
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
 DEPENDS += "libxrender freetype fontconfig"
 PROVIDES = "xft"
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXft"
@@ -28,10 +28,7 @@ python () {
             bb.data.setVar('PKG_${PN}', 'libxft2', d)
 }
 
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}"
+FILES_${PN}-dev += "${bindir} ${sbindir}"
 
 SRC_URI[md5sum] = "cce3c327258116493b753f157e0360c7"
 SRC_URI[sha256sum] = "c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2"
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +3 -2
index 239c30a..87042e1 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 			file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1"
 SECTION = "libs"
 PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 
@@ -21,7 +21,8 @@ EXTRA_OECONF = " --enable-shared "
 PACKAGES =+ "a52dec a52dec-dbg a52dec-doc"
 
 FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " 
-FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
+#FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la "
+#FILES_${PN}-staticdev = " ${libdir}/liba52.a "
 FILES_${PN}-dbg = " ${libdir}/.debug/*"
 FILES_a52dec = " ${bindir}/* "
 FILES_a52dec-dbg = " ${bindir}/.debug/* "
meta/recipes-support/attr/acl_2.2.51.bb +1 -1
index 301d44a..18aac7c 100644
@@ -1,6 +1,6 @@
 require acl.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
meta/recipes-support/attr/attr_2.4.46.bb +1 -1
index 9fef41b..fe8ab79 100644
@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
meta/recipes-support/attr/ea-acl.inc +5 -3
index afe2f1c..ed03b66 100644
@@ -16,17 +16,19 @@ do_install () {
 	oe_runmake install install-lib install-dev DIST_ROOT="${D}"
 }
 
-PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc"
+PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc lib${PN}-staticdev"
 
 FILES_lib${PN} = "${base_libdir}/lib*.so.*"
 
 FILES_lib${PN}-dev = "${includedir} \
                       ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
                       ${libdir}/lib*.la \
                       ${base_libdir}/lib*.so \
-                      ${base_libdir}/lib*.a \
                       ${base_libdir}/lib*.la"
+FILES_lib${PN}-staticdev = " \
+                      ${libdir}/lib*.a \
+                      ${base_libdir}/lib*.a"
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"
 
 FILES_lib${PN}-doc = "${mandir}/man2 \
                       ${mandir}/man3"
meta/recipes-support/curl/curl_7.21.6.bb +5 -3
index 51e14f9..17da8fe 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
 DEPENDS = "zlib gnutls"
 DEPENDS_virtclass-native = "zlib-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
@@ -36,7 +36,7 @@ do_configure_prepend() {
 	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
 }
 
-PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+PACKAGES += "${PN}-certs lib${PN} lib${PN}-dev lib${PN}-staticdev lib${PN}-doc"
 
 FILES_${PN} = "${bindir}/curl"
 
@@ -49,12 +49,14 @@ FILES_lib${PN} = "${libdir}/lib*.so.*"
 RRECOMMENDS_lib${PN} += "${PN}-certs"
 FILES_lib${PN}-dev = "${includedir} \
                       ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
                       ${libdir}/lib*.la \
                       ${libdir}/pkgconfig \
                       ${datadir}/aclocal \
                       ${bindir}/*-config"
 
+FILES_lib${PN}-staticdev = "${libdir}/lib*.a"
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"
+
 FILES_lib${PN}-doc = "${mandir}/man3 \
                       ${mandir}/man1/curl-config.1"
 
meta/recipes-support/sqlite/sqlite3.inc +4 -3
index 939df14..9c2b365 100644
@@ -18,11 +18,12 @@ export config_TARGET_LINK = "${CCLD}"
 export config_TARGET_CFLAGS = "${CFLAGS}"
 export config_TARGET_LFLAGS = "${LDFLAGS}"
 
-PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg"
+PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg lib${PN}-staticdev"
 FILES_${PN} = "${bindir}/*"
 FILES_lib${PN} = "${libdir}/*.so.*"
-FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
-		       ${libdir}/pkgconfig ${includedir}"
+FILES_lib${PN}-dev = "${libdir}/*.la ${libdir}/*.so ${libdir}/pkgconfig ${includedir}"
+FILES_lib${PN}-staticdev = "${libdir}/*.a"
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"
 FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
 AUTO_LIBNAME_PKGS = "lib${PN}"
 
meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb +1 -1
index 34d1653..a82a944 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b357
 
 SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz"
 S = "${WORKDIR}/sqlite-autoconf-3070602"
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "f16c08617968b4087b3d591fd575f59f"
 SRC_URI[sha256sum] = "53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81"
Signature · 1 line
1.7.3.4
#4 lore raw

Re: [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

Quoted 1 line · Saul Wold

+DEPENDS_libpci-staticdev = "libpci-dev (= ${EXTENDPKGV})"

This can't be right. I guess that would be a good thing for recipe-sanity to test for in fact.

meta/recipes-core/eglibc/eglibc-package.inc FILES_libmemusage = "${base_libdir}/libmemusage.so" · line 89

Quoted 2 lines
meta/recipes-core/eglibc/eglibc-package.inc +2 -0
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"

You need to make sure that libc_nonshared.a goes into -dev rather than -staticdev somehow. I didn't immediately spot any mechanism which would do this, though I haven't tested the package to find out what happens.

meta/recipes-core/uclibc/uclibc.inc FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ · line 92

Quoted 3 lines
meta/recipes-core/uclibc/uclibc.inc +3 -0
+FILES_uclibc-staticdev_append = "\
+        ${libdir}/*_nonshared.a \
+        ${libdir}/lib*.a \

In similar vein, this doesn't look right.

Quoted 15 lines
meta/recipes-core/util-linux/util-linux.inc +2 -0
index b77266a..ed4bcdb 100644
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                     file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
+INC_PR = "r0"
+
meta/recipes-core/util-linux/util-linux_2.19.1.bb +0 -0
index 132f28b..3c5747c 100644

meta/recipes-core/util-linux/util-linux_2.19.1.bb line 2

Quoted 3 lines
meta/recipes-core/util-linux/util-linux_2.19.1.bb +1 -1
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r1"
+PR = "${INC_PR}.0"

This looks like it will cause PR to go backwards.

Quoted 8 lines
meta/recipes-core/util-linux/util-linux_2.19.1.bb +0 -0
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
meta/recipes-devtools/binutils/binutils.inc +0 -0
index 08c14b2..82d9511 100644

meta/recipes-devtools/binutils/binutils.inc FILES_${PN} = " \ · line 29

Quoted 7 lines
meta/recipes-devtools/binutils/binutils.inc +0 -1
@@ -24,7 +24,6 @@ FILES_${PN} = " \
 
 FILES_${PN}-dev = " \
 	${includedir} \
-	${libdir}/*.a \
 	${libdir}/*.la \
 	${libdir}/libbfd.so \
 	${libdir}/libopcodes.so"

This one is a bit odd: it seems to just be dropping the .a files altogether without introducing a -staticdev package for them.

meta/recipes-devtools/binutils/binutils.inc

Quoted 6 lines
meta/recipes-devtools/binutils/binutils.inc +6 -0
+DEPENDS_libg2c-staticdev = "libg2c-dev (= ${EXTENDPKGV})"
+DEPENDS_libstdc++-staticdev = "libstdc++-dev (= ${EXTENDPKGV})"
+DEPENDS_libssp-staticdev = "libssp-dev (= ${EXTENDPKGV})"
+DEPENDS_libfortran-staticdev = "libfortran-dev (= ${EXTENDPKGV})"
+DEPENDS_libmudflap-staticdev = "libmudflap-dev (= ${EXTENDPKGV})"
+DEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})"

Those all look wrong.

Quoted 12 lines
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 			file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1"
 SECTION = "libs"
 PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 25

Quoted 6 lines
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +2 -1
@@ -21,7 +21,8 @@ EXTRA_OECONF = " --enable-shared "
 PACKAGES =+ "a52dec a52dec-dbg a52dec-doc"
 
 FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " 
-FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
+#FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la "
+#FILES_${PN}-staticdev = " ${libdir}/liba52.a "

This is a bit weird. What's going on here?

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 26

Quoted 1 line
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +1 -0
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"

As above.

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 27

Quoted 1 line
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +1 -0
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"

Ditto.

All in all I think this patch needs a bit more work. It was quite a big diff so I only skimmed it rather than reviewing it thoroughly but I don't think it is quite ready to go in yet. Also, can't a lot of this be done in bitbake.conf without quite so much recipe patching?

p.

#5 lore raw

Re: [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

Quoted 2 lines · Phil Blundell

This can't be right. I guess that would be a good thing for recipe-sanity to test for in fact.

... except that this wouldn't have helped because oe-core doesn't currently have recipe_sanity at all. Heh. I'll send a patch for that later, and then maybe we can add the bogus DEPENDS checking as a future enhancement.

p.

author
#6 lore raw

Re: [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

In reply to Phil Blundell
Quoted 6 lines · Phil Blundell
Quoted 1 line · Saul Wold

+DEPENDS_libpci-staticdev = "libpci-dev (= ${EXTENDPKGV})"

This can't be right. I guess that would be a good thing for recipe-sanity to test for in fact.

It's not, I did not catch the cut and paste error on the RDEPENDS vs DEPENDS.

Quoted 7 lines

meta/recipes-core/eglibc/eglibc-package.inc FILES_libmemusage = "${base_libdir}/libmemusage.so" · line 89

Quoted 2 lines
meta/recipes-core/eglibc/eglibc-package.inc +2 -0
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"

You need to make sure that libc_nonshared.a goes into -dev rather than -staticdev somehow. I didn't immediately spot any mechanism which would do this, though I haven't tested the package to find out what happens.

Quoted 6 lines

meta/recipes-core/uclibc/uclibc.inc FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ · line 92

Quoted 3 lines
meta/recipes-core/uclibc/uclibc.inc +3 -0
+FILES_uclibc-staticdev_append = "\
+        ${libdir}/*_nonshared.a \
+        ${libdir}/lib*.a \

In similar vein, this doesn't look right.

I think I should be able to remove nonshared from a list.

Quoted 30 lines
Quoted 15 lines
meta/recipes-core/util-linux/util-linux.inc +2 -0
index b77266a..ed4bcdb 100644
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
                      file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                      file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
+INC_PR = "r0"
+
meta/recipes-core/util-linux/util-linux_2.19.1.bb +0 -0
index 132f28b..3c5747c 100644

meta/recipes-core/util-linux/util-linux_2.19.1.bb line 2

Quoted 3 lines
meta/recipes-core/util-linux/util-linux_2.19.1.bb +1 -1
@@ -1,5 +1,5 @@
  MAJOR_VERSION = "2.19"
-PR = "r1"
+PR = "${INC_PR}.0"

This looks like it will cause PR to go backwards.

Quoted 9 lines
meta/recipes-core/util-linux/util-linux_2.19.1.bb +0 -0
  require util-linux.inc
 
  # note that `lscpu' is under GPLv3+
meta/recipes-devtools/binutils/binutils.inc +0 -0
index 08c14b2..82d9511 100644
@@ -24,7 +24,6 @@ FILES_${PN} = " \
 
Quoted 10 lines

meta/recipes-devtools/binutils/binutils.inc FILES_${PN} = " \ · line 29

Quoted 6 lines
meta/recipes-devtools/binutils/binutils.inc +0 -1
  FILES_${PN}-dev = " \
  	${includedir} \
-	${libdir}/*.a \
  	${libdir}/*.la \
  	${libdir}/libbfd.so \
  	${libdir}/libopcodes.so"

This one is a bit odd: it seems to just be dropping the .a files altogether without introducing a -staticdev package for them.

I thought that maybe the default rule provided in bitbake.conf should accomplish this since it is FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"

Quoted 9 lines

meta/recipes-devtools/binutils/binutils.inc

Quoted 6 lines
meta/recipes-devtools/binutils/binutils.inc +6 -0
+DEPENDS_libg2c-staticdev = "libg2c-dev (= ${EXTENDPKGV})"
+DEPENDS_libstdc++-staticdev = "libstdc++-dev (= ${EXTENDPKGV})"
+DEPENDS_libssp-staticdev = "libssp-dev (= ${EXTENDPKGV})"
+DEPENDS_libfortran-staticdev = "libfortran-dev (= ${EXTENDPKGV})"
+DEPENDS_libmudflap-staticdev = "libmudflap-dev (= ${EXTENDPKGV})"
+DEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})"

Those all look wrong.

Cut and paste issue

Quoted 14 lines
Quoted 14 lines
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
  			file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1"
  SECTION = "libs"
  PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
 
  inherit autotools
 
@@ -21,7 +21,8 @@ EXTRA_OECONF = " --enable-shared "
  PACKAGES =+ "a52dec a52dec-dbg a52dec-doc"
 
Quoted 7 lines

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 25

Quoted 4 lines
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +2 -1
  FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 "
-FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
+#FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la "
+#FILES_${PN}-staticdev = " ${libdir}/liba52.a "

This is a bit weird. What's going on here?

As above, trying to ensure that the default bitbake.conf rules would work.

Quoted 4 lines

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 26

Quoted 1 line
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +1 -0
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"

As above.

Quoted 9 lines

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 27

Quoted 1 line
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +1 -0
+DEPENDS_lib${PN}-staticdev = "lib${PN}-dev (= ${EXTENDPKGV})"

Ditto.

All in all I think this patch needs a bit more work. It was quite a big diff so I only skimmed it rather than reviewing it thoroughly but I don't think it is quite ready to go in yet. Also, can't a lot of this be done in bitbake.conf without quite so much recipe patching?

Most of it is done there, I was looking at adding a staticdev.bbclass that would handle the lib${PN} case generically, as a second phase of this.

Quoted 9 lines

p.

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#7 lore raw

Re: [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

Quoted 7 lines · Saul Wold
Quoted 7 lines

meta/recipes-core/eglibc/eglibc-package.inc FILES_libmemusage = "${base_libdir}/libmemusage.so" · line 89

Quoted 2 lines
meta/recipes-core/eglibc/eglibc-package.inc +2 -0
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"

You need to make sure that libc_nonshared.a goes into -dev rather than -staticdev somehow. I didn't immediately spot any mechanism which would do this, though I haven't tested the package to find out what happens.

Quoted 7 lines
Quoted 6 lines

meta/recipes-core/uclibc/uclibc.inc FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ · line 92

Quoted 3 lines
meta/recipes-core/uclibc/uclibc.inc +3 -0
+FILES_uclibc-staticdev_append = "\
+        ${libdir}/*_nonshared.a \
+        ${libdir}/lib*.a \

In similar vein, this doesn't look right.

I think I should be able to remove nonshared from a list.

I'm not entirely sure I understand what you said there. Just to be totally clear, for eglibc and glibc at least (and I imagine uclibc too), libc_nonshared.a needs to go into the -dev package and not -staticdev. So I don't think it should ever be appearing in a FILES...staticdev list.

Quoted 6 lines
Quoted 3 lines

This one is a bit odd: it seems to just be dropping the .a files altogether without introducing a -staticdev package for them.

I thought that maybe the default rule provided in bitbake.conf should accomplish this since it is FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"

Ah yes, right.

Quoted 6 lines
Quoted 5 lines

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 25

Quoted 2 lines
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +2 -0
+#FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la "
+#FILES_${PN}-staticdev = " ${libdir}/liba52.a "

This is a bit weird. What's going on here?

As above, trying to ensure that the default bitbake.conf rules would work.

Okay, fair enough. But in that case please don't leave the old bits commented out.

Quoted 7 lines
Quoted 5 lines

All in all I think this patch needs a bit more work. It was quite a big diff so I only skimmed it rather than reviewing it thoroughly but I don't think it is quite ready to go in yet. Also, can't a lot of this be done in bitbake.conf without quite so much recipe patching?

Most of it is done there, I was looking at adding a staticdev.bbclass that would handle the lib${PN} case generically, as a second phase of this.

Can the RDEPENDS_${PN}-staticdev not go in bitbake.conf? That would avoid all these cut and paste errors that seem to be plaguing that particular area.

p.

author
#8 lore raw

Re: [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

Quoted 14 lines · Phil Blundell
Quoted 13 lines · Saul Wold
Quoted 13 lines

meta/recipes-core/eglibc/eglibc-package.inc FILES_libmemusage = "${base_libdir}/libmemusage.so" · line 89

Quoted 2 lines
meta/recipes-core/eglibc/eglibc-package.inc +2 -0
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"

You need to make sure that libc_nonshared.a goes into -dev rather than -staticdev somehow. I didn't immediately spot any mechanism which would do this, though I haven't tested the package to find out what happens.

meta/recipes-core/uclibc/uclibc.inc FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ · line 92

Quoted 3 lines
meta/recipes-core/uclibc/uclibc.inc +3 -0
+FILES_uclibc-staticdev_append = "\
+        ${libdir}/*_nonshared.a \
+        ${libdir}/lib*.a \

In similar vein, this doesn't look right.

Quoted 8 lines
Quoted 1 line

I think I should be able to remove nonshared from a list.

I'm not entirely sure I understand what you said there. Just to be totally clear, for eglibc and glibc at least (and I imagine uclibc too), libc_nonshared.a needs to go into the -dev package and not -staticdev. So I don't think it should ever be appearing in a FILES...staticdev list.

I understand that, Khem also mentioned it. It a matter of doing some python RE stuff to drop them from the -staticdev list.

Quoted 14 lines
Quoted 6 lines
Quoted 3 lines

This one is a bit odd: it seems to just be dropping the .a files altogether without introducing a -staticdev package for them.

I thought that maybe the default rule provided in bitbake.conf should accomplish this since it is FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"

Ah yes, right.

Quoted 5 lines
Quoted 5 lines

meta/recipes-multimedia/liba52/liba52_0.7.4.bb EXTRA_OECONF = " --enable-shared " · line 25

Quoted 2 lines
meta/recipes-multimedia/liba52/liba52_0.7.4.bb +2 -0
+#FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la "
+#FILES_${PN}-staticdev = " ${libdir}/liba52.a "

This is a bit weird. What's going on here?

Quoted 5 lines
Quoted 1 line

As above, trying to ensure that the default bitbake.conf rules would work.

Okay, fair enough. But in that case please don't leave the old bits commented out.

Right, that was a goof on my part.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

All in all I think this patch needs a bit more work. It was quite a big diff so I only skimmed it rather than reviewing it thoroughly but I don't think it is quite ready to go in yet. Also, can't a lot of this be done in bitbake.conf without quite so much recipe patching?

Quoted 7 lines
Quoted 2 lines

Most of it is done there, I was looking at adding a staticdev.bbclass that would handle the lib${PN} case generically, as a second phase of this.

Can the RDEPENDS_${PN}-staticdev not go in bitbake.conf? That would avoid all these cut and paste errors that seem to be plaguing that particular area.

Arealy in bitbake.conf, it's the RDEPENDS_lib${PN}-staticdev (note the 'lib' prefix), this is special for a hand full, if I can set up the inherit than it done that way.

Quoted 4 lines

p.

#9 lore raw

Re: [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages

In reply to Saul Wold
Quoted 285 lines · Saul Wold
---
 meta/recipes-bsp/pciutils/pciutils_3.1.7.bb        |    7 ++++-
 .../wireless-tools/wireless-tools_29.bb            |    9 +++++--
 meta/recipes-core/eglibc/eglibc-package.inc        |    8 ++++--
 meta/recipes-core/eglibc/eglibc_2.12.bb            |    2 +-
 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |   16 ++++++------
 meta/recipes-core/glibc/glibc-package.inc          |    9 +++++--
 meta/recipes-core/glibc/glibc_2.10.1.bb            |    2 +-
 .../meta/external-csl-toolchain_2008q3-72.bb       |    8 ++++--
 meta/recipes-core/uclibc/uclibc.inc                |   10 +++++--
 meta/recipes-core/udev/udev-new.inc                |   14 ++++++++---
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |   11 +++++++-
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    2 +-
 meta/recipes-devtools/binutils/binutils.inc        |    1 -
 meta/recipes-devtools/gcc/gcc-4.6.0.inc            |    2 +-
 meta/recipes-devtools/gcc/gcc-package-runtime.inc  |   24 ++++++++++++++-----
 meta/recipes-devtools/gcc/libgcc_4.6.0.bb          |    2 +-
 meta/recipes-devtools/opkg/opkg_0.1.8.bb           |    8 ++++--
 meta/recipes-devtools/opkg/opkg_svn.bb             |    8 ++++--
 meta/recipes-devtools/python/python_2.6.6.bb       |    2 -
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |   18 ++++++++------
 meta/recipes-extended/augeas/augeas.inc            |    4 ++-
 meta/recipes-extended/augeas/augeas_0.8.1.bb       |    2 +-
 meta/recipes-extended/gamin/gamin_0.1.10.bb        |    9 ++++---
 .../tcp-wrappers/tcp-wrappers_7.6.bb               |    9 +++++--
 meta/recipes-graphics/cairo/cairo_1.10.2.bb        |    9 ++++---
 meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb     |    7 +----
 meta/recipes-multimedia/liba52/liba52_0.7.4.bb     |    5 ++-
 meta/recipes-support/attr/acl_2.2.51.bb            |    2 +-
 meta/recipes-support/attr/attr_2.4.46.bb           |    2 +-
 meta/recipes-support/attr/ea-acl.inc               |    8 ++++--
 meta/recipes-support/curl/curl_7.21.6.bb           |    8 ++++--
 meta/recipes-support/sqlite/sqlite3.inc            |    7 +++--
 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb     |    2 +-
 34 files changed, 146 insertions(+), 93 deletions(-)
meta/recipes-bsp/pciutils/pciutils_3.1.7.bb +5 -2
index 4e6d4e1..f2bbe99 100644
@@ -9,7 +9,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "zlib"
 RDEPENDS_${PN} = "${PN}-ids"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
            file://configure.patch \
@@ -49,9 +49,12 @@ do_install () {
 	ln -s ../sbin/lspci ${D}${bindir}/lspci
 }
 
-PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg"
+PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg libpci-staticdev"
 FILES_pciutils-ids = "${datadir}/pci.ids*"
 FILES_libpci = "${libdir}/libpci.so.*"
 FILES_libpci-dbg = "${libdir}/.debug"
 FILES_libpci-dev = "${libdir}/libpci.a ${libdir}/libpci.la ${libdir}/libpci.so \
                     ${includedir}/pci ${libdir}/pkgconfig"
+FILES_libpci-staticdev = "${libdir}/libpci.a"
+DEPENDS_libpci-staticdev = "libpci-dev (= ${EXTENDPKGV})"
+
meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb +6 -3
index 70bf91b..d5b0f98 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "base"
 PRIORITY = "optional"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
            file://man.patch;apply=yes \
@@ -41,14 +41,17 @@ do_install() {
 }
 
 PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
+libiw libiw-dev libiw-doc libiw-staticdev ifrename-doc ifrename ${PN} ${PN}-doc"
 
 FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
 FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
 FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw-dev = "${libdir}/*.so ${includedir}"
 FILES_libiw-doc = "${mandir}/man7"
+FILES_libiw-staticdev = "${libdir}/*.a"
+RDEPENDS_libiw-staticdev = "libiw-dev (= ${EXTENDPKGV})"
 FILES_ifrename = "${sbindir}/ifrename"
 FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
 FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
 FILES_${PN}-doc = "${mandir}"
+
meta/recipes-core/eglibc/eglibc-package.inc +5 -3
index 76ebdc3..dca7614 100644
@@ -37,7 +37,7 @@ USE_LDCONFIG ?= "1"
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile"
+PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils ${PN}-pic ${PN}-dev ${PN}-staticdev eglibc-doc eglibc-locale libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile"
 
 PACKAGES_DYNAMIC = " \
 		    glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \
@@ -73,6 +73,7 @@ RPROVIDES_eglibc-locale = "glibc-locale"
 RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
 RPROVIDES_eglibc-thread-db = "glibc-thread-db"
 RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
+RPROVIDES_eglibc-staticdev = "glibc-staticdev"
 RPROVIDES_eglibc-dbg = "glibc-dbg"
 libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
 
@@ -84,8 +85,9 @@ FILES_libmemusage = "${base_libdir}/libmemusage.so"
 FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "/sbin/sln"
 FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
-FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
-	${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a"
+RDEPENDS_eglibc-staticdev = "eglibc-dev (= ${EXTENDPKGV})"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
 FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_eglibc-gconv = "${libdir}/gconv/*"
meta/recipes-core/eglibc/eglibc_2.12.bb +1 -1
index e69cd0f..fc2811c 100644
@@ -2,7 +2,7 @@ require eglibc.inc
 
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
-PR = "r14"
+PR = "r15"
 
 SRCREV = "11982"
 
meta/recipes-core/gettext/gettext_0.18.1.1.bb +8 -8
index 5f5f164..923880f 100644
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r0"
+PR = "r1"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat git-native"
 DEPENDS_virtclass-native = "git-native"
 PROVIDES = "virtual/libintl virtual/gettext"
@@ -50,7 +50,7 @@ acpaths = '-I ${S}/gettext-runtime/m4 \
 # 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
 # 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
 # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
-PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
+PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc"
 
 FILES_gettext-runtime = "${bindir}/gettext \
                          ${bindir}/ngettext \
@@ -62,12 +62,12 @@ FILES_gettext-runtime = "${bindir}/gettext \
 FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \
                                              ${libdir}/charset.alias \
                                            "
-FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
-                      ${includedir}/autosprintf.h \
-                     "
-FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \
-                                                 ${includedir}/libintl.h \
-                                               "
+FILES_gettext-runtime-dev += "${includedir}/autosprintf.h"
+FILES_gettext-runtime-staticdev = "${libdir}/libasprintf.a"
+FILES_gettext-runtime-dev_append_libc-uclibc = " ${includedir}/libintl.h"
+FILES_gettext-runtime-staticdev_append_libc-uclibc = " ${libdir}/libintl.a"
+RDEPENDS_gettext-runtime-staticdev = "gettext-runtime-dev (= ${EXTENDPKGV})"
+
 FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
                              ${mandir}/man1/ngettext.* \
                              ${mandir}/man1/envsubst.* \
meta/recipes-core/glibc/glibc-package.inc +6 -3
index 27dc427..b6b033d 100644
@@ -37,7 +37,7 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \
 	ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \
 	${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \
-	${PN}-pcprofile"
+	${PN}-pcprofile ${PN}-staticdev"
 
 PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \
 	glibc-binary-localedata-*"
@@ -57,8 +57,9 @@ glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
                   ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
                   ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
 glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
-                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
-                ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+                ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.o ${datadir}/aclocal"
+
+glibcstaticdev = "${libdir}/*.a ${base_libdir}/*.a"
 
 FILES_glibc = "${glibcfiles}"
 FILES_${PN} = "${glibcfiles}"
@@ -68,6 +69,8 @@ FILES_glibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "${base_sbindir}/sln"
 FILES_glibc-dev = "${glibcdevfiles}"
 FILES_${PN}-dev = "${glibcdevfiles}"
+FILES_glibc-staticdev = "${glibcstaticdev}"
+FILES_${PN}-staticdev = "${glibcstaticdev}"
 FILES_glibc-dbg = "${glibcdbgfiles}"
 FILES_${PN}-dbg = "${glibcdbgfiles}"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
meta/recipes-core/glibc/glibc_2.10.1.bb +1 -1
index 33ebe24..e76f3c0 100644
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "r6"
+PR = "r7"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb +5 -3
index f714928..99988d3 100644
@@ -18,7 +18,7 @@ PROVIDES = "\
 	virtual/linux-libc-headers "
 RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
-PR = "r1"
+PR = "r2"
 
 #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
 
@@ -42,16 +42,18 @@ GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile"
 
 inherit libc-package
 
-PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
+PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev libstdc++-staticdev linux-libc-headers"
 FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
 FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
 FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "${includedir}/c++/${PV} \
 	${libdir}/libstdc++.so \
 	${libdir}/libstdc++.la \
+	${libdir}/libsupc++.la"
+FILES_libstdc++-staticdev = " \
 	${libdir}/libstdc++.a \
-	${libdir}/libsupc++.la \
 	${libdir}/libsupc++.a"
+RDEPENDS_libstdc++-staticdev = "libstdc++-dev ( = ${EXTENDPKGV})"
 FILES_linux-libc-headers = "${includedir}/asm* \
 	${includedir}/linux \
 	${includedir}/mtd \
meta/recipes-core/uclibc/uclibc.inc +1 -2
index c1bc422..9c59084 100644
@@ -14,7 +14,7 @@ PRIORITY = "required"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 		    file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
 file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
-INC_PR = "r2"
+INC_PR = "r3"
 
 require uclibc-config.inc
 STAGINGCC = "gcc-cross-intermediate"
@@ -82,12 +82,16 @@ FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
 FILES_ldd = "${bindir}/ldd"
 FILES_uclibc-dev_append = "\
         ${libdir}/lib*.so \
-        ${libdir}/*_nonshared.a \
         ${libdir}/[S]*crt[1in].o \

meta/recipes-core/uclibc/uclibc.inc FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ · line 94

Quoted 10 lines
meta/recipes-core/uclibc/uclibc.inc +6 -1
         ${libdir}/crtreloc*.o \
-        ${libdir}/lib*.a \
         ${includedir}/*.h ${includedir}/*/*.h \
        "
+
+FILES_uclibc-staticdev_append = "\
+        ${libdir}/*_nonshared.a \
+        ${libdir}/lib*.a \
+       "
+

Will -dev packages pull in -staticdev automatically ? if not then above change will break shared development package since *_nonshared.a are needed even when linking shared objects

-Khem

author
#10 lore raw

[CONSOLIDATED PULL 3/4] gcc: rebase the patch to avoid patch rejection

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

---
 ...-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch |161900 +-------------------
 1 files changed, 2375 insertions(+), 159525 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0060-be.po-da.po-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch +2375 -159525
index 82d3cdb..b4c42c7 100644
@@ -9,157157 +9,10 @@ Subject: [PATCH 060/200] 	* be.po, da.po, de.po, el.po, es.po, fi.po, fr.po, id.
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@171908 138bc75d-0d04-0410-961f-82ee72b054a4
 
 index 140ec62..61e43e7 100644
---- a/gcc/po/be.po
-+++ b/gcc/po/be.po
-@@ -6,15 +6,16 @@ msgid ""
- msgstr ""
- "Project-Id-Version: gcc 3.1\n"
- "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
--"POT-Creation-Date: 2010-12-18 20:02+0000\n"
-+"POT-Creation-Date: 2011-03-24 16:45+0000\n"
- "PO-Revision-Date: 2002-05-17 15:54+0200\n"
- "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
- "Language-Team: Belarusian <[email protected]>\n"
-+"Language: be\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: c-decl.c:4636 c-typeck.c:5849 toplev.c:1013 c-family/c-pretty-print.c:423
-+#: c-decl.c:4660 c-typeck.c:5851 toplev.c:1013 c-family/c-pretty-print.c:423
- #: cp/error.c:610 cp/error.c:889
- msgid "<anonymous>"
- msgstr ""
-@@ -23,119 +24,119 @@ msgstr ""
- msgid "({anonymous})"
- msgstr ""
- 
--#: c-parser.c:946 cp/parser.c:20888
-+#: c-parser.c:942 cp/parser.c:20965
- #, gcc-internal-format
- msgid "expected end of line"
- msgstr ""
- 
--#: c-parser.c:1760 c-parser.c:1774 c-parser.c:4001 c-parser.c:4439
--#: c-parser.c:4700 c-parser.c:4856 c-parser.c:4873 c-parser.c:5038
--#: c-parser.c:6983 c-parser.c:7019 c-parser.c:7051 c-parser.c:7099
--#: c-parser.c:7279 c-parser.c:8031 c-parser.c:8101 c-parser.c:8144
--#: c-parser.c:9118 c-parser.c:9263 c-parser.c:9301 c-parser.c:2447
--#: c-parser.c:7272 cp/parser.c:20834
-+#: c-parser.c:1755 c-parser.c:1769 c-parser.c:3996 c-parser.c:4434
-+#: c-parser.c:4695 c-parser.c:4853 c-parser.c:4870 c-parser.c:5035
-+#: c-parser.c:6980 c-parser.c:7016 c-parser.c:7048 c-parser.c:7096
-+#: c-parser.c:7276 c-parser.c:8042 c-parser.c:8112 c-parser.c:8155
-+#: c-parser.c:9132 c-parser.c:9277 c-parser.c:9315 c-parser.c:2442
-+#: c-parser.c:7269 cp/parser.c:20911
- #, gcc-internal-format
- msgid "expected %<;%>"
- msgstr ""
- 
--#: c-parser.c:1804 c-parser.c:2385 c-parser.c:2675 c-parser.c:3306
--#: c-parser.c:3358 c-parser.c:3363 c-parser.c:4483 c-parser.c:4616
--#: c-parser.c:4778 c-parser.c:4974 c-parser.c:5100 c-parser.c:6181
--#: c-parser.c:6219 c-parser.c:6305 c-parser.c:6345 c-parser.c:6383
--#: c-parser.c:6398 c-parser.c:6422 c-parser.c:7560 c-parser.c:7631
--#: c-parser.c:8436 c-parser.c:8457 c-parser.c:8507 c-parser.c:8617
--#: c-parser.c:8690 c-parser.c:8758 c-parser.c:9226 c-parser.c:8580
--#: cp/parser.c:20837
-+#: c-parser.c:1799 c-parser.c:2380 c-parser.c:2670 c-parser.c:3301
-+#: c-parser.c:3353 c-parser.c:3358 c-parser.c:4478 c-parser.c:4611
-+#: c-parser.c:4775 c-parser.c:4971 c-parser.c:5097 c-parser.c:6178
-+#: c-parser.c:6216 c-parser.c:6302 c-parser.c:6342 c-parser.c:6380
-+#: c-parser.c:6395 c-parser.c:6419 c-parser.c:7566 c-parser.c:7638
-+#: c-parser.c:8447 c-parser.c:8468 c-parser.c:8518 c-parser.c:8628
-+#: c-parser.c:8701 c-parser.c:8769 c-parser.c:9240 c-parser.c:8591
-+#: cp/parser.c:20914
- #, gcc-internal-format
- msgid "expected %<(%>"
- msgstr ""
- 
--#: c-parser.c:1809 c-parser.c:6189 c-parser.c:6227 c-parser.c:6312
--#: c-parser.c:6319 c-parser.c:6356 cp/parser.c:20499 cp/parser.c:20852
-+#: c-parser.c:1804 c-parser.c:6186 c-parser.c:6224 c-parser.c:6309
-+#: c-parser.c:6316 c-parser.c:6353 cp/parser.c:20576 cp/parser.c:20929
- #, gcc-internal-format
- msgid "expected %<,%>"
- msgstr ""
- 
--#: c-parser.c:1830 c-parser.c:2400 c-parser.c:2711 c-parser.c:2919
--#: c-parser.c:3083 c-parser.c:3132 c-parser.c:3191 c-parser.c:3313
--#: c-parser.c:3484 c-parser.c:3495 c-parser.c:3504 c-parser.c:4486
--#: c-parser.c:4620 c-parser.c:4897 c-parser.c:5032 c-parser.c:5112
--#: c-parser.c:5673 c-parser.c:5860 c-parser.c:5920 c-parser.c:6126
--#: c-parser.c:6144 c-parser.c:6165 c-parser.c:6198 c-parser.c:6299
--#: c-parser.c:6327 c-parser.c:6369 c-parser.c:6391 c-parser.c:6414
--#: c-parser.c:6435 c-parser.c:6575 c-parser.c:6847 c-parser.c:7363
--#: c-parser.c:7384 c-parser.c:7583 c-parser.c:7635 c-parser.c:8003
--#: c-parser.c:8439 c-parser.c:8460 c-parser.c:8538 c-parser.c:8623
--#: c-parser.c:8739 c-parser.c:8821 c-parser.c:9154 c-parser.c:9271
--#: c-parser.c:9312 cp/parser.c:20882
-+#: c-parser.c:1825 c-parser.c:2395 c-parser.c:2706 c-parser.c:2914
-+#: c-parser.c:3078 c-parser.c:3127 c-parser.c:3186 c-parser.c:3308
-+#: c-parser.c:3479 c-parser.c:3490 c-parser.c:3499 c-parser.c:4481
-+#: c-parser.c:4615 c-parser.c:4894 c-parser.c:5029 c-parser.c:5109
-+#: c-parser.c:5670 c-parser.c:5857 c-parser.c:5917 c-parser.c:6123
-+#: c-parser.c:6141 c-parser.c:6162 c-parser.c:6195 c-parser.c:6296
-+#: c-parser.c:6324 c-parser.c:6366 c-parser.c:6388 c-parser.c:6411
-+#: c-parser.c:6432 c-parser.c:6572 c-parser.c:6844 c-parser.c:7360
-+#: c-parser.c:7381 c-parser.c:7589 c-parser.c:7642 c-parser.c:8014
-+#: c-parser.c:8450 c-parser.c:8471 c-parser.c:8549 c-parser.c:8634
-+#: c-parser.c:8750 c-parser.c:8832 c-parser.c:9168 c-parser.c:9285
-+#: c-parser.c:9326 cp/parser.c:20959
- #, gcc-internal-format
- msgid "expected %<)%>"
- msgstr ""
- 
--#: c-parser.c:3002 c-parser.c:3789 c-parser.c:3823 c-parser.c:5092
--#: c-parser.c:6291 c-parser.c:6455 c-parser.c:6562 cp/parser.c:20846
-+#: c-parser.c:2997 c-parser.c:3784 c-parser.c:3818 c-parser.c:5089
-+#: c-parser.c:6288 c-parser.c:6452 c-parser.c:6559 cp/parser.c:20923
- #, gcc-internal-format
- msgid "expected %<]%>"
- msgstr ""
- 
--#: c-parser.c:3168
-+#: c-parser.c:3163
- msgid "expected %<;%>, %<,%> or %<)%>"
- msgstr ""
- 
--#: c-parser.c:3652 cp/parser.c:20840 cp/parser.c:22438
-+#: c-parser.c:3647 cp/parser.c:20917 cp/parser.c:22533
- #, gcc-internal-format
- msgid "expected %<}%>"
- msgstr ""
- 
--#: c-parser.c:3942 c-parser.c:7603 c-parser.c:9555 c-parser.c:2267
--#: c-parser.c:2467 c-parser.c:7168 cp/parser.c:13502 cp/parser.c:20843
-+#: c-parser.c:3937 c-parser.c:7609 c-parser.c:9569 c-parser.c:2262
-+#: c-parser.c:2462 c-parser.c:7165 cp/parser.c:13540 cp/parser.c:20920
- #, gcc-internal-format
- msgid "expected %<{%>"
- msgstr ""
- 
--#: c-parser.c:4161 c-parser.c:4170 c-parser.c:4996 c-parser.c:5337
--#: c-parser.c:7377 c-parser.c:7742 c-parser.c:7799 c-parser.c:8728
--#: cp/parser.c:20876 cp/parser.c:21694
-+#: c-parser.c:4156 c-parser.c:4165 c-parser.c:4993 c-parser.c:5334
-+#: c-parser.c:7374 c-parser.c:7749 c-parser.c:7806 c-parser.c:8739
-+#: cp/parser.c:20953 cp/parser.c:21771
- #, gcc-internal-format
- msgid "expected %<:%>"
- msgstr ""
- 
--#: c-parser.c:4694 cp/parser.c:20776
-+#: c-parser.c:4689 cp/parser.c:20853
- #, gcc-internal-format
- msgid "expected %<while%>"
- msgstr ""
- 
--#: c-parser.c:6079
-+#: c-parser.c:6076
- msgid "expected %<.%>"
- msgstr ""
- 
--#: c-parser.c:6857 c-parser.c:6889 c-parser.c:7112 cp/parser.c:22224
--#: cp/parser.c:22297
-+#: c-parser.c:6854 c-parser.c:6886 c-parser.c:7109 cp/parser.c:22319
-+#: cp/parser.c:22392
- #, gcc-internal-format
- msgid "expected %<@end%>"
- msgstr ""
- 
--#: c-parser.c:7518 cp/parser.c:20861
-+#: c-parser.c:7523 cp/parser.c:20938
- #, gcc-internal-format
- msgid "expected %<>%>"
- msgstr ""
- 
--#: c-parser.c:8825 cp/parser.c:20885
-+#: c-parser.c:8836 cp/parser.c:20962
- #, gcc-internal-format
- msgid "expected %<,%> or %<)%>"
- msgstr ""
- 
--#: c-parser.c:9252 c-parser.c:3846 cp/parser.c:20864
-+#: c-parser.c:9266 c-parser.c:3841 cp/parser.c:20941
- #, gcc-internal-format
- msgid "expected %<=%>"
- msgstr ""
- 
--#: c-parser.c:9612 c-parser.c:9602 cp/parser.c:24752
-+#: c-parser.c:9626 c-parser.c:9616 cp/parser.c:24857
- #, gcc-internal-format
- msgid "expected %<#pragma omp section%> or %<}%>"
- msgstr ""
- 
--#: c-typeck.c:6492
-+#: c-typeck.c:6494
- msgid "(anonymous)"
- msgstr ""
- 
-@@ -165,147 +166,147 @@ msgstr "спынена ў %s, ля %s:%d"
- msgid "COLLECT_LTO_WRAPPER must be set"
- msgstr ""
- 
--#: collect2.c:1270
-+#: collect2.c:1272
- #, c-format
- msgid "no arguments"
- msgstr "няма аргументаў"
- 
--#: collect2.c:1671 collect2.c:1860 collect2.c:1895
-+#: collect2.c:1673 collect2.c:1862 collect2.c:1897
- #, c-format
- msgid "fopen %s"
- msgstr ""
- 
--#: collect2.c:1674 collect2.c:1865 collect2.c:1898
-+#: collect2.c:1676 collect2.c:1867 collect2.c:1900
- #, c-format
- msgid "fclose %s"
- msgstr ""
- 
--#: collect2.c:1683
-+#: collect2.c:1685
- #, c-format
- msgid "collect2 version %s"
- msgstr ""
- 
--#: collect2.c:1795
-+#: collect2.c:1797
- #, fuzzy, c-format
- msgid "%d constructor found\n"
- msgid_plural "%d constructors found\n"
- msgstr[0] "%d канструктар(аў) знойдзен(а)\n"
- msgstr[1] "%d канструктар(аў) знойдзен(а)\n"
- 
--#: collect2.c:1799
-+#: collect2.c:1801
- #, fuzzy, c-format
- msgid "%d destructor found\n"
- msgid_plural "%d destructors found\n"
- msgstr[0] "%d дэструктар(аў) знойдзен(а)\n"
- msgstr[1] "%d дэструктар(аў) знойдзен(а)\n"
- 
--#: collect2.c:1803
-+#: collect2.c:1805
- #, c-format
- msgid "%d frame table found\n"
- msgid_plural "%d frame tables found\n"
- msgstr[0] ""
- msgstr[1] ""
- 
--#: collect2.c:1962 lto-wrapper.c:203
-+#: collect2.c:1964 lto-wrapper.c:203
- #, c-format
- msgid "can't get program status"
- msgstr ""
- 
--#: collect2.c:2031
-+#: collect2.c:2033
- #, fuzzy, c-format
- msgid "could not open response file %s"
- msgstr "не магу знайсці крыніцу %s\n"
- 
--#: collect2.c:2036
-+#: collect2.c:2038
- #, fuzzy, c-format
- msgid "could not write to response file %s"
- msgstr "не магу знайсці крыніцу %s\n"
- 
--#: collect2.c:2041
-+#: collect2.c:2043
- #, fuzzy, c-format
- msgid "could not close response file %s"
- msgstr "не магу знайсці крыніцу %s\n"
- 
--#: collect2.c:2059
-+#: collect2.c:2061
- #, c-format
- msgid "[cannot find %s]"
- msgstr "[нельга знайсці %s]"
- 
--#: collect2.c:2074
-+#: collect2.c:2076
- #, fuzzy, c-format
- msgid "cannot find '%s'"
- msgstr "нельга знайсці \"%s\""
- 
--#: collect2.c:2078 collect2.c:2619 collect2.c:2815 lto-wrapper.c:172
-+#: collect2.c:2080 collect2.c:2621 collect2.c:2817 lto-wrapper.c:172
- #, c-format
- msgid "pex_init failed"
- msgstr ""
- 
--#: collect2.c:2116
-+#: collect2.c:2118
- #, c-format
- msgid "[Leaving %s]\n"
- msgstr ""
- 
--#: collect2.c:2348
-+#: collect2.c:2350
- #, c-format
- msgid ""
- "\n"
- "write_c_file - output name is %s, prefix is %s\n"
- msgstr ""
- 
--#: collect2.c:2593
-+#: collect2.c:2595
- #, fuzzy, c-format
- msgid "cannot find 'nm'"
- msgstr "нельга знайсці \"nm\""
- 
--#: collect2.c:2641
-+#: collect2.c:2643
- #, fuzzy, c-format
- msgid "can't open nm output"
- msgstr "немагчыма адчыніць файл уводу `%s'"
- 
--#: collect2.c:2724
-+#: collect2.c:2726
- #, c-format
- msgid "init function found in object %s"
- msgstr ""
- 
--#: collect2.c:2734
-+#: collect2.c:2736
- #, c-format
- msgid "fini function found in object %s"
- msgstr ""
- 
--#: collect2.c:2836
-+#: collect2.c:2838
- #, fuzzy, c-format
- msgid "can't open ldd output"
- msgstr "немагчыма адчыніць файл уводу `%s'"
- 
--#: collect2.c:2839
-+#: collect2.c:2841
- #, c-format
- msgid ""
- "\n"
- "ldd output with constructors/destructors.\n"
- msgstr ""
- 
--#: collect2.c:2854
-+#: collect2.c:2856
- #, c-format
- msgid "dynamic dependency %s not found"
- msgstr ""
- 
--#: collect2.c:2866
-+#: collect2.c:2868
- #, c-format
- msgid "unable to open dynamic dependency '%s'"
- msgstr ""
- 
--#: collect2.c:3027
-+#: collect2.c:3029
- #, c-format
- msgid "%s: not a COFF file"
- msgstr ""
- 
--#: collect2.c:3157
-+#: collect2.c:3159
- #, c-format
- msgid "%s: cannot open as COFF file"
- msgstr ""
- 
--#: collect2.c:3215
-+#: collect2.c:3217
- #, fuzzy, c-format
- msgid "library lib%s not found"
- msgstr "Бібліятэка lib%s не знойдзена"
-@@ -353,45 +354,45 @@ msgstr ""
- msgid "Internal compiler error: Error reporting routines re-entered.\n"
- msgstr ""
- 
--#: final.c:1156
-+#: final.c:1163
- msgid "negative insn length"
- msgstr ""
- 
--#: final.c:2633
-+#: final.c:2643
- msgid "could not split insn"
- msgstr ""
- 
--#: final.c:3069
-+#: final.c:3079
- #, fuzzy
- msgid "invalid 'asm': "
- msgstr "нерэчаісная маска"
- 
--#: final.c:3252
-+#: final.c:3262
- #, c-format
- msgid "nested assembly dialect alternatives"
- msgstr ""
- 
--#: final.c:3269 final.c:3281
-+#: final.c:3279 final.c:3291
- #, c-format
- msgid "unterminated assembly dialect alternative"
- msgstr ""
- 
--#: final.c:3328
-+#: final.c:3338
- #, c-format
- msgid "operand number missing after %%-letter"
- msgstr ""
- 
--#: final.c:3331 final.c:3372
-+#: final.c:3341 final.c:3382
- #, c-format
- msgid "operand number out of range"
- msgstr ""
- 
--#: final.c:3389
-+#: final.c:3399
- #, c-format
- msgid "invalid %%-code"
- msgstr "нерэчаісны %%-код"
- 
--#: final.c:3419
-+#: final.c:3429
- #, c-format
- msgid "'%%l' operand isn't a label"
- msgstr ""
-@@ -402,247 +403,247 @@ msgstr ""
- #. TARGET_PRINT_OPERAND must handle them.
- #. We can't handle floating point constants;
- #. PRINT_OPERAND must handle them.
--#: final.c:3560 config/i386/i386.c:12975 config/pdp11/pdp11.c:1741
-+#: final.c:3570 config/i386/i386.c:13149 config/pdp11/pdp11.c:1722
- #, c-format
- msgid "floating constant misused"
- msgstr ""
- 
--#: final.c:3619 config/i386/i386.c:13073 config/pdp11/pdp11.c:1782
-+#: final.c:3629 config/i386/i386.c:13247 config/pdp11/pdp11.c:1763
- #, c-format
- msgid "invalid expression as operand"
- msgstr ""
- 
--#: gcc.c:1291
-+#: gcc.c:1307
- #, c-format
- msgid "Using built-in specs.\n"
- msgstr ""
- 
--#: gcc.c:1476
-+#: gcc.c:1493
- #, c-format
- msgid ""
- "Setting spec %s to '%s'\n"
- "\n"
- msgstr ""
- 
--#: gcc.c:1586
-+#: gcc.c:1603
- #, c-format
- msgid "Reading specs from %s\n"
- msgstr ""
- 
--#: gcc.c:1711
-+#: gcc.c:1728
- #, fuzzy, c-format
- msgid "could not find specs file %s\n"
- msgstr "не магу знайсці крыніцу %s\n"
- 
--#: gcc.c:1780
-+#: gcc.c:1797
- #, c-format
- msgid "rename spec %s to %s\n"
- msgstr ""
- 
--#: gcc.c:1782
-+#: gcc.c:1799
- #, c-format
- msgid ""
- "spec is '%s'\n"
- "\n"
- msgstr ""
- 
--#: gcc.c:2199
-+#: gcc.c:2216
- #, c-format
- msgid "%s\n"
- msgstr "%s\n"
- 
--#: gcc.c:2548
-+#: gcc.c:2572
- #, c-format
- msgid ""
- "\n"
- "Go ahead? (y or n) "
- msgstr ""
- 
--#: gcc.c:2688
-+#: gcc.c:2712
- #, c-format
- msgid "# %s %.2f %.2f\n"
- msgstr "# %s %.2f %.2f\n"
- 
--#: gcc.c:2889
-+#: gcc.c:2914
- #, c-format
- msgid "Usage: %s [options] file...\n"
- msgstr "Выкарыстанне: %s [выбары] файл...\n"
- 
--#: gcc.c:2890
-+#: gcc.c:2915
- msgid "Options:\n"
- msgstr "Выбары:\n"
- 
--#: gcc.c:2892
-+#: gcc.c:2917
- msgid "  -pass-exit-codes         Exit with highest error code from a phase\n"
- msgstr ""
- 
--#: gcc.c:2893
-+#: gcc.c:2918
- msgid "  --help                   Display this information\n"
- msgstr "  --help                   Адлюстраваць гэту інфармацыю\n"
- 
--#: gcc.c:2894
-+#: gcc.c:2919
- msgid "  --target-help            Display target specific command line options\n"
- msgstr ""
- 
--#: gcc.c:2895
-+#: gcc.c:2920
- msgid "  --help={target|optimizers|warnings|params|[^]{joined|separate|undocumented}}[,...]\n"
- msgstr ""
- 
--#: gcc.c:2896
-+#: gcc.c:2921
- #, fuzzy
- msgid "                           Display specific types of command line options\n"
- msgstr "  --help                   Адлюстраваць гэту інфармацыю\n"
- 
--#: gcc.c:2898
-+#: gcc.c:2923
- msgid "  (Use '-v --help' to display command line options of sub-processes)\n"
- msgstr ""
- 
--#: gcc.c:2899
-+#: gcc.c:2924
- #, fuzzy
- msgid "  --version                Display compiler version information\n"
- msgstr "  --help                   Адлюстраваць гэту інфармацыю\n"
- 
--#: gcc.c:2900
-+#: gcc.c:2925
- msgid "  -dumpspecs               Display all of the built in spec strings\n"
- msgstr ""
- 
--#: gcc.c:2901
-+#: gcc.c:2926
- msgid "  -dumpversion             Display the version of the compiler\n"
- msgstr "  -dumpversion             Адлюстраваць версію кампілятара\n"
- 
--#: gcc.c:2902
-+#: gcc.c:2927
- msgid "  -dumpmachine             Display the compiler's target processor\n"
- msgstr ""
- 
--#: gcc.c:2903
-+#: gcc.c:2928
- msgid "  -print-search-dirs       Display the directories in the compiler's search path\n"
- msgstr ""
- 
--#: gcc.c:2904
-+#: gcc.c:2929
- msgid "  -print-libgcc-file-name  Display the name of the compiler's companion library\n"
- msgstr ""
- 
--#: gcc.c:2905
-+#: gcc.c:2930
- msgid "  -print-file-name=<lib>   Display the full path to library <lib>\n"
- msgstr ""
- 
--#: gcc.c:2906
-+#: gcc.c:2931
- msgid "  -print-prog-name=<prog>  Display the full path to compiler component <prog>\n"
- msgstr ""
- 
--#: gcc.c:2907
-+#: gcc.c:2932
- msgid "  -print-multi-directory   Display the root directory for versions of libgcc\n"
- msgstr ""
- 
--#: gcc.c:2908
-+#: gcc.c:2933
- msgid ""
- "  -print-multi-lib         Display the mapping between command line options and\n"
- "                           multiple library search directories\n"
- msgstr ""
- 
--#: gcc.c:2911
-+#: gcc.c:2936
- msgid "  -print-multi-os-directory Display the relative path to OS libraries\n"
- msgstr ""
- 
--#: gcc.c:2912
-+#: gcc.c:2937
- #, fuzzy
- msgid "  -print-sysroot           Display the target libraries directory\n"
- msgstr "  -dumpversion             Адлюстраваць версію кампілятара\n"
- 
--#: gcc.c:2913
-+#: gcc.c:2938
- msgid "  -print-sysroot-headers-suffix Display the sysroot suffix used to find headers\n"
- msgstr ""
- 
--#: gcc.c:2914
-+#: gcc.c:2939
- msgid "  -Wa,<options>            Pass comma-separated <options> on to the assembler\n"
- msgstr ""
- 
--#: gcc.c:2915
-+#: gcc.c:2940
- msgid "  -Wp,<options>            Pass comma-separated <options> on to the preprocessor\n"
- msgstr ""
- 
--#: gcc.c:2916
-+#: gcc.c:2941
- msgid "  -Wl,<options>            Pass comma-separated <options> on to the linker\n"
- msgstr ""
- 
--#: gcc.c:2917
-+#: gcc.c:2942
- msgid "  -Xassembler <arg>        Pass <arg> on to the assembler\n"
- msgstr ""
- 
--#: gcc.c:2918
-+#: gcc.c:2943
- msgid "  -Xpreprocessor <arg>     Pass <arg> on to the preprocessor\n"
- msgstr ""
- 
--#: gcc.c:2919
-+#: gcc.c:2944
- msgid "  -Xlinker <arg>           Pass <arg> on to the linker\n"
- msgstr ""
- 
--#: gcc.c:2920
-+#: gcc.c:2945
- msgid "  -save-temps              Do not delete intermediate files\n"
- msgstr ""
- 
--#: gcc.c:2921
-+#: gcc.c:2946
- msgid "  -save-temps=<arg>        Do not delete intermediate files\n"
- msgstr ""
- 
--#: gcc.c:2922
-+#: gcc.c:2947
- msgid ""
- "  -no-canonical-prefixes   Do not canonicalize paths when building relative\n"
- "                           prefixes to other gcc components\n"
- msgstr ""
- 
--#: gcc.c:2925
-+#: gcc.c:2950
- msgid "  -pipe                    Use pipes rather than intermediate files\n"
- msgstr ""
- 
--#: gcc.c:2926
-+#: gcc.c:2951
- msgid "  -time                    Time the execution of each subprocess\n"
- msgstr ""
- 
--#: gcc.c:2927
-+#: gcc.c:2952
- #, fuzzy
- msgid "  -specs=<file>            Override built-in specs with the contents of <file>\n"
- msgstr "  -o <файл>                Памясціць вывад у <файл>\n"
- 
--#: gcc.c:2928
-+#: gcc.c:2953
- msgid "  -std=<standard>          Assume that the input sources are for <standard>\n"
- msgstr ""
- 
--#: gcc.c:2929
-+#: gcc.c:2954
- msgid ""
- "  --sysroot=<directory>    Use <directory> as the root directory for headers\n"
- "                           and libraries\n"
- msgstr ""
- 
--#: gcc.c:2932
-+#: gcc.c:2957
- msgid "  -B <directory>           Add <directory> to the compiler's search paths\n"
- msgstr ""
- 
--#: gcc.c:2933
-+#: gcc.c:2958
- msgid "  -v                       Display the programs invoked by the compiler\n"
- msgstr ""
- 
--#: gcc.c:2934
-+#: gcc.c:2959
- msgid "  -###                     Like -v but options quoted and commands not executed\n"
- msgstr ""
- 
--#: gcc.c:2935
-+#: gcc.c:2960
- msgid "  -E                       Preprocess only; do not compile, assemble or link\n"
- msgstr ""
- 
--#: gcc.c:2936
-+#: gcc.c:2961
- msgid "  -S                       Compile only; do not assemble or link\n"
- msgstr ""
- 
--#: gcc.c:2937
-+#: gcc.c:2962
- msgid "  -c                       Compile and assemble, but do not link\n"
- msgstr ""
- 
--#: gcc.c:2938
-+#: gcc.c:2963
- msgid "  -o <file>                Place the output into <file>\n"
- msgstr "  -o <файл>                Памясціць вывад у <файл>\n"
- 
--#: gcc.c:2939
-+#: gcc.c:2964
- msgid ""
- "  -x <language>            Specify the language of the following input files\n"
- "                           Permissible languages include: c c++ assembler none\n"
-@@ -650,7 +651,7 @@ msgid ""
- "                           guessing the language based on the file's extension\n"
- msgstr ""
- 
--#: gcc.c:2946
-+#: gcc.c:2971
- #, c-format
- msgid ""
- "\n"
-@@ -659,27 +660,27 @@ msgid ""
- " other options on to these processes the -W<letter> options must be used.\n"
- msgstr ""
- 
--#: gcc.c:5154
-+#: gcc.c:5198
- #, c-format
- msgid "Processing spec %c%s%c, which is '%s'\n"
- msgstr ""
- 
--#: gcc.c:6418
-+#: gcc.c:6462
- #, c-format
- msgid "install: %s%s\n"
- msgstr ""
- 
--#: gcc.c:6421
-+#: gcc.c:6465
- #, c-format
- msgid "programs: %s\n"
- msgstr "праграмы: %s\n"
- 
--#: gcc.c:6423
-+#: gcc.c:6467
- #, c-format
- msgid "libraries: %s\n"
- msgstr "бібліятэкі: %s\n"
- 
--#: gcc.c:6498
-+#: gcc.c:6542
- #, c-format
- msgid ""
- "\n"
-@@ -688,16 +689,16 @@ msgstr ""
- "\n"
- "Інструкцыі для паведамленняў аб памылках глядзіце тут:\n"
- 
--#: gcc.c:6514
--#, fuzzy, c-format
-+#: gcc.c:6558
-+#, c-format
- msgid "%s %s%s\n"
--msgstr "%s: %s: "
-+msgstr ""
- 
--#: gcc.c:6517 gcov.c:444 fortran/gfortranspec.c:302 java/jcf-dump.c:1164
-+#: gcc.c:6561 gcov.c:444 fortran/gfortranspec.c:302 java/jcf-dump.c:1164
- msgid "(C)"
- msgstr ""
- 
--#: gcc.c:6518 java/jcf-dump.c:1165
-+#: gcc.c:6562 java/jcf-dump.c:1165
- #, c-format
- msgid ""
- "This is free software; see the source for copying conditions.  There is NO\n"
-@@ -705,32 +706,32 @@ msgid ""
- "\n"
- msgstr ""
- 
--#: gcc.c:6535
-+#: gcc.c:6579
- #, fuzzy, c-format
- msgid "Target: %s\n"
- msgstr "бібліятэкі: %s\n"
- 
--#: gcc.c:6536
-+#: gcc.c:6580
- #, c-format
- msgid "Configured with: %s\n"
- msgstr ""
- 
--#: gcc.c:6550
-+#: gcc.c:6594
- #, c-format
- msgid "Thread model: %s\n"
- msgstr ""
- 
--#: gcc.c:6561
-+#: gcc.c:6605
- #, fuzzy, c-format
- msgid "gcc version %s %s\n"
- msgstr "версія gcc %s\n"
- 
--#: gcc.c:6564
-+#: gcc.c:6608
- #, c-format
- msgid "gcc driver version %s %sexecuting gcc version %s\n"
- msgstr ""
- 
--#: gcc.c:6799
-+#: gcc.c:6855
- #, c-format
- msgid ""
- "\n"
-@@ -739,14 +740,14 @@ msgid ""
- "\n"
- msgstr ""
- 
--#: gcc.c:6800
-+#: gcc.c:6856
- #, c-format
- msgid ""
- "Use \"-Wl,OPTION\" to pass \"OPTION\" to the linker.\n"
- "\n"
- msgstr ""
- 
--#: gcc.c:7991
-+#: gcc.c:8048
- #, c-format
- msgid ""
- "Assembler options\n"
-@@ -754,7 +755,7 @@ msgid ""
- "\n"
- msgstr ""
- 
--#: gcc.c:7992
-+#: gcc.c:8049
- #, c-format
- msgid ""
- "Use \"-Wa,OPTION\" to pass \"OPTION\" to the assembler.\n"
-@@ -981,9 +982,9 @@ msgid "%s:graph is unsolvable for '%s'\n"
- msgstr ""
- 
- #: gcov.c:1459
--#, fuzzy, c-format
-+#, c-format
- msgid "%s '%s'\n"
--msgstr "%s: %s: "
-+msgstr ""
- 
- #: gcov.c:1462
- #, c-format
-@@ -1023,7 +1024,9 @@ msgstr ""
- #: gcov.c:1648
- #, fuzzy, c-format
- msgid "%s:no lines for '%s'\n"
--msgstr "%s перад \"%s\""
-+msgstr ""
-+"\n"
-+" Выбары для %s:\n"
- 
- #: gcov.c:1843
- #, c-format
-@@ -1060,15 +1063,15 @@ msgstr ""
- msgid "%s:cannot open source file\n"
- msgstr "не магу знайсці крыніцу %s"
- 
--#: gcse.c:4066
-+#: gcse.c:4137
- msgid "PRE disabled"
- msgstr ""
- 
--#: gcse.c:4616
-+#: gcse.c:4687
- msgid "GCSE disabled"
- msgstr ""
- 
--#: gcse.c:5137
-+#: gcse.c:5208
- msgid "const/copy propagation disabled"
- msgstr ""
- 
-@@ -1180,7 +1183,7 @@ msgstr ""
- msgid "End of search list.\n"
- msgstr ""
- 
--#: input.c:39 c-family/c-opts.c:1288 cp/error.c:1046 fortran/cpp.c:568
-+#: input.c:39 c-family/c-opts.c:1294 cp/error.c:1046 fortran/cpp.c:568
- msgid "<built-in>"
- msgstr ""
- 
-@@ -1206,27 +1209,27 @@ msgstr ""
- msgid "At top level:"
- msgstr ""
- 
--#: langhooks.c:394 cp/error.c:2814
-+#: langhooks.c:394 cp/error.c:2818
- #, fuzzy, c-format
- msgid "In member function %qs"
- msgstr "у функцыі \"%s\":"
- 
--#: langhooks.c:398 cp/error.c:2817
-+#: langhooks.c:398 cp/error.c:2821
- #, fuzzy, c-format
- msgid "In function %qs"
- msgstr "у функцыі \"%s\":"
- 
--#: langhooks.c:449 cp/error.c:2767
-+#: langhooks.c:449 cp/error.c:2771
- #, fuzzy, c-format
- msgid "    inlined from %qs at %s:%d:%d"
- msgstr "У файле уключаным з %s:%d"
- 
--#: langhooks.c:454 cp/error.c:2772
-+#: langhooks.c:454 cp/error.c:2776
- #, fuzzy, c-format
- msgid "    inlined from %qs at %s:%d"
- msgstr "У файле уключаным з %s:%d"
- 
--#: langhooks.c:460 cp/error.c:2778
-+#: langhooks.c:460 cp/error.c:2782
- #, fuzzy, c-format
- msgid "    inlined from %qs"
- msgstr "У файле уключаным з %s:%d"
-@@ -1257,8 +1260,8 @@ msgstr ""
- msgid "%s terminated with signal %d [%s]"
- msgstr ""
- 
--#: lto-wrapper.c:220 collect2.c:1988
--#, gcc-internal-format
-+#: lto-wrapper.c:220 collect2.c:1990
-+#, gcc-internal-format, gfc-internal-format
- msgid "%s returned %d exit status"
- msgstr ""
- 
-@@ -1292,12 +1295,7 @@ msgstr ""
- msgid "malformed COLLECT_GCC_OPTIONS"
- msgstr ""
- 
--#: lto-wrapper.c:461 lto-wrapper.c:619
--#, fuzzy, c-format
--msgid "invalid LTO mode"
--msgstr "нерэчаіснае значэньне %%xn"
--
--#: lto-wrapper.c:482
-+#: lto-wrapper.c:484
- #, fuzzy, c-format
- msgid "fopen: %s"
- msgstr "немагчыма адчыніць %s"
-@@ -1307,90 +1305,90 @@ msgstr "немагчыма адчыніць %s"
- msgid "This switch lacks documentation"
- msgstr ""
- 
--#: opts.c:1004
-+#: opts.c:1010
- msgid "[default]"
- msgstr ""
- 
--#: opts.c:1015
-+#: opts.c:1021
- msgid "[enabled]"
- msgstr ""
- 
--#: opts.c:1015
-+#: opts.c:1021
- msgid "[disabled]"
- msgstr ""
- 
--#: opts.c:1034
-+#: opts.c:1040
- #, c-format
- msgid " No options with the desired characteristics were found\n"
- msgstr ""
- 
--#: opts.c:1043
-+#: opts.c:1049
- #, c-format
- msgid " None found.  Use --help=%s to show *all* the options supported by the %s front-end\n"
- msgstr ""
- 
--#: opts.c:1049
-+#: opts.c:1055
- #, c-format
- msgid " All options with the desired characteristics have already been displayed\n"
- msgstr ""
- 
--#: opts.c:1144
-+#: opts.c:1150
- msgid "The following options are target specific"
- msgstr ""
- 
--#: opts.c:1147
-+#: opts.c:1153
- msgid "The following options control compiler warning messages"
- msgstr ""
- 
--#: opts.c:1150
-+#: opts.c:1156
- msgid "The following options control optimizations"
- msgstr ""
- 
--#: opts.c:1153 opts.c:1192
-+#: opts.c:1159 opts.c:1198
- msgid "The following options are language-independent"
- msgstr ""
- 
--#: opts.c:1156
-+#: opts.c:1162
- msgid "The --param option recognizes the following as parameters"
- msgstr ""
- 
--#: opts.c:1162
-+#: opts.c:1168
- msgid "The following options are specific to just the language "
- msgstr ""
- 
--#: opts.c:1164
-+#: opts.c:1170
- msgid "The following options are supported by the language "
- msgstr ""
- 
--#: opts.c:1175
-+#: opts.c:1181
- msgid "The following options are not documented"
- msgstr ""
- 
--#: opts.c:1177
-+#: opts.c:1183
- msgid "The following options take separate arguments"
- msgstr ""
- 
--#: opts.c:1179
-+#: opts.c:1185
- msgid "The following options take joined arguments"
- msgstr ""
- 
--#: opts.c:1190
-+#: opts.c:1196
- msgid "The following options are language-related"
- msgstr ""
- 
--#: opts.c:1987
-+#: opts.c:2010
- msgid "enabled by default"
- msgstr ""
- 
--#: plugin.c:789
-+#: plugin.c:780
- msgid "Event"
- msgstr ""
- 
--#: plugin.c:789
-+#: plugin.c:780
- msgid "Plugins"
- msgstr ""
- 
--#: plugin.c:821
-+#: plugin.c:812
- #, c-format
- msgid "*** WARNING *** there are active plugins, do not report this as a bug unless you can reproduce it without enabling any plugins.\n"
- msgstr ""
-@@ -1410,37 +1408,37 @@ msgid "could not find a spill register"
- msgstr "Не выкарыстоўваць рэгістра sb"
- 
- #. It's the compiler's fault.
--#: reload1.c:7863
-+#: reload1.c:7852
- msgid "VOIDmode on an output"
- msgstr ""
- 
--#: reload1.c:8618
-+#: reload1.c:8619
- msgid "failure trying to reload:"
- msgstr ""
- 
--#: rtl-error.c:117
-+#: rtl-error.c:118
- #, fuzzy
- msgid "unrecognizable insn:"
- msgstr "нераспазнаны выбар \"-%s\""
- 
--#: rtl-error.c:119
-+#: rtl-error.c:120
- msgid "insn does not satisfy its constraints:"
- msgstr ""
- 
--#: targhooks.c:1440
-+#: targhooks.c:1469
- #, c-format
- msgid "created and used with differing settings of '%s'"
- msgstr ""
- 
--#: targhooks.c:1442
-+#: targhooks.c:1471
- msgid "out of memory"
- msgstr ""
- 
--#: targhooks.c:1457
-+#: targhooks.c:1486
- msgid "created and used with different settings of -fpic"
- msgstr ""
- 
--#: targhooks.c:1459
-+#: targhooks.c:1488
- msgid "created and used with different settings of -fpie"
- msgstr ""
- 
-@@ -1517,11 +1515,11 @@ msgstr ""
- msgid "options enabled: "
- msgstr "выбары ўключаны:"
- 
--#: tree-vrp.c:6792
-+#: tree-vrp.c:6794
- msgid "assuming signed overflow does not occur when simplifying && or || to & or |"
- msgstr ""
- 
--#: tree-vrp.c:6796
-+#: tree-vrp.c:6798
- msgid "assuming signed overflow does not occur when simplifying ==, != or ! to identity or ^"
- msgstr ""
- 
-@@ -1658,507 +1656,515 @@ msgstr ""
- msgid "permerror: "
- msgstr "граматычная памылка"
- 
--#: params.def:48
-+#: params.def:49
- msgid "The threshold ratio between current and hottest structure counts"
- msgstr ""
- 
--#: params.def:55
-+#: params.def:56
- msgid "Maximal estimated outcome of branch considered predictable"
- msgstr ""
- 
--#: params.def:72
-+#: params.def:73
- msgid "The maximum number of instructions in a single function eligible for inlining"
- msgstr ""
- 
--#: params.def:84
-+#: params.def:85
- msgid "The maximum number of instructions when automatically inlining"
- msgstr ""
- 
--#: params.def:89
-+#: params.def:90
- msgid "The maximum number of instructions inline function can grow to via recursive inlining"
- msgstr ""
- 
--#: params.def:94
-+#: params.def:95
- msgid "The maximum number of instructions non-inline function can grow to via recursive inlining"
- msgstr ""
- 
--#: params.def:99
-+#: params.def:100
- msgid "The maximum depth of recursive inlining for inline functions"
- msgstr ""
- 
--#: params.def:104
-+#: params.def:105
- msgid "The maximum depth of recursive inlining for non-inline functions"
- msgstr ""
- 
--#: params.def:109
-+#: params.def:110
- msgid "Inline recursively only when the probability of call being executed exceeds the parameter"
- msgstr ""
- 
--#: params.def:117
-+#: params.def:118
- msgid "The maximum number of nested indirect inlining performed by early inliner"
- msgstr ""
- 
--#: params.def:123
-+#: params.def:124
- msgid "Probability that COMDAT function will be shared with different compilatoin unit"
- msgstr ""
- 
--#: params.def:129
-+#: params.def:130
- msgid "Maximum probability of the entry BB of split region (in percent relative to entry BB of the function) to make partial inlining happen"
- msgstr ""
- 
--#: params.def:136
-+#: params.def:137
- msgid "If -fvariable-expansion-in-unroller is used, the maximum number of times that an individual variable will be expanded during loop unrolling"
- msgstr ""
- 
--#: params.def:142
-+#: params.def:143
- msgid "If -ftree-vectorize is used, the minimal loop bound of a loop to be considered for vectorization"
- msgstr ""
- 
--#: params.def:153
-+#: params.def:154
- msgid "The maximum number of instructions to consider to fill a delay slot"
- msgstr ""
- 
--#: params.def:164
-+#: params.def:165
- msgid "The maximum number of instructions to consider to find accurate live register information"
- msgstr ""
- 
--#: params.def:174
-+#: params.def:175
- msgid "The maximum length of scheduling's pending operations list"
- msgstr ""
- 
--#: params.def:179
-+#: params.def:180
- msgid "The size of function body to be considered large"
- msgstr ""
- 
--#: params.def:183
-+#: params.def:184
- msgid "Maximal growth due to inlining of large function (in percent)"
- msgstr ""
- 
--#: params.def:187
-+#: params.def:188
- msgid "The size of translation unit to be considered large"
- msgstr ""
- 
--#: params.def:191
-+#: params.def:192
- msgid "How much can given compilation unit grow because of the inlining (in percent)"
- msgstr ""
- 
--#: params.def:195
-+#: params.def:196
- msgid "How much can given compilation unit grow because of the interprocedural constant propagation (in percent)"
- msgstr ""
- 
--#: params.def:199
-+#: params.def:200
- msgid "Maximal estimated growth of function body caused by early inlining of single call"
- msgstr ""
- 
--#: params.def:203
-+#: params.def:204
- msgid "The size of stack frame to be considered large"
- msgstr ""
- 
--#: params.def:207
-+#: params.def:208
- msgid "Maximal stack frame growth due to inlining (in percent)"
- msgstr ""
- 
--#: params.def:214
-+#: params.def:215
- msgid "The maximum amount of memory to be allocated by GCSE"
- msgstr ""
- 
--#: params.def:225
-+#: params.def:222
-+msgid "The maximum ratio of insertions to deletions of expressions in GCSE"
-+msgstr ""
-+
-+#: params.def:233
- msgid "The threshold ratio for performing partial redundancy elimination after reload"
- msgstr ""
- 
--#: params.def:232
-+#: params.def:240
- msgid "The threshold ratio of critical edges execution count that permit performing redundancy elimination after reload"
- msgstr ""
- 
--#: params.def:240
-+#: params.def:248
- msgid "Scaling factor in calculation of maximum distance an expression can be moved by GCSE optimizations"
- msgstr ""
- 
--#: params.def:246
-+#: params.def:254
- msgid "Cost at which GCSE optimizations will not constraint the distance an expression can travel"
- msgstr ""
- 
--#: params.def:254
-+#: params.def:262
- msgid "Maximum depth of search in the dominator tree for expressions to hoist"
- msgstr ""
- 
--#: params.def:266
-+#: params.def:274
- msgid "The maximum number of instructions to consider to unroll in a loop"
- msgstr ""
- 
--#: params.def:272
-+#: params.def:280
- msgid "The maximum number of instructions to consider to unroll in a loop on average"
- msgstr ""
- 
--#: params.def:277
-+#: params.def:285
- msgid "The maximum number of unrollings of a single loop"
- msgstr ""
- 
--#: params.def:282
-+#: params.def:290
- msgid "The maximum number of insns of a peeled loop"
- msgstr ""
- 
--#: params.def:287
-+#: params.def:295
- msgid "The maximum number of peelings of a single loop"
- msgstr ""
- 
--#: params.def:292
-+#: params.def:300
- msgid "The maximum number of insns of a completely peeled loop"
- msgstr ""
- 
--#: params.def:297
-+#: params.def:305
- msgid "The maximum number of peelings of a single loop that is peeled completely"
- msgstr ""
- 
--#: params.def:302
-+#: params.def:310
- msgid "The maximum number of insns of a peeled loop that rolls only once"
- msgstr ""
- 
--#: params.def:307
-+#: params.def:315
- msgid "The maximum depth of a loop nest we completely peel"
- msgstr ""
- 
--#: params.def:313
-+#: params.def:321
- msgid "The maximum number of insns of an unswitched loop"
- msgstr ""
- 
--#: params.def:318
-+#: params.def:326
- msgid "The maximum number of unswitchings in a single loop"
- msgstr ""
- 
--#: params.def:325
-+#: params.def:333
- msgid "Bound on the number of iterations the brute force # of iterations analysis algorithm evaluates"
- msgstr ""
- 
--#: params.def:331
-+#: params.def:339
- msgid "Bound on the cost of an expression to compute the number of iterations"
- msgstr ""
- 
--#: params.def:337
-+#: params.def:345
- msgid "A factor for tuning the upper bound that swing modulo scheduler uses for scheduling a loop"
- msgstr ""
- 
--#: params.def:341
-+#: params.def:349
- msgid "The number of cycles the swing modulo scheduler considers when checking conflicts using DFA"
- msgstr ""
- 
--#: params.def:345
-+#: params.def:353
- msgid "A threshold on the average loop count considered by the swing modulo scheduler"
- msgstr ""
- 
--#: params.def:350
-+#: params.def:358
- msgid "Select fraction of the maximal count of repetitions of basic block in program given basic block needs to have to be considered hot"
- msgstr ""
- 
--#: params.def:354
-+#: params.def:362
- msgid "Select fraction of the maximal frequency of executions of basic block in function given basic block needs to have to be considered hot"
- msgstr ""
- 
--#: params.def:359
-+#: params.def:367
- msgid "Select fraction of the maximal frequency of executions of basic block in function given basic block get alignment"
- msgstr ""
- 
--#: params.def:364
-+#: params.def:372
- msgid "Loops iterating at least selected number of iterations will get loop alignement."
- msgstr ""
- 
--#: params.def:380
-+#: params.def:388
- msgid "The maximum number of loop iterations we predict statically"
- msgstr ""
- 
--#: params.def:384
-+#: params.def:392
- msgid "The percentage of function, weighted by execution frequency, that must be covered by trace formation. Used when profile feedback is available"
- msgstr ""
- 
--#: params.def:388
-+#: params.def:396
- msgid "The percentage of function, weighted by execution frequency, that must be covered by trace formation. Used when profile feedback is not available"
- msgstr ""
- 
--#: params.def:392
-+#: params.def:400
- msgid "Maximal code growth caused by tail duplication (in percent)"
- msgstr ""
- 
--#: params.def:396
-+#: params.def:404
- msgid "Stop reverse growth if the reverse probability of best edge is less than this threshold (in percent)"
- msgstr ""
- 
--#: params.def:400
-+#: params.def:408
- msgid "Stop forward growth if the probability of best edge is less than this threshold (in percent). Used when profile feedback is available"
- msgstr ""
- 
--#: params.def:404
-+#: params.def:412
- msgid "Stop forward growth if the probability of best edge is less than this threshold (in percent). Used when profile feedback is not available"
- msgstr ""
- 
--#: params.def:410
-+#: params.def:418
- msgid "The maximum number of incoming edges to consider for crossjumping"
- msgstr ""
- 
--#: params.def:416
-+#: params.def:424
- msgid "The minimum number of matching instructions to consider for crossjumping"
- msgstr ""
- 
--#: params.def:422
-+#: params.def:430
- msgid "The maximum expansion factor when copying basic blocks"
- msgstr ""
- 
--#: params.def:428
-+#: params.def:436
- msgid "The maximum number of insns to duplicate when unfactoring computed gotos"
- msgstr ""
- 
--#: params.def:434
-+#: params.def:442
- msgid "The maximum length of path considered in cse"
- msgstr ""
- 
--#: params.def:438
-+#: params.def:446
- msgid "The maximum instructions CSE process before flushing"
- msgstr ""
- 
--#: params.def:445
-+#: params.def:453
- msgid "The minimum cost of an expensive expression in the loop invariant motion"
- msgstr ""
- 
--#: params.def:454
-+#: params.def:462
- msgid "Bound on number of candidates below that all candidates are considered in iv optimizations"
- msgstr ""
- 
--#: params.def:462
-+#: params.def:470
- msgid "Bound on number of iv uses in loop optimized in iv optimizations"
- msgstr ""
- 
--#: params.def:470
-+#: params.def:478
- msgid "If number of candidates in the set is smaller, we always try to remove unused ivs during its optimization"
- msgstr ""
- 
--#: params.def:475
-+#: params.def:483
- msgid "Bound on size of expressions used in the scalar evolutions analyzer"
- msgstr ""
- 
--#: params.def:480
-+#: params.def:488
-+msgid "Bound on the complexity of the expressions in the scalar evolutions analyzer"
-+msgstr ""
-+
-+#: params.def:493
- msgid "Bound on the number of variables in Omega constraint systems"
- msgstr ""
- 
--#: params.def:485
-+#: params.def:498
- msgid "Bound on the number of inequalities in Omega constraint systems"
- msgstr ""
- 
--#: params.def:490
-+#: params.def:503
- msgid "Bound on the number of equalities in Omega constraint systems"
- msgstr ""
- 
--#: params.def:495
-+#: params.def:508
- msgid "Bound on the number of wild cards in Omega constraint systems"
- msgstr ""
- 
--#: params.def:500
-+#: params.def:513
- msgid "Bound on the size of the hash table in Omega constraint systems"
- msgstr ""
- 
--#: params.def:505
-+#: params.def:518
- msgid "Bound on the number of keys in Omega constraint systems"
- msgstr ""
- 
--#: params.def:510
-+#: params.def:523
- msgid "When set to 1, use expensive methods to eliminate all redundant constraints"
- msgstr ""
- 
--#: params.def:515
-+#: params.def:528
- msgid "Bound on number of runtime checks inserted by the vectorizer's loop versioning for alignment check"
- msgstr ""
- 
--#: params.def:520
-+#: params.def:533
- msgid "Bound on number of runtime checks inserted by the vectorizer's loop versioning for alias check"
- msgstr ""
- 
--#: params.def:525
-+#: params.def:538
- msgid "The maximum memory locations recorded by cselib"
- msgstr ""
- 
--#: params.def:538
-+#: params.def:551
- msgid "Minimum heap expansion to trigger garbage collection, as a percentage of the total size of the heap"
- msgstr ""
- 
--#: params.def:543
-+#: params.def:556
- msgid "Minimum heap size before we start collecting garbage, in kilobytes"
- msgstr ""
- 
--#: params.def:551
-+#: params.def:564
- msgid "The maximum number of instructions to search backward when looking for equivalent reload"
- msgstr ""
- 
--#: params.def:556 params.def:566
-+#: params.def:569 params.def:579
- msgid "The maximum number of blocks in a region to be considered for interblock scheduling"
- msgstr ""
- 
--#: params.def:561 params.def:571
-+#: params.def:574 params.def:584
- msgid "The maximum number of insns in a region to be considered for interblock scheduling"
- msgstr ""
- 
--#: params.def:576
-+#: params.def:589
- msgid "The minimum probability of reaching a source block for interblock speculative scheduling"
- msgstr ""
- 
--#: params.def:581
-+#: params.def:594
- msgid "The maximum number of iterations through CFG to extend regions"
- msgstr ""
- 
--#: params.def:586
-+#: params.def:599
- msgid "The maximum conflict delay for an insn to be considered for speculative motion"
- msgstr ""
- 
--#: params.def:591
-+#: params.def:604
- msgid "The minimal probability of speculation success (in percents), so that speculative insn will be scheduled."
- msgstr ""
- 
--#: params.def:596
-+#: params.def:609
- msgid "The maximum size of the lookahead window of selective scheduling"
- msgstr ""
- 
--#: params.def:601
-+#: params.def:614
- msgid "Maximum number of times that an insn could be scheduled"
- msgstr ""
- 
--#: params.def:606
-+#: params.def:619
- msgid "Maximum number of instructions in the ready list that are considered eligible for renaming"
- msgstr ""
- 
--#: params.def:611
-+#: params.def:624
- msgid "Minimal distance between possibly conflicting store and load"
- msgstr ""
- 
--#: params.def:616
-+#: params.def:629
- msgid "The maximum number of RTL nodes that can be recorded as combiner's last value"
- msgstr ""
- 
--#: params.def:624
-+#: params.def:637
- msgid "The upper bound for sharing integer constants"
- msgstr ""
- 
--#: params.def:643
-+#: params.def:656
- msgid "Minimum number of virtual mappings to consider switching to full virtual renames"
- msgstr ""
- 
--#: params.def:648
-+#: params.def:661
- msgid "Ratio between virtual mappings and virtual symbols to do full virtual renames"
- msgstr ""
- 
--#: params.def:653
-+#: params.def:666
- msgid "The lower bound for a buffer to be considered for stack smashing protection"
- msgstr ""
- 
--#: params.def:671
-+#: params.def:684
- msgid "Maximum number of statements allowed in a block that needs to be duplicated when threading jumps"
- msgstr ""
- 
--#: params.def:680
-+#: params.def:693
- msgid "Maximum number of fields in a structure before pointer analysis treats the structure as a single variable"
- msgstr ""
- 
--#: params.def:685
-+#: params.def:698
- msgid "The maximum number of instructions ready to be issued to be considered by the scheduler during the first scheduling pass"
- msgstr ""
- 
--#: params.def:695
-+#: params.def:708
- msgid "The number of insns executed before prefetch is completed"
- msgstr ""
- 
--#: params.def:702
-+#: params.def:715
- msgid "The number of prefetches that can run at the same time"
- msgstr ""
- 
--#: params.def:709
-+#: params.def:722
- msgid "The size of L1 cache"
- msgstr ""
- 
--#: params.def:716
-+#: params.def:729
- msgid "The size of L1 cache line"
- msgstr ""
- 
--#: params.def:723
-+#: params.def:736
- msgid "The size of L2 cache"
- msgstr ""
- 
--#: params.def:734
-+#: params.def:747
- msgid "Whether to use canonical types"
- msgstr ""
- 
--#: params.def:739
-+#: params.def:752
- msgid "Maximum length of partial antic set when performing tree pre optimization"
- msgstr ""
- 
--#: params.def:749
-+#: params.def:762
- msgid "Maximum size of a SCC before SCCVN stops processing a function"
- msgstr ""
- 
--#: params.def:754
-+#: params.def:767
- msgid "Max loops number for regional RA"
- msgstr ""
- 
--#: params.def:759
-+#: params.def:772
- msgid "Max size of conflict table in MB"
- msgstr ""
- 
--#: params.def:764
-+#: params.def:777
- msgid "The number of registers in each class kept unused by loop invariant motion"
- msgstr ""
- 
--#: params.def:772
-+#: params.def:785
- msgid "The maximum ratio between array size and switch branches for a switch conversion to take place"
- msgstr ""
- 
--#: params.def:780
-+#: params.def:793
- msgid "size of tiles for loop blocking"
- msgstr ""
- 
--#: params.def:787
-+#: params.def:800
- msgid "maximum number of parameters in a SCoP"
- msgstr ""
- 
--#: params.def:794
-+#: params.def:807
- msgid "maximum number of basic blocks per function to be analyzed by Graphite"
- msgstr ""
- 
--#: params.def:801
-+#: params.def:814
- msgid "Max basic blocks number in loop for loop invariant motion"
- msgstr ""
- 
--#: params.def:807
-+#: params.def:820
- msgid "Maximum number of instructions in basic block to be considered for SLP vectorization"
- msgstr ""
- 
--#: params.def:812
-+#: params.def:825
- msgid "Min. ratio of insns to prefetches to enable prefetching for a loop with an unknown trip count"
- msgstr ""
- 
--#: params.def:818
-+#: params.def:831
- msgid "Min. ratio of insns to mem ops to enable prefetching in a loop"
- msgstr ""
- 
--#: params.def:825
-+#: params.def:838
- msgid "Max. size of var tracking hash tables"
- msgstr ""
- 
--#: params.def:832
-+#: params.def:845
- msgid "The minimum UID to be used for a nondebug insn"
- msgstr ""
- 
--#: params.def:837
-+#: params.def:850
- msgid "Maximum allowed growth of size of new parameters ipa-sra replaces a pointer to an aggregate with"
- msgstr ""
- 
--#: params.def:843
-+#: params.def:856
- msgid "Maximum size of a type list associated with each parameter for devirtualization"
- msgstr ""
- 
--#: params.def:851
-+#: params.def:864
- msgid "Number of paritions program should be split to"
- msgstr ""
- 
--#: params.def:856
-+#: params.def:869
- msgid "Size of minimal paritition for WHOPR (in estimated instructions)"
- msgstr ""
- 
--#: params.def:863
-+#: params.def:876
- msgid "Maximum number of namespaces to search for alternatives when name lookup fails"
- msgstr ""
- 
-@@ -2448,7 +2454,7 @@ msgid "length modifier in strfmon format"
- msgstr ""
- 
- #. Handle deferred options from command-line.
--#: c-family/c-opts.c:1306 fortran/cpp.c:573
-+#: c-family/c-opts.c:1312 fortran/cpp.c:573
- msgid "<command-line>"
- msgstr ""
- 
-@@ -2501,24 +2507,24 @@ msgstr "нерэчаіснае значэньне %%H"
- msgid "invalid %%J value"
- msgstr "дрэннае %%Q значэнне"
- 
--#: config/alpha/alpha.c:5196 config/ia64/ia64.c:5214
-+#: config/alpha/alpha.c:5196 config/ia64/ia64.c:5169
- #, c-format
- msgid "invalid %%r value"
- msgstr "нерэчаіснае значэньне %%r"
- 
--#: config/alpha/alpha.c:5206 config/ia64/ia64.c:5168
--#: config/rs6000/rs6000.c:15830 config/xtensa/xtensa.c:2307
-+#: config/alpha/alpha.c:5206 config/ia64/ia64.c:5123
-+#: config/rs6000/rs6000.c:16096 config/xtensa/xtensa.c:2356
- #, c-format
- msgid "invalid %%R value"
- msgstr "нерэчаіснае значэньне %%R"
- 
--#: config/alpha/alpha.c:5212 config/rs6000/rs6000.c:15749
--#: config/xtensa/xtensa.c:2274
-+#: config/alpha/alpha.c:5212 config/rs6000/rs6000.c:16015
-+#: config/xtensa/xtensa.c:2323
- #, c-format
- msgid "invalid %%N value"
- msgstr "нерэчаіснае значэньне %%N"
- 
--#: config/alpha/alpha.c:5220 config/rs6000/rs6000.c:15777
-+#: config/alpha/alpha.c:5220 config/rs6000/rs6000.c:16043
- #, c-format
- msgid "invalid %%P value"
- msgstr "нерэчаіснае значэньне %%P"
-@@ -2528,17 +2534,17 @@ msgstr "нерэчаіснае значэньне %%P"
- msgid "invalid %%h value"
- msgstr "нерэчаіснае значэньне %%h"
- 
--#: config/alpha/alpha.c:5236 config/xtensa/xtensa.c:2300
-+#: config/alpha/alpha.c:5236 config/xtensa/xtensa.c:2349
- #, c-format
- msgid "invalid %%L value"
- msgstr "нерэчаіснае значэньне %%L"
- 
--#: config/alpha/alpha.c:5275 config/rs6000/rs6000.c:15731
-+#: config/alpha/alpha.c:5275 config/rs6000/rs6000.c:15997
- #, c-format
- msgid "invalid %%m value"
- msgstr "нерэчаіснае значэньне %%m"
- 
--#: config/alpha/alpha.c:5283 config/rs6000/rs6000.c:15739
-+#: config/alpha/alpha.c:5283 config/rs6000/rs6000.c:16005
- #, c-format
- msgid "invalid %%M value"
- msgstr "нерэчаіснае значэньне %%M"
-@@ -2549,7 +2555,7 @@ msgid "invalid %%U value"
- msgstr "нерэчаіснае значэньне %%U"
- 
- #: config/alpha/alpha.c:5339 config/alpha/alpha.c:5353
--#: config/rs6000/rs6000.c:15838
-+#: config/rs6000/rs6000.c:16104
- #, c-format
- msgid "invalid %%s value"
- msgstr "нерэчаіснае значэньне %%v"
-@@ -2559,7 +2565,7 @@ msgstr "нерэчаіснае значэньне %%v"
- msgid "invalid %%C value"
- msgstr "нерэчаіснае значэньне %%C"
- 
--#: config/alpha/alpha.c:5413 config/rs6000/rs6000.c:15596
-+#: config/alpha/alpha.c:5413 config/rs6000/rs6000.c:15862
- #, c-format
- msgid "invalid %%E value"
- msgstr "нерэчаіснае значэньне %%E"
-@@ -2570,22 +2576,22 @@ msgid "unknown relocation unspec"
- msgstr ""
- 
- #: config/alpha/alpha.c:5447 config/crx/crx.c:1119
--#: config/rs6000/rs6000.c:16193 config/spu/spu.c:1721
-+#: config/rs6000/rs6000.c:16470 config/spu/spu.c:1725
- #, c-format
- msgid "invalid %%xn code"
- msgstr "нерэчаіснае значэньне %%xn"
- 
--#: config/arc/arc.c:1743 config/m32r/m32r.c:2149
-+#: config/arc/arc.c:1743 config/m32r/m32r.c:2155
- #, fuzzy, c-format
- msgid "invalid operand to %%R code"
- msgstr "нерэчаісны %%-код"
- 
--#: config/arc/arc.c:1775 config/m32r/m32r.c:2172
-+#: config/arc/arc.c:1775 config/m32r/m32r.c:2178
- #, fuzzy, c-format
- msgid "invalid operand to %%H/%%L code"
- msgstr "нерэчаісны %%-код"
- 
--#: config/arc/arc.c:1797 config/m32r/m32r.c:2243
-+#: config/arc/arc.c:1797 config/m32r/m32r.c:2249
- #, fuzzy, c-format
- msgid "invalid operand to %%U code"
- msgstr "нерэчаісны %%-код"
-@@ -2597,33 +2603,33 @@ msgstr "нерэчаісны %%-код"
- 
- #. Unknown flag.
- #. Undocumented flag.
--#: config/arc/arc.c:1815 config/m32r/m32r.c:2270 config/sparc/sparc.c:7616
-+#: config/arc/arc.c:1815 config/m32r/m32r.c:2276 config/sparc/sparc.c:7633
- #, c-format
- msgid "invalid operand output code"
- msgstr ""
- 
--#: config/arm/arm.c:15891 config/arm/arm.c:15909
-+#: config/arm/arm.c:16019 config/arm/arm.c:16037
- #, fuzzy, c-format
- msgid "predicated Thumb instruction"
- msgstr "нявернае выкарыстанне \"restict\""
- 
--#: config/arm/arm.c:15897
-+#: config/arm/arm.c:16025
- #, c-format
- msgid "predicated instruction in conditional sequence"
- msgstr ""
- 
--#: config/arm/arm.c:16067
-+#: config/arm/arm.c:16195
- #, fuzzy, c-format
- msgid "invalid shift operand"
- msgstr "нерэчаісны %%f аперанд"
- 
--#: config/arm/arm.c:16124 config/arm/arm.c:16146 config/arm/arm.c:16156
--#: config/arm/arm.c:16166 config/arm/arm.c:16176 config/arm/arm.c:16215
--#: config/arm/arm.c:16233 config/arm/arm.c:16268 config/arm/arm.c:16287
--#: config/arm/arm.c:16302 config/arm/arm.c:16329 config/arm/arm.c:16336
--#: config/arm/arm.c:16354 config/arm/arm.c:16361 config/arm/arm.c:16369
--#: config/arm/arm.c:16390 config/arm/arm.c:16397 config/arm/arm.c:16522
--#: config/arm/arm.c:16529 config/arm/arm.c:16547 config/arm/arm.c:16554
-+#: config/arm/arm.c:16252 config/arm/arm.c:16274 config/arm/arm.c:16284
-+#: config/arm/arm.c:16294 config/arm/arm.c:16304 config/arm/arm.c:16343
-+#: config/arm/arm.c:16361 config/arm/arm.c:16396 config/arm/arm.c:16415
-+#: config/arm/arm.c:16430 config/arm/arm.c:16457 config/arm/arm.c:16464
-+#: config/arm/arm.c:16482 config/arm/arm.c:16489 config/arm/arm.c:16497
-+#: config/arm/arm.c:16518 config/arm/arm.c:16525 config/arm/arm.c:16650
-+#: config/arm/arm.c:16657 config/arm/arm.c:16675 config/arm/arm.c:16682
- #: config/bfin/bfin.c:1684 config/bfin/bfin.c:1691 config/bfin/bfin.c:1698
- #: config/bfin/bfin.c:1705 config/bfin/bfin.c:1714 config/bfin/bfin.c:1721
- #: config/bfin/bfin.c:1728 config/bfin/bfin.c:1735
-@@ -2631,72 +2637,72 @@ msgstr "нерэчаісны %%f аперанд"
- msgid "invalid operand for code '%c'"
- msgstr "Нерэчаісны выбар \"%s\""
- 
--#: config/arm/arm.c:16228
-+#: config/arm/arm.c:16356
- #, c-format
- msgid "instruction never executed"
- msgstr ""
- 
--#: config/arm/arm.c:16566
-+#: config/arm/arm.c:16694
- #, fuzzy, c-format
- msgid "missing operand"
- msgstr "прапушчан ініцыялізатар"
- 
--#: config/arm/arm.c:18996
-+#: config/arm/arm.c:19124
- #, fuzzy
- msgid "function parameters cannot have __fp16 type"
- msgstr "віртуальныя функцыі не могуць быць сяброўскімі"
- 
--#: config/arm/arm.c:19006
-+#: config/arm/arm.c:19134
- #, fuzzy
- msgid "functions cannot return __fp16 type"
- msgstr "функцыя не вяртае тып string"
- 
--#: config/avr/avr.c:1096
-+#: config/avr/avr.c:1165
- #, c-format
- msgid "address operand requires constraint for X, Y, or Z register"
- msgstr ""
- 
--#: config/avr/avr.c:1222
-+#: config/avr/avr.c:1291
- msgid "bad address, not a constant):"
- msgstr ""
- 
--#: config/avr/avr.c:1235
-+#: config/avr/avr.c:1304
- msgid "bad address, not (reg+disp):"
- msgstr ""
- 
--#: config/avr/avr.c:1242
-+#: config/avr/avr.c:1311
- msgid "bad address, not post_inc or pre_dec:"
- msgstr ""
- 
--#: config/avr/avr.c:1253
-+#: config/avr/avr.c:1322
- msgid "internal compiler error.  Bad address:"
- msgstr ""
- 
--#: config/avr/avr.c:1278
-+#: config/avr/avr.c:1347
- msgid "internal compiler error.  Unknown mode:"
- msgstr ""
- 
--#: config/avr/avr.c:1859 config/avr/avr.c:2547
-+#: config/avr/avr.c:1928 config/avr/avr.c:2616
- #, fuzzy
- msgid "invalid insn:"
- msgstr "Нерэчаісны выбар %s"
- 
--#: config/avr/avr.c:1898 config/avr/avr.c:1984 config/avr/avr.c:2033
--#: config/avr/avr.c:2061 config/avr/avr.c:2156 config/avr/avr.c:2325
--#: config/avr/avr.c:2586 config/avr/avr.c:2698
-+#: config/avr/avr.c:1967 config/avr/avr.c:2053 config/avr/avr.c:2102
-+#: config/avr/avr.c:2130 config/avr/avr.c:2225 config/avr/avr.c:2394
-+#: config/avr/avr.c:2655 config/avr/avr.c:2767
- msgid "incorrect insn:"
- msgstr ""
- 
--#: config/avr/avr.c:2080 config/avr/avr.c:2241 config/avr/avr.c:2396
--#: config/avr/avr.c:2764
-+#: config/avr/avr.c:2149 config/avr/avr.c:2310 config/avr/avr.c:2465
-+#: config/avr/avr.c:2833
- msgid "unknown move insn:"
- msgstr ""
- 
--#: config/avr/avr.c:2994
-+#: config/avr/avr.c:3063
- msgid "bad shift insn:"
- msgstr ""
- 
--#: config/avr/avr.c:3110 config/avr/avr.c:3530 config/avr/avr.c:3888
-+#: config/avr/avr.c:3179 config/avr/avr.c:3599 config/avr/avr.c:3957
- msgid "internal compiler error.  Incorrect shift:"
- msgstr ""
- 
-@@ -2710,12 +2716,12 @@ msgstr ""
- msgid "invalid const_double operand"
- msgstr "нерэчаісны %%c аперанд"
- 
--#: config/cris/cris.c:575 config/moxie/moxie.c:111 final.c:3074 final.c:3076
--#: fold-const.c:281 gcc.c:4527 gcc.c:4541 loop-iv.c:2968 loop-iv.c:2977
--#: rtl-error.c:102 toplev.c:359 tree-ssa-loop-niter.c:1921 tree-vrp.c:5992
-+#: config/cris/cris.c:575 config/moxie/moxie.c:111 final.c:3084 final.c:3086
-+#: fold-const.c:281 gcc.c:4563 gcc.c:4577 loop-iv.c:2968 loop-iv.c:2977
-+#: rtl-error.c:103 toplev.c:359 tree-ssa-loop-niter.c:1921 tree-vrp.c:5994
- #: cp/typeck.c:5229 java/expr.c:384 lto/lto-object.c:184 lto/lto-object.c:269
- #: lto/lto-object.c:326 lto/lto-object.c:350
--#, gcc-internal-format
-+#, gcc-internal-format, gfc-internal-format
- msgid "%s"
- msgstr ""
- 
-@@ -2859,81 +2865,81 @@ msgstr ""
- msgid "fr30_print_operand: unhandled MEM"
- msgstr ""
- 
--#: config/frv/frv.c:2608
-+#: config/frv/frv.c:2563
- msgid "bad insn to frv_print_operand_address:"
- msgstr ""
- 
--#: config/frv/frv.c:2619
-+#: config/frv/frv.c:2574
- msgid "bad register to frv_print_operand_memory_reference_reg:"
- msgstr ""
- 
--#: config/frv/frv.c:2658 config/frv/frv.c:2668 config/frv/frv.c:2677
--#: config/frv/frv.c:2698 config/frv/frv.c:2703
-+#: config/frv/frv.c:2613 config/frv/frv.c:2623 config/frv/frv.c:2632
-+#: config/frv/frv.c:2653 config/frv/frv.c:2658
- msgid "bad insn to frv_print_operand_memory_reference:"
- msgstr ""
- 
--#: config/frv/frv.c:2789
-+#: config/frv/frv.c:2744
- #, c-format
- msgid "bad condition code"
- msgstr ""
- 
--#: config/frv/frv.c:2865
-+#: config/frv/frv.c:2820
- msgid "bad insn in frv_print_operand, bad const_double"
- msgstr ""
- 
--#: config/frv/frv.c:2926
-+#: config/frv/frv.c:2881
- msgid "bad insn to frv_print_operand, 'e' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:2934
-+#: config/frv/frv.c:2889
- msgid "bad insn to frv_print_operand, 'F' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:2950
-+#: config/frv/frv.c:2905
- msgid "bad insn to frv_print_operand, 'f' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:2964
-+#: config/frv/frv.c:2919
- msgid "bad insn to frv_print_operand, 'g' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:3012
-+#: config/frv/frv.c:2967
- msgid "bad insn to frv_print_operand, 'L' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:3025
-+#: config/frv/frv.c:2980
- msgid "bad insn to frv_print_operand, 'M/N' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:3046
-+#: config/frv/frv.c:3001
- msgid "bad insn to frv_print_operand, 'O' modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:3064
-+#: config/frv/frv.c:3019
- msgid "bad insn to frv_print_operand, P modifier:"
- msgstr ""
- 
--#: config/frv/frv.c:3084
-+#: config/frv/frv.c:3039
- msgid "bad insn in frv_print_operand, z case"
- msgstr ""
- 
--#: config/frv/frv.c:3115
-+#: config/frv/frv.c:3070
- msgid "bad insn in frv_print_operand, 0 case"
- msgstr ""
- 
--#: config/frv/frv.c:3120
-+#: config/frv/frv.c:3075
- msgid "frv_print_operand: unknown code"
- msgstr ""
- 
--#: config/frv/frv.c:4521
-+#: config/frv/frv.c:4476
- msgid "bad output_move_single operand"
- msgstr ""
- 
--#: config/frv/frv.c:4648
-+#: config/frv/frv.c:4603
- msgid "bad output_move_double operand"
- msgstr ""
- 
--#: config/frv/frv.c:4790
-+#: config/frv/frv.c:4745
- msgid "bad output_condmove_single operand"
- msgstr ""
- 
-@@ -2946,72 +2952,72 @@ msgstr ""
- #. #else
- #. #define TARGET_VERSION           fprintf (stderr, " (68k, MIT syntax)");
- #. #endif
--#: config/frv/frv.h:295
-+#: config/frv/frv.h:252
- #, c-format
- msgid " (frv)"
- msgstr ""
- 
--#: config/i386/i386.c:13067
-+#: config/i386/i386.c:13241
- #, c-format
- msgid "invalid UNSPEC as operand"
- msgstr ""
- 
--#: config/i386/i386.c:13664
-+#: config/i386/i386.c:13846
- #, c-format
- msgid "'%%&' used without any local dynamic TLS references"
- msgstr ""
- 
--#: config/i386/i386.c:13755 config/i386/i386.c:13830
-+#: config/i386/i386.c:13937 config/i386/i386.c:14012
- #, fuzzy, c-format
- msgid "invalid operand size for operand code '%c'"
- msgstr "Нерэчаісны выбар \"%s\""
- 
--#: config/i386/i386.c:13825
-+#: config/i386/i386.c:14007
- #, fuzzy, c-format
- msgid "invalid operand type used with operand code '%c'"
- msgstr "Нерэчаісны выбар \"%s\""
- 
--#: config/i386/i386.c:13905 config/i386/i386.c:13945
-+#: config/i386/i386.c:14087 config/i386/i386.c:14127
- #, c-format
- msgid "operand is not a condition code, invalid operand code 'D'"
- msgstr ""
- 
--#: config/i386/i386.c:13971
-+#: config/i386/i386.c:14153
- #, c-format
- msgid "operand is neither a constant nor a condition code, invalid operand code 'C'"
- msgstr ""
- 
--#: config/i386/i386.c:13981
-+#: config/i386/i386.c:14163
- #, c-format
- msgid "operand is neither a constant nor a condition code, invalid operand code 'F'"
- msgstr ""
- 
--#: config/i386/i386.c:13999
-+#: config/i386/i386.c:14181
- #, c-format
- msgid "operand is neither a constant nor a condition code, invalid operand code 'c'"
- msgstr ""
- 
--#: config/i386/i386.c:14009
-+#: config/i386/i386.c:14191
- #, c-format
- msgid "operand is neither a constant nor a condition code, invalid operand code 'f'"
- msgstr ""
- 
--#: config/i386/i386.c:14112
-+#: config/i386/i386.c:14294
- #, c-format
- msgid "operand is not a condition code, invalid operand code 'Y'"
- msgstr ""
- 
--#: config/i386/i386.c:14138
-+#: config/i386/i386.c:14320
- #, fuzzy, c-format
- msgid "invalid operand code '%c'"
- msgstr "Нерэчаісны выбар \"%s\""
- 
--#: config/i386/i386.c:14188
-+#: config/i386/i386.c:14370
- #, fuzzy, c-format
- msgid "invalid constraints for operand"
- msgstr "нерэчаісны %%c аперанд"
- 
--#: config/i386/i386.c:22086
-+#: config/i386/i386.c:22268
- #, fuzzy
- msgid "unknown insn mode"
- msgstr "невядомы рэжым машыны \"%s\""
-@@ -3033,27 +3039,27 @@ msgstr ""
- msgid "environment variable DJGPP points to corrupt file '%s'"
- msgstr ""
- 
--#: config/ia64/ia64.c:5096
-+#: config/ia64/ia64.c:5051
- #, fuzzy, c-format
- msgid "invalid %%G mode"
- msgstr "нерэчаіснае значэньне %%xn"
- 
--#: config/ia64/ia64.c:5266
-+#: config/ia64/ia64.c:5221
- #, c-format
- msgid "ia64_print_operand: unknown code"
- msgstr ""
- 
--#: config/ia64/ia64.c:10946
-+#: config/ia64/ia64.c:10901
- #, fuzzy
- msgid "invalid conversion from %<__fpreg%>"
- msgstr "нерэчаісны рэжым для gen_tst_reg"
- 
--#: config/ia64/ia64.c:10949
-+#: config/ia64/ia64.c:10904
- #, fuzzy
- msgid "invalid conversion to %<__fpreg%>"
- msgstr "нерэчаісны %%-код"
- 
--#: config/ia64/ia64.c:10962 config/ia64/ia64.c:10973
-+#: config/ia64/ia64.c:10917 config/ia64/ia64.c:10928
- #, fuzzy
- msgid "invalid operation on %<__fpreg%>"
- msgstr "нерэчаісны %%-код"
-@@ -3063,7 +3069,7 @@ msgstr "нерэчаісны %%-код"
- msgid "invalid %%P operand"
- msgstr "нерэчаісны %%-код"
- 
--#: config/iq2000/iq2000.c:3192 config/rs6000/rs6000.c:15767
-+#: config/iq2000/iq2000.c:3192 config/rs6000/rs6000.c:16033
- #, c-format
- msgid "invalid %%p value"
- msgstr ""
-@@ -3073,66 +3079,66 @@ msgstr ""
- msgid "invalid use of %%d, %%x, or %%X"
- msgstr ""
- 
--#: config/lm32/lm32.c:525
-+#: config/lm32/lm32.c:529
- #, c-format
- msgid "only 0.0 can be loaded as an immediate"
- msgstr ""
- 
--#: config/lm32/lm32.c:595
-+#: config/lm32/lm32.c:599
- #, fuzzy
- msgid "bad operand"
--msgstr "нерэчаісны %%-код"
-+msgstr "нерэчаісны %%d аперанд"
- 
--#: config/lm32/lm32.c:607
-+#: config/lm32/lm32.c:611
- msgid "can't use non gp relative absolute address"
- msgstr ""
- 
--#: config/lm32/lm32.c:611
-+#: config/lm32/lm32.c:615
- msgid "invalid addressing mode"
- msgstr ""
- 
--#: config/m32r/m32r.c:2119
-+#: config/m32r/m32r.c:2125
- #, fuzzy, c-format
- msgid "invalid operand to %%s code"
- msgstr "нерэчаісны %%-код"
- 
--#: config/m32r/m32r.c:2126
-+#: config/m32r/m32r.c:2132
- #, fuzzy, c-format
- msgid "invalid operand to %%p code"
- msgstr "нерэчаісны %%-код"
- 
--#: config/m32r/m32r.c:2181
-+#: config/m32r/m32r.c:2187
- msgid "bad insn for 'A'"
- msgstr ""
- 
--#: config/m32r/m32r.c:2228
-+#: config/m32r/m32r.c:2234
- #, fuzzy, c-format
- msgid "invalid operand to %%T/%%B code"
- msgstr "нерэчаісны %%-код"
- 
--#: config/m32r/m32r.c:2251
-+#: config/m32r/m32r.c:2257
- #, fuzzy, c-format
- msgid "invalid operand to %%N code"
- msgstr "нерэчаісны %%-код"
- 
--#: config/m32r/m32r.c:2284
-+#: config/m32r/m32r.c:2290
- msgid "pre-increment address is not a register"
- msgstr ""
- 
--#: config/m32r/m32r.c:2291
-+#: config/m32r/m32r.c:2297
- msgid "pre-decrement address is not a register"
- msgstr ""
- 
--#: config/m32r/m32r.c:2298
-+#: config/m32r/m32r.c:2304
- msgid "post-increment address is not a register"
- msgstr ""
- 
--#: config/m32r/m32r.c:2374 config/m32r/m32r.c:2388
--#: config/rs6000/rs6000.c:25201
-+#: config/m32r/m32r.c:2380 config/m32r/m32r.c:2394
-+#: config/rs6000/rs6000.c:25478
- msgid "bad address"
- msgstr "дрэнны адрас"
- 
--#: config/m32r/m32r.c:2393
-+#: config/m32r/m32r.c:2399
- #, fuzzy
- msgid "lo_sum not of register"
- msgstr "Не выкарыстоўваць рэгістра sb"
-@@ -3208,7 +3214,7 @@ msgid "insn contains an invalid address !"
- msgstr "нерэчаісны адрас"
- 
- #: config/microblaze/microblaze.c:1854 config/microblaze/microblaze.c:2041
--#: config/xtensa/xtensa.c:2394
-+#: config/xtensa/xtensa.c:2443
- msgid "invalid address"
- msgstr "нерэчаісны адрас"
- 
-@@ -3217,19 +3223,19 @@ msgstr "нерэчаісны адрас"
- msgid "letter %c was found & insn was not CONST_INT"
- msgstr ""
- 
--#: config/mips/mips.c:7454 config/mips/mips.c:7475 config/mips/mips.c:7595
-+#: config/mips/mips.c:7458 config/mips/mips.c:7479 config/mips/mips.c:7599
- #, fuzzy, c-format
- msgid "'%%%c' is not a valid operand prefix"
- msgstr "\"%s\" - гэта не пачатак дэкларацыі"
- 
--#: config/mips/mips.c:7532 config/mips/mips.c:7539 config/mips/mips.c:7546
--#: config/mips/mips.c:7553 config/mips/mips.c:7613 config/mips/mips.c:7627
--#: config/mips/mips.c:7640 config/mips/mips.c:7649
-+#: config/mips/mips.c:7536 config/mips/mips.c:7543 config/mips/mips.c:7550
-+#: config/mips/mips.c:7557 config/mips/mips.c:7617 config/mips/mips.c:7631
-+#: config/mips/mips.c:7644 config/mips/mips.c:7653
- #, fuzzy, c-format
- msgid "invalid use of '%%%c'"
- msgstr "нерэчаіснае выкарыстаньне `%D'"
- 
--#: config/mips/mips.c:7871
-+#: config/mips/mips.c:7875
- msgid "mips_debugger_offset called with non stack/frame/arg pointer"
- msgstr ""
- 
-@@ -3300,214 +3306,288 @@ msgstr ""
- msgid "Try running '%s' in the shell to raise its limit.\n"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:2787
-+#: config/rs6000/rs6000.c:2795
- #, fuzzy
- msgid "-mvsx requires hardware floating point"
- msgstr "Выкарыстоўваць апаратную \"плаваючую кропку\""
- 
--#: config/rs6000/rs6000.c:2792
-+#: config/rs6000/rs6000.c:2800
- msgid "-mvsx and -mpaired are incompatible"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:2797
-+#: config/rs6000/rs6000.c:2805
- msgid "-mvsx used with little endian code"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:2799
-+#: config/rs6000/rs6000.c:2807
- msgid "-mvsx needs indexed addressing"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:2803
-+#: config/rs6000/rs6000.c:2811
- msgid "-mvsx and -mno-altivec are incompatible"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:2805
-+#: config/rs6000/rs6000.c:2813
- msgid "-mno-altivec disables vsx"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:7750
-+#: config/rs6000/rs6000.c:7870
- msgid "bad move"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15577
-+#: config/rs6000/rs6000.c:15843
- #, fuzzy, c-format
- msgid "invalid %%c value"
- msgstr "дрэннае %%Q значэнне"
- 
--#: config/rs6000/rs6000.c:15605
-+#: config/rs6000/rs6000.c:15871
- #, c-format
- msgid "invalid %%f value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15614
-+#: config/rs6000/rs6000.c:15880
- #, c-format
- msgid "invalid %%F value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15623
-+#: config/rs6000/rs6000.c:15889
- #, c-format
- msgid "invalid %%G value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15658
-+#: config/rs6000/rs6000.c:15924
- #, c-format
- msgid "invalid %%j code"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15668
-+#: config/rs6000/rs6000.c:15934
- #, c-format
- msgid "invalid %%J code"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15678
-+#: config/rs6000/rs6000.c:15944
- #, c-format
- msgid "invalid %%k value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15693 config/xtensa/xtensa.c:2293
-+#: config/rs6000/rs6000.c:15959 config/xtensa/xtensa.c:2342
- #, c-format
- msgid "invalid %%K value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15757
-+#: config/rs6000/rs6000.c:16023
- #, c-format
- msgid "invalid %%O value"
- msgstr "нерэчаіснае значэньне %%O"
- 
--#: config/rs6000/rs6000.c:15804
-+#: config/rs6000/rs6000.c:16070
- #, c-format
- msgid "invalid %%q value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15848
-+#: config/rs6000/rs6000.c:16114
- #, c-format
- msgid "invalid %%S value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15888
-+#: config/rs6000/rs6000.c:16154
- #, c-format
- msgid "invalid %%T value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15898
-+#: config/rs6000/rs6000.c:16164
- #, c-format
- msgid "invalid %%u value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:15907 config/xtensa/xtensa.c:2263
-+#: config/rs6000/rs6000.c:16173 config/xtensa/xtensa.c:2312
- #, c-format
- msgid "invalid %%v value"
- msgstr ""
- 
--#: config/rs6000/rs6000.c:16006 config/xtensa/xtensa.c:2314
-+#: config/rs6000/rs6000.c:16272 config/xtensa/xtensa.c:2363
- #, fuzzy, c-format
- msgid "invalid %%x value"
- msgstr "нерэчаіснае значэньне %%x/X"
- 
--#: config/rs6000/rs6000.c:16152
-+#: config/rs6000/rs6000.c:16418
- #, fuzzy, c-format
- msgid "invalid %%y value, try using the 'Z' constraint"
- msgstr "нявернае выкарыстанне \"restict\""
- 
--#: config/rs6000/rs6000.c:27228
-+#: config/rs6000/rs6000.c:27525
- #, fuzzy
- msgid "AltiVec argument passed to unprototyped function"
- msgstr "не хапае аргументаў у функцыі"
- 
--#: config/s390/s390.c:5144
-+#: config/s390/s390.c:5206
-+#, c-format
-+msgid "symbolic memory references are only supported on z10 or later"
-+msgstr ""
-+
-+#: config/s390/s390.c:5217
- #, fuzzy, c-format
- msgid "cannot decompose address"
- msgstr "невядомая назва рэгістра: %s"
- 
--#: config/score/score3.c:1284 config/score/score3.c:1304
--#: config/score/score7.c:1272
-+#: config/s390/s390.c:5276
-+#, c-format
-+msgid "invalid comparison operator for 'E' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5297
-+#, c-format
-+msgid "invalid reference for 'J' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5311
-+#, c-format
-+msgid "memory reference expected for 'O' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5322
-+#, c-format
-+msgid "invalid address for 'O' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5340
-+#, c-format
-+msgid "memory reference expected for 'R' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5351
-+#, c-format
-+msgid "invalid address for 'R' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5369
-+#, c-format
-+msgid "memory reference expected for 'S' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5379
-+#, c-format
-+msgid "invalid address for 'S' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5399
-+#, c-format
-+msgid "register or memory expression expected for 'N' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5409
-+#, c-format
-+msgid "register or memory expression expected for 'M' output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5474
-+#, c-format
-+msgid "invalid constant - try using an output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5477
-+#, c-format
-+msgid "invalid constant for output modifier '%c'"
-+msgstr ""
-+
-+#: config/s390/s390.c:5484
-+#, c-format
-+msgid "invalid expression - try using an output modifier"
-+msgstr ""
-+
-+#: config/s390/s390.c:5487
-+#, c-format
-+msgid "invalid expression for output modifier '%c'"
-+msgstr ""
-+
-+#: config/score/score7.c:1207
- #, fuzzy, c-format
- msgid "invalid operand for code: '%c'"
- msgstr "Нерэчаісны выбар \"%s\""
- 
--#: config/sh/sh.c:1188
-+#: config/sh/sh.c:1195
- #, fuzzy, c-format
- msgid "invalid operand to %%R"
- msgstr "нерэчаісны %%-код"
- 
--#: config/sh/sh.c:1215
-+#: config/sh/sh.c:1222
- #, fuzzy, c-format
- msgid "invalid operand to %%S"
- msgstr "нерэчаісны %%-код"
- 
--#: config/sh/sh.c:9254
-+#: config/sh/sh.c:9261
- msgid "created and used with different architectures / ABIs"
- msgstr ""
- 
--#: config/sh/sh.c:9256
-+#: config/sh/sh.c:9263
- msgid "created and used with different ABIs"
- msgstr ""
- 
--#: config/sh/sh.c:9258
-+#: config/sh/sh.c:9265
- msgid "created and used with different endianness"
- msgstr ""
- 
--#: config/sparc/sparc.c:7424 config/sparc/sparc.c:7430
-+#: config/sparc/sparc.c:7441 config/sparc/sparc.c:7447
- #, c-format
- msgid "invalid %%Y operand"
- msgstr "нерэчаісны %%Y аперанд"
- 
--#: config/sparc/sparc.c:7500
-+#: config/sparc/sparc.c:7517
- #, c-format
- msgid "invalid %%A operand"
- msgstr "нерэчаісны %%A аперанд"
- 
--#: config/sparc/sparc.c:7510
-+#: config/sparc/sparc.c:7527
- #, c-format
- msgid "invalid %%B operand"
- msgstr "нерэчаісны %%B аперанд"
- 
--#: config/sparc/sparc.c:7549
-+#: config/sparc/sparc.c:7566
- #, c-format
- msgid "invalid %%c operand"
- msgstr "нерэчаісны %%c аперанд"
- 
--#: config/sparc/sparc.c:7571
-+#: config/sparc/sparc.c:7588
- #, c-format
- msgid "invalid %%d operand"
- msgstr "нерэчаісны %%d аперанд"
- 
--#: config/sparc/sparc.c:7588
-+#: config/sparc/sparc.c:7605
- #, c-format
- msgid "invalid %%f operand"
- msgstr "нерэчаісны %%f аперанд"
- 
--#: config/sparc/sparc.c:7602
-+#: config/sparc/sparc.c:7619
- #, fuzzy, c-format
- msgid "invalid %%s operand"
- msgstr "нерэчаісны %%-код"
- 
--#: config/sparc/sparc.c:7656
-+#: config/sparc/sparc.c:7673
- #, c-format
- msgid "long long constant not a valid immediate operand"
- msgstr ""
- 
--#: config/sparc/sparc.c:7659
-+#: config/sparc/sparc.c:7676
- #, c-format
- msgid "floating point constant not a valid immediate operand"
- msgstr ""
- 
--#: config/stormy16/stormy16.c:1748 config/stormy16/stormy16.c:1819
-+#: config/stormy16/stormy16.c:1717 config/stormy16/stormy16.c:1788
- #, fuzzy, c-format
- msgid "'B' operand is not constant"
- msgstr "тып параметра \"%s\" не аб'яўлены"
- 
--#: config/stormy16/stormy16.c:1775
-+#: config/stormy16/stormy16.c:1744
- #, c-format
- msgid "'B' operand has multiple bits set"
- msgstr ""
- 
--#: config/stormy16/stormy16.c:1801
-+#: config/stormy16/stormy16.c:1770
- #, fuzzy, c-format
- msgid "'o' operand is not constant"
- msgstr "тып параметра \"%s\" не аб'яўлены"
- 
--#: config/stormy16/stormy16.c:1833
-+#: config/stormy16/stormy16.c:1802
- #, c-format
- msgid "xstormy16_print_operand: unknown code"
- msgstr ""
-@@ -3540,48 +3620,48 @@ msgstr ""
- msgid "illegal operand detected"
- msgstr "Нерэчаісны выбар \"%s\""
- 
--#: config/xtensa/xtensa.c:740 config/xtensa/xtensa.c:772
--#: config/xtensa/xtensa.c:781
-+#: config/xtensa/xtensa.c:774 config/xtensa/xtensa.c:806
-+#: config/xtensa/xtensa.c:815
- msgid "bad test"
- msgstr ""
- 
--#: config/xtensa/xtensa.c:2251
-+#: config/xtensa/xtensa.c:2300
- #, fuzzy, c-format
- msgid "invalid %%D value"
- msgstr "дрэннае %%Q значэнне"
- 
--#: config/xtensa/xtensa.c:2288
-+#: config/xtensa/xtensa.c:2337
- msgid "invalid mask"
- msgstr "нерэчаісная маска"
- 
--#: config/xtensa/xtensa.c:2321
-+#: config/xtensa/xtensa.c:2370
- #, fuzzy, c-format
- msgid "invalid %%d value"
- msgstr "дрэннае %%Q значэнне"
- 
--#: config/xtensa/xtensa.c:2342 config/xtensa/xtensa.c:2352
-+#: config/xtensa/xtensa.c:2391 config/xtensa/xtensa.c:2401
- #, fuzzy, c-format
- msgid "invalid %%t/%%b value"
- msgstr "нерэчаіснае значэньне %%x/X"
- 
--#: config/xtensa/xtensa.c:2419
-+#: config/xtensa/xtensa.c:2468
- #, fuzzy
- msgid "no register in address"
- msgstr "невядомая назва рэгістра: %s"
- 
--#: config/xtensa/xtensa.c:2427
-+#: config/xtensa/xtensa.c:2476
- msgid "address offset not a constant"
- msgstr ""
- 
--#: cp/call.c:7841
-+#: cp/call.c:7859
- msgid "candidate 1:"
- msgstr ""
- 
--#: cp/call.c:7842
-+#: cp/call.c:7860
- msgid "candidate 2:"
- msgstr ""
- 
--#: cp/cxx-pretty-print.c:172 objc/objc-act.c:8958
-+#: cp/cxx-pretty-print.c:172 objc/objc-act.c:5989
- msgid "<unnamed>"
- msgstr ""
- 
-@@ -3594,7 +3674,7 @@ msgstr "невыкарыстаемы параметр \"%s\""
- msgid "candidates are: %+#D"
- msgstr ""
- 
--#: cp/decl2.c:727 cp/pt.c:1726
-+#: cp/decl2.c:727 cp/pt.c:1721
- #, gcc-internal-format
- msgid "candidate is: %+#D"
- msgstr ""
-@@ -3693,108 +3773,108 @@ msgstr "граматычная памылка"
- msgid "<unknown operator>"
- msgstr ""
- 
--#: cp/error.c:2594
-+#: cp/error.c:2598
- msgid "<unknown>"
- msgstr ""
- 
--#: cp/error.c:2614
-+#: cp/error.c:2618
- msgid "{unknown}"
- msgstr ""
- 
--#: cp/error.c:2698
-+#: cp/error.c:2702
- msgid "At global scope:"
- msgstr ""
- 
--#: cp/error.c:2804
-+#: cp/error.c:2808
- #, fuzzy, c-format
- msgid "In static member function %qs"
- msgstr "у функцыі \"%s\":"
- 
--#: cp/error.c:2806
-+#: cp/error.c:2810
- #, fuzzy, c-format
- msgid "In copy constructor %qs"
- msgstr "У канструкцыі"
- 
--#: cp/error.c:2808
-+#: cp/error.c:2812
- #, fuzzy, c-format
- msgid "In constructor %qs"
- msgstr "У канструкцыі"
- 
--#: cp/error.c:2810
-+#: cp/error.c:2814
- #, fuzzy, c-format
- msgid "In destructor %qs"
- msgstr "У канструкцыі"
- 
--#: cp/error.c:2812
-+#: cp/error.c:2816
- #, fuzzy
- msgid "In lambda function"
- msgstr "У функцыі"
- 
--#: cp/error.c:2842
-+#: cp/error.c:2846
- #, c-format
- msgid "%s: In instantiation of %qs:\n"
- msgstr ""
- 
--#: cp/error.c:2874
-+#: cp/error.c:2878
- #, c-format
- msgid "%s:%d:%d:   recursively instantiated from %qs\n"
- msgstr ""
- 
--#: cp/error.c:2875
-+#: cp/error.c:2879
- #, c-format
- msgid "%s:%d:%d:   instantiated from %qs\n"
- msgstr ""
- 
--#: cp/error.c:2880 cp/error.c:2881
-+#: cp/error.c:2884 cp/error.c:2885
- #, c-format
- msgid "%s:%d:   recursively instantiated from %qs\n"
- msgstr ""
- 
--#: cp/error.c:2889
-+#: cp/error.c:2893
- #, c-format
- msgid "%s:%d:%d:   recursively instantiated from here"
- msgstr ""
- 
--#: cp/error.c:2890
-+#: cp/error.c:2894
- #, c-format
- msgid "%s:%d:%d:   instantiated from here"
- msgstr ""
- 
--#: cp/error.c:2895
-+#: cp/error.c:2899
- #, c-format
- msgid "%s:%d:   recursively instantiated from here"
- msgstr ""
- 
--#: cp/error.c:2896
-+#: cp/error.c:2900
- #, c-format
- msgid "%s:%d:   instantiated from here"
- msgstr ""
- 
--#: cp/error.c:2939
-+#: cp/error.c:2943
- #, c-format
- msgid "%s:%d:%d:   [ skipping %d instantiation contexts ]\n"
- msgstr ""
- 
--#: cp/error.c:2943
-+#: cp/error.c:2947
- #, c-format
- msgid "%s:%d:   [ skipping %d instantiation contexts ]\n"
- msgstr ""
- 
--#: cp/error.c:3005
-+#: cp/error.c:3009
- #, c-format
- msgid "%s:%d:%d:   in constexpr expansion of %qs"
- msgstr ""
- 
--#: cp/error.c:3009
-+#: cp/error.c:3013
- #, c-format
- msgid "%s:%d:   in constexpr expansion of %qs"
- msgstr ""
- 
--#: cp/pt.c:1730
-+#: cp/pt.c:1725
- msgid "candidates are:"
- msgstr ""
- 
--#: cp/pt.c:16515 cp/call.c:3072
-+#: cp/pt.c:16583 cp/call.c:3084
- #, gcc-internal-format
- msgid "candidate is:"
- msgid_plural "candidates are:"
-@@ -3924,17 +4004,17 @@ msgstr ""
- msgid "elemental binary operation"
- msgstr "прапушчан ініцыялізатар"
- 
--#: fortran/check.c:1473 fortran/check.c:2351 fortran/check.c:2405
-+#: fortran/check.c:1502 fortran/check.c:2380 fortran/check.c:2434
- #, c-format
- msgid "arguments '%s' and '%s' for intrinsic %s"
- msgstr ""
- 
--#: fortran/check.c:2157
-+#: fortran/check.c:2186
- #, c-format
- msgid "arguments 'a%d' and 'a%d' for intrinsic '%s'"
- msgstr ""
- 
--#: fortran/check.c:2633 fortran/intrinsic.c:3912
-+#: fortran/check.c:2662 fortran/intrinsic.c:3914
- #, c-format
- msgid "arguments '%s' and '%s' for intrinsic '%s'"
- msgstr ""
-@@ -3969,7 +4049,7 @@ msgstr ""
- msgid "Integer value too large in expression at %C"
- msgstr ""
- 
--#: fortran/expr.c:3141
-+#: fortran/expr.c:3143
- msgid "array assignment"
- msgstr ""
- 
-@@ -3988,7 +4068,7 @@ msgstr ""
- msgid "Driving:"
- msgstr "увага:"
- 
--#: fortran/interface.c:2238 fortran/intrinsic.c:3621
-+#: fortran/interface.c:2284 fortran/intrinsic.c:3623
- msgid "actual argument to INTENT = OUT/INOUT"
- msgstr ""
- 
-@@ -4049,18 +4129,18 @@ msgstr ""
- msgid "Period required in format specifier"
- msgstr ""
- 
--#: fortran/io.c:1521
-+#: fortran/io.c:1524
- #, c-format
- msgid "%s tag"
- msgstr ""
- 
--#: fortran/io.c:2818
-+#: fortran/io.c:2830
- msgid "internal unit in WRITE"
- msgstr ""
- 
- #. For INQUIRE, all tags except FILE, ID and UNIT are variable definition
- #. contexts.  Thus, use an extended RESOLVE_TAG macro for that.
--#: fortran/io.c:3999
-+#: fortran/io.c:4025
- #, c-format
- msgid "%s tag with INQUIRE"
- msgstr ""
-@@ -4106,7 +4186,7 @@ msgstr ""
- msgid "Expected integer"
- msgstr ""
- 
--#: fortran/module.c:1265
-+#: fortran/module.c:1265 fortran/module.c:2158
- msgid "Expected string"
- msgstr ""
- 
-@@ -4114,215 +4194,215 @@ msgstr ""
- msgid "find_enum(): Enum not found"
- msgstr ""
- 
--#: fortran/module.c:1908
-+#: fortran/module.c:1916
- msgid "Expected attribute bit name"
- msgstr ""
- 
--#: fortran/module.c:2777
-+#: fortran/module.c:2808
- msgid "Expected integer string"
- msgstr ""
- 
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.3.4

Part of the diff is not shown here. View the raw message.

#11 lore raw
In reply to Saul Wold
Quoted 5 lines · Saul Wold

Kang Kai (1):
ghostscript: update SRC_URI

Nitin A Kamble (1):
gcc: rebase the patch to avoid patch rejection

This was a disaster. It breaks the build and is huge, thereby clogging up the source control system web interface etc.

I applied it, then had to revert it. Please test things like this more carefully in future.

I also think we need to put these kind of patches on the website or in a repo, we shouldn't be carrying them around in the main repo.

Quoted 5 lines

Phil Blundell (1):
busybox: backport distro-features handling from oe master

Saul Wold (1):
multiple recipes converted to -staticdev packages

I'm with Phil on this one, needs more work.

I haven't got to the other two since the gcc issue distracted me :/.

Cheers,

Richard

author
#12 lore raw
Quoted 16 lines · Richard Purdie
Quoted 5 lines · Saul Wold

Kang Kai (1):
ghostscript: update SRC_URI

Nitin A Kamble (1):
gcc: rebase the patch to avoid patch rejection

This was a disaster. It breaks the build and is huge, thereby clogging up the source control system web interface etc.

I applied it, then had to revert it. Please test things like this more carefully in future.

I also think we need to put these kind of patches on the website or in a repo, we shouldn't be carrying them around in the main repo.

Quoted 8 lines
Quoted 5 lines

Phil Blundell (1):
busybox: backport distro-features handling from oe master

Saul Wold (1):
multiple recipes converted to -staticdev packages

I'm with Phil on this one, needs more work.

Sorry about this one, I thought I had it further along, I guess I had a cut and paste failure (dropping the R from RDEPENDS).

Quoted 2 lines

I haven't got to the other two since the gcc issue distracted me :/.

I did run multiple builds without failure, so I am not sure what happened with the gcc failure.

Sau!

Quoted 10 lines

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#13 lore raw
In reply to Richard Purdie

Op 10 jun 2011, om 18:33 heeft Richard Purdie het volgende geschreven:

Quoted 7 lines · Saul Wold
Quoted 5 lines

Kang Kai (1):
ghostscript: update SRC_URI

Nitin A Kamble (1):
gcc: rebase the patch to avoid patch rejection

Quoted 8 lines

This was a disaster. It breaks the build and is huge, thereby clogging up the source control system web interface etc.

I applied it, then had to revert it. Please test things like this more carefully in future.

I also think we need to put these kind of patches on the website or in a repo, we shouldn't be carrying them around in the main repo.

Having patches external to the layer is a recipe for failure, if you excude the pun. I've had to deal with patches disappearing/changing/etc a lot during the past months in the .dev world and I don't look forward to continuing those mistakes in the oe-core world.

regards,

Koen