Number of multilib related fixes

new file mode 100644
index 0000000..867bce4
@@ -0,0 +1,29 @@
+inherit siteinfo
+
+# If applicable on the architecture, this routine will rename the header and add
+# a unique identifier to the name for the ABI/bitsize that is being used.  A wrapper will
+# be generated for the architecture that knows how to call all of the ABI variants for that
+# given architecture.
+#
+# TODO: mips64 n32 is not yet recognized in this code
+# when that is identified the name of the wrapped item should be "n32" and appropriately
+# determined int he if coding...
+#
+oe_multilib_header() {
+	# Do nothing on ARM, only one ABI is supported at once
+	if echo ${TARGET_ARCH} | grep -q arm; then
+	    return
+	fi
+	for each_header in "$@" ; do
+	   if [ ! -f "${D}/${includedir}/$each_header" ]; then
+	      bberror "oe_multilib_header: Unable to find header $each_header."
+	      continue
+	   fi
+	   stem=$(echo $each_header | sed 's#\.h$##')
+	   ident=${SITEINFO_BITS}
+	   # if mips64/n32 set ident to n32
+	   mv ${D}/${includedir}/$each_header ${D}/${includedir}/${stem}-${ident}.h
+
+	   sed -e "s#ENTER_HEADER_FILENAME_HERE#${stem}#g" ${COREBASE}/scripts/multilib_header_wrapper.h > ${D}/${includedir}/$each_header
+	done
+}

index 9a6b9c8..58fee85 100644
@@ -13,7 +13,7 @@ LICENSE = "GPLv3"
 
 DEPENDS = "flex-native bison-native zlib-native"
 
-inherit autotools gettext
+inherit autotools gettext multilib_header
 
 PACKAGES += "${PN}-symlinks"
 

@@ -116,6 +116,8 @@ do_install () {
 	done
 
 	rm ${D}${bindir}/ar ${D}${bindir}/strings
+
+	oe_multilib_header bfd.h
 }
 
 do_install_virtclass-native () {

index e1a16a6..1f36117 100644
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\

index 89bdadf..b37001d 100644
@@ -6,7 +6,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
                     file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
            file://configure_fixes.patch;patch=1 \

@@ -17,7 +17,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
 SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
 SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
 
-inherit autotools lib_package binconfig
+inherit autotools lib_package binconfig multilib_header
 
 OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
 

@@ -34,6 +34,10 @@ do_configure_append() {
 	sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk
 }
 
+do_install_append() {
+	oe_multilib_header apr.h
+}
+
 SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
 
 apr_sysroot_preprocess () {

index f660641..2913b46 100644
@@ -17,11 +17,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
 
 DEPENDS = "icu"
 
-PR = "r0"
+PR = "r1"
 
-inherit autotools
+inherit autotools multilib_header
 acpaths=""
 
+do_install_append() {
+	oe_multilib_header beecrypt/gnu.h
+}
+
 EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
 
 FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"

index a9b041f..1c709cb 100644
@@ -10,7 +10,7 @@ RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
 SRCREV = "69cfbdf9f1ff461a75e5b77d6d7ba35e97db4cc3"
 PV = "2.6.37+git-${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRCREV_FORMAT = "meta_machine"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"

@@ -47,6 +47,9 @@ do_compile () {
 do_install() {
 	set_arch
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+
+        # The ..install.cmd conflicts between various configure runs
+        find ${D}${includedir} -name ..install.cmd | xargs rm -f
 }
 
 BBCLASSEXTEND = "nativesdk"

index 51c4926..55d7527 100644
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://connector-msg-size-fix.patch"
 

@@ -43,6 +43,9 @@ do_install() {
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 	# Kernel should not be exporting this header
 	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+	# The ..install.cmd conflicts between various configure runs
+	find ${D}${includedir} -name ..install.cmd | xargs rm -f
 }
 
 BBCLASSEXTEND = "nativesdk"

index 65c19ec..14f5e8a 100644
@@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d4
 
 S = "${WORKDIR}/linux-${PV}"
 
+PR = "r2"
+
 set_arch() {
 	case ${TARGET_ARCH} in
 		alpha*)   ARCH=alpha ;;

@@ -44,6 +46,9 @@ do_install() {
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 	# Kernel should not be exporting this header
 	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+        # The ..install.cmd conflicts between various configure runs
+        find ${D}${includedir} -name ..install.cmd | xargs rm -f
 }
 
 BBCLASSEXTEND = "nativesdk"

index 9e71150..a995f4f 100644
@@ -86,10 +86,12 @@ SUMMARY_eglibc-utils = "Miscellaneous utilities provided by eglibc"
 DESCRIPTION_eglibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..."
 DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
 
-inherit libc-common
+inherit libc-common multilib_header
 
 do_install_append () {
 	rm -f ${D}${sysconfdir}/localtime
+
+	oe_multilib_header bits/syscall.h
 }
 
 do_install_locale () {

97 lines not on this page · raw message

index 1e139a3..be7d387 100644
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_virtclass-native = ""
-INC_PR = "r0"
+INC_PR = "r1"
 
-inherit autotools binconfig
+inherit autotools binconfig multilib_header
 
 # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"

@@ -61,6 +61,7 @@ do_configure() {
                         --enable-sigwinch \
                         --enable-pc-files \
                         --disable-rpath-hack \
+                        --with-manpage-format=normal \
                         "$@"
                 cd ..
         done

@@ -161,6 +162,8 @@ do_install() {
         f=${D}${libdir}/libtermcap.so
         echo '/* GNU ld script */' >$f
         echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f
+
+	oe_multilib_header curses.h
 }
 
 python populate_packages_prepend () {

index f2950e2..076a532 100644
@@ -472,7 +472,7 @@ python fixup_perms () {
 			else:
 				return int(mode,8)
 
-		# Note uid/gid -1 has special significance in os.chown
+		# Note uid/gid -1 has special significance in os.lchown
 		def _procuid(self, uid):
 			if uid is None or uid == "-":
 				return -1

@@ -514,14 +514,14 @@ python fixup_perms () {
 
 	# Fix the permission, owner and group of path
 	def fix_perms(path, mode, uid, gid, dir):
-		if mode:
+		if mode and not os.path.islink(path):
 			#bb.note("Fixup Perms: chmod 0%o %s" % (mode, dir))
 			os.chmod(path, mode)
 		# -1 is a special value that means don't change the uid/gid
-		# if they are BOTH -1, don't bother to chown
+		# if they are BOTH -1, don't bother to lchown
 		if not (uid == -1 and gid == -1):
-			#bb.note("Fixup Perms: chown %d:%d %s" % (uid, gid, dir))
-			os.chown(path, uid, gid)
+			#bb.note("Fixup Perms: lchown %d:%d %s" % (uid, gid, dir))
+			os.lchown(path, uid, gid)
 
 	# Return a list of configuration files based on either the default
 	# files/fs-perms.txt or the contents of FILESYSTEM_PERMS_TABLES