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

[hrw commit]

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

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

#
# mt diff -r515587ac4598d7ab78bd946632a31cf94fa79bf8 -r33d804e082e0702e05818192cfab8a8610605d88
#
# 
# 
# patch "packages/gcc/gcc-cross_3.4.4.bb"
#  from [d40f6a3579a7c9357230e4353d696b4696fadd5e]
#    to [6448d53a22067c52fc7ac5f39f7f91dbf429b01a]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [503316fc7bee198b4440533c86044f210fec429c]
#    to [b09ec97195ef6c03910ac509a48a97d354297821]
# 
============================================================
--- packages/gcc/gcc-cross_3.4.4.bb	d40f6a3579a7c9357230e4353d696b4696fadd5e
+++ packages/gcc/gcc-cross_3.4.4.bb	6448d53a22067c52fc7ac5f39f7f91dbf429b01a
@@ -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	503316fc7bee198b4440533c86044f210fec429c
+++ packages/gcc/gcc-package-cross.inc	b09ec97195ef6c03910ac509a48a97d354297821
@@ -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"
 
 PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
 PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
@@ -25,7 +25,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}"
@@ -52,9 +54,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