[oe-commits] org.oe.dev gcc-cross: package libgcc-dev (named libgcc-s-dev :(

[hrw commit]

gcc-cross: package libgcc-dev (named libgcc-s-dev :(

applied changes from 515587ac4598d7ab78bd946632a31cf94fa79bf8 (.oz354x)
             through 33d804e082e0702e05818192cfab8a8610605d88

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3c6681afd9a22ac4ac087acf043f47232802eefd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3c6681afd9a22ac4ac087acf043f47232802eefd
Files:
1
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc-package-cross.inc
Diffs:

#
# mt diff -rd8437cdae30dd5198f8a9cded7d648b52775817d -r3c6681afd9a22ac4ac087acf043f47232802eefd
#
# 
# 
# patch "packages/gcc/gcc-cross_3.4.4.bb"
#  from [23229adf727ba75c8c542d2cf9a347c771d31ddb]
#    to [7f0601af643610c6529ac8e6e52c77092772682a]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [49c1534f66e5c4a0e16b19d43607b9bd8c5a34ee]
#    to [5a63896579b1e42c3a741479784c26f00d75d208]
# 
============================================================
--- packages/gcc/gcc-cross_3.4.4.bb	23229adf727ba75c8c542d2cf9a347c771d31ddb
+++ packages/gcc/gcc-cross_3.4.4.bb	7f0601af643610c6529ac8e6e52c77092772682a
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-package-cross.inc	49c1534f66e5c4a0e16b19d43607b9bd8c5a34ee
+++ packages/gcc/gcc-package-cross.inc	5a63896579b1e42c3a741479784c26f00d75d208
@@ -6,7 +6,7 @@ INHIBIT_PACKAGE_STRIP = "1"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
+PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
 PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
 
 PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
@@ -26,7 +26,9 @@ PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
 			 ${target_libdir}/libgfortranbegin.a"
 
 PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
+PACKAGE_ARCH_libgcc-dev = "${TARGET_ARCH}"
 FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
+FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so"
 
 PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
 PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
@@ -53,9 +55,9 @@ do_install () {
 		# Already in the right location
 		:
 	elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${target_base_libdir}
+		mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir}
 	else
-		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${target_base_libdir}
+		mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir}
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr