diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils.inc')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils.inc | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa586d..5b4a339209 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc | |||
@@ -13,17 +13,12 @@ LICENSE = "GPLv3" | |||
13 | 13 | ||
14 | DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" | 14 | DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" |
15 | 15 | ||
16 | # | ||
17 | # we need chrpath > 0.14 and some distros like centos 7 still have older chrpath | ||
18 | # | ||
19 | DEPENDS_append_class-target = " chrpath-replacement-native" | ||
20 | EXTRANATIVEPATH_append_class-target = " chrpath-native" | ||
21 | |||
22 | inherit autotools gettext multilib_header texinfo | 16 | inherit autotools gettext multilib_header texinfo |
23 | 17 | ||
24 | FILES_${PN} = " \ | 18 | FILES_${PN} = " \ |
25 | ${bindir}/${TARGET_PREFIX}* \ | 19 | ${bindir}/${TARGET_PREFIX}* \ |
26 | ${libdir}/lib*-*.so \ | 20 | ${libdir}/lib*.so.* \ |
21 | ${libdir}/lib*-${PV}*.so \ | ||
27 | ${prefix}/${TARGET_SYS}/bin/* \ | 22 | ${prefix}/${TARGET_SYS}/bin/* \ |
28 | ${bindir}/embedspu" | 23 | ${bindir}/embedspu" |
29 | 24 | ||
@@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ | |||
33 | ${includedir} \ | 28 | ${includedir} \ |
34 | ${libdir}/*.la \ | 29 | ${libdir}/*.la \ |
35 | ${libdir}/libbfd.so \ | 30 | ${libdir}/libbfd.so \ |
31 | ${libdir}/libctf.so \ | ||
32 | ${libdir}/libctf-nobfd.so \ | ||
36 | ${libdir}/libopcodes.so" | 33 | ${libdir}/libopcodes.so" |
37 | 34 | ||
38 | # Rather than duplicating multiple entries for these, make one | 35 | # Rather than duplicating multiple entries for these, make one |
@@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ | |||
80 | ${LDGOLD} \ | 77 | ${LDGOLD} \ |
81 | ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" | 78 | ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" |
82 | 79 | ||
80 | EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " | ||
81 | |||
83 | LDGOLD_class-native = "" | 82 | LDGOLD_class-native = "" |
84 | LDGOLD_class-crosssdk = "" | 83 | LDGOLD_class-crosssdk = "" |
85 | LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" | 84 | LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" |
@@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" | |||
112 | MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" | 111 | MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" |
113 | do_configure[vardeps] += "MULTIARCH" | 112 | do_configure[vardeps] += "MULTIARCH" |
114 | do_configure () { | 113 | do_configure () { |
115 | (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" | 114 | (for d in . bfd binutils gas gold gprof ld libctf opcodes; do |
115 | cd ${S}/$d | ||
116 | autoconf | ||
117 | rm -rf autom4te.cache | ||
118 | done | ||
119 | cd ${S} | ||
120 | gnu-configize) | ||
121 | |||
116 | oe_runconf | 122 | oe_runconf |
117 | # | 123 | # |
118 | # must prime config.cache to ensure the build of libiberty | 124 | # must prime config.cache to ensure the build of libiberty |
@@ -123,10 +129,6 @@ do_configure () { | |||
123 | done | 129 | done |
124 | } | 130 | } |
125 | 131 | ||
126 | do_compile_append_class-target() { | ||
127 | chrpath -d ${B}/binutils/elfedit | ||
128 | chrpath -d ${B}/binutils/readelf | ||
129 | } | ||
130 | do_install () { | 132 | do_install () { |
131 | autotools_do_install | 133 | autotools_do_install |
132 | 134 | ||