icecc-create-env: Upgrade script
PATCH v3 1/1 icecc-create-env: Upgrade script
The original icecc script does not handle toolchain content properly, resulting in build failures, such as
gxx: fatal error: -fuse-linker-plugin, but liblto_plugin.so not found
This patch brings in the latest script form the icecream source, and modifies it for use in the OE build environment. The change was tested with OE-Core built toolchain, and external toolchain.
--- .../icecc-create-env-native_0.1.bb | 35 --- .../icecc-create-env-native_1.0.1.bb | 35 +++ .../icecc-create-env/icecc-create-env | 266 +++++++++++++++----- 3 files changed, 242 insertions(+), 94 deletions(-) delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb mode change 100755 => 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb deleted +0 -35
@@ -1,35 +0,0 @@ -DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ -make it work with OE." -SECTION = "base" -# source file has just a "GPL" word, but upstream is GPLv2+. -# most probably just GPL would be a mistake -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" - -PR = "r2" - -DEPENDS = "" -INHIBIT_DEFAULT_DEPS = "1" - -inherit native - -# This is needed, because otherwise there is dependency loop from quilt-native -# Dependency loop #1 found: -# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_install) (dependent Tasks ['quilt-native, do_compile']) -# Task 10908 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_populate_sysroot) (dependent Tasks ['quilt-native, do_install']) -# Task 10997 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_patch) (dependent Tasks ['icecc-create-env-native, do_unpack', 'quilt-native, do_populate_sysroot']) -# Task 11001 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_configure) (dependent Tasks ['icecc-create-env-native, do_patch']) -# Task 11002 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_compile) (dependent Tasks ['icecc-create-env-native, do_configure']) -# Task 10998 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_install) (dependent Tasks ['icecc-create-env-native, do_compile']) -# Task 10999 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_populate_sysroot) (dependent Tasks ['icecc-create-env-native, do_install']) -# Task 10910 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_configure) (dependent Tasks ['quilt-native, do_patch', 'icecc-create-env-native, do_populate_sysroot']) -# Task 10911 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_compile) (dependent Tasks ['quilt-native, do_configure']) -PATCHTOOL = "patch" -SRC_URI = "file://icecc-create-env" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} -}
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb new file +35 -0
@@ -0,0 +1,35 @@ +DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ +make it work with OE." +SECTION = "base" +# source file has just a "GPL" word, but upstream is GPLv2+. +# most probably just GPL would be a mistake +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" + +PR = "r2" + +DEPENDS = "" +INHIBIT_DEFAULT_DEPS = "1" + +inherit native + +# This is needed, because otherwise there is dependency loop from quilt-native +# Dependency loop #1 found: +# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_install) (dependent Tasks ['quilt-native, do_compile']) +# Task 10908 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_populate_sysroot) (dependent Tasks ['quilt-native, do_install']) +# Task 10997 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_patch) (dependent Tasks ['icecc-create-env-native, do_unpack', 'quilt-native, do_populate_sysroot']) +# Task 11001 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_configure) (dependent Tasks ['icecc-create-env-native, do_patch']) +# Task 11002 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_compile) (dependent Tasks ['icecc-create-env-native, do_configure']) +# Task 10998 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_install) (dependent Tasks ['icecc-create-env-native, do_compile']) +# Task 10999 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_populate_sysroot) (dependent Tasks ['icecc-create-env-native, do_install']) +# Task 10910 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_configure) (dependent Tasks ['quilt-native, do_patch', 'icecc-create-env-native, do_populate_sysroot']) +# Task 10911 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_compile) (dependent Tasks ['quilt-native, do_configure']) +PATCHTOOL = "patch" +SRC_URI = "file://icecc-create-env" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} +}
meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env +207 -59
309 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Quoted 66 lines · Iyad Qumei
The original icecc script does not handle toolchain content properly, resulting in build failures, such as
gxx: fatal error: -fuse-linker-plugin, but liblto_plugin.so not found
This patch brings in the latest script form the icecream source, and modifies it for use in the OE build environment. The change was tested with OE-Core built toolchain, and external toolchain.
Signed-off-by Iyad Qumei <[email protected]>--- .../icecc-create-env-native_0.1.bb | 35 --- .../icecc-create-env-native_1.0.1.bb | 35 +++ .../icecc-create-env/icecc-create-env | 266 +++++++++++++++----- 3 files changed, 242 insertions(+), 94 deletions(-) delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb mode change 100755 => 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-envmeta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb deleted +0
-35@@ -1,35 +0,0 @@ -DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ -make it work with OE." -SECTION = "base" -# source file has just a "GPL" word, but upstream is GPLv2+. -# most probably just GPL would be a mistake -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" - -PR = "r2" - -DEPENDS = "" -INHIBIT_DEFAULT_DEPS = "1" - -inherit native - -# This is needed, because otherwise there is dependency loop from quilt-native -# Dependency loop #1 found: -# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_install) (dependent Tasks ['quilt-native, do_compile']) -# Task 10908 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_populate_sysroot) (dependent Tasks ['quilt-native, do_install']) -# Task 10997 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_patch) (dependent Tasks ['icecc-create-env-native, do_unpack', 'quilt-native, do_populate_sysroot']) -# Task 11001 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_configure) (dependent Tasks ['icecc-create-env-native, do_patch']) -# Task 11002 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_compile) (dependent Tasks ['icecc-create-env-native, do_configure']) -# Task 10998 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_install) (dependent Tasks ['icecc-create-env-native, do_compile']) -# Task 10999 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_populate_sysroot) (dependent Tasks ['icecc-create-env-native, do_install']) -# Task 10910 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_configure) (dependent Tasks ['quilt-native, do_patch', 'icecc-create-env-native, do_populate_sysroot']) -# Task 10911 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_compile) (dependent Tasks ['quilt-native, do_configure']) -PATCHTOOL = "patch" -SRC_URI = "file://icecc-create-env" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} -}meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb new file +0
-0
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb line 9
Quoted 9 lines
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb new file +9
-0@@ -0,0 +1,35 @@ +DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\ +make it work with OE." +SECTION = "base" +# source file has just a "GPL" word, but upstream is GPLv2+. +# most probably just GPL would be a mistake +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" + +PR = "r2"
Drop and resend with -M.
Quoted 351 lines
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb new file +26
-0+ +DEPENDS = "" +INHIBIT_DEFAULT_DEPS = "1" + +inherit native + +# This is needed, because otherwise there is dependency loop from quilt-native +# Dependency loop #1 found: +# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_install) (dependent Tasks ['quilt-native, do_compile']) +# Task 10908 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_populate_sysroot) (dependent Tasks ['quilt-native, do_install']) +# Task 10997 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_patch) (dependent Tasks ['icecc-create-env-native, do_unpack', 'quilt-native, do_populate_sysroot']) +# Task 11001 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_configure) (dependent Tasks ['icecc-create-env-native, do_patch']) +# Task 11002 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_compile) (dependent Tasks ['icecc-create-env-native, do_configure']) +# Task 10998 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_install) (dependent Tasks ['icecc-create-env-native, do_compile']) +# Task 10999 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb, do_populate_sysroot) (dependent Tasks ['icecc-create-env-native, do_install']) +# Task 10910 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_configure) (dependent Tasks ['quilt-native, do_patch', 'icecc-create-env-native, do_populate_sysroot']) +# Task 10911 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_compile) (dependent Tasks ['quilt-native, do_configure']) +PATCHTOOL = "patch" +SRC_URI = "file://icecc-create-env" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} +}meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env +207
-59@@ -29,33 +29,95 @@ add_file () toadd="$name=$path" is_contained "$toadd" && return if test -z "$silent"; then - echo "adding file $toadd" + echo "adding file $toadd" fi target_files="$target_files $toadd" if test -x "$path"; then # Only call ldd when it makes sense if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then - if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then - # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc - # this regexp parse the outputs like: - # ldd /usr/bin/gcc - # linux-gate.so.1 => (0xffffe000) - # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000) - # /lib/ld-linux.so.2 (0xb7fe8000) - # covering both situations ( with => and without ) - for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do - test -f "$lib" || continue - # Check wether the same library also exists in the parent directory, - # and prefer that on the assumption that it is a more generic one. - local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'` - test -f "$baselib" && lib=$baselib - add_file "$lib" - done + if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then + # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc + # this regexp parse the outputs like: + # ldd /usr/bin/gcc + # linux-gate.so.1 => (0xffffe000) + # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000) + # /lib/ld-linux.so.2 (0xb7fe8000) + # covering both situations ( with => and without ) + for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do + test -f "$lib" || continue + # Check wether the same library also exists in the parent directory, + # and prefer that on the assumption that it is a more generic one. + local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'` + test -f "$baselib" && lib=$baselib + add_file "$lib" + done fi fi fi } +# returns abs path to filedir +abs_path() +{ + local path=$1 + if test -f "$path"; then + pushd $(dirname $path) > /dev/null 2>&1 + dir_path=`pwd -P` + path=$dir_path/$(basename $path) + popd > /dev/null 2>&1 + elif test -d "$path"; then + pushd $path > /dev/null 2>&1 + path=`pwd -P` + popd > /dev/null 2>&1 + fi + echo $path +} + +# Search and add file to the tarball file. +search_addfile() +{ + local compiler=$1 + local file_name=$2 + local file_installdir=$3 + local file="" + + file=$($compiler -print-prog-name=$file_name) + + if test -z "$file" || test "$file" = "$file_name" || ! test -e "$file"; then + file=`$compiler -print-file-name=$file_name` + fi + + if ! test -e "$file"; then + return 1 + fi + + if test -z "$file_installdir"; then + # The file is going to be added to the tarball + # in the same path where the compiler found it. + + file_installdir=$(dirname $file) + abs_installdir=$(abs_path $file_installdir) + + if test "$file_installdir" != "$abs_installdir"; then + # The path where the compiler found the file is relative! + # If the path where the compiler found the file is relative + # to compiler's path, we must change it to be relative to + # /usr/bin path where the compiler is going to be installed + # in the tarball file. + # Replacing relative path by abs path because the tar command + # used to create the tarball file doesn't work well with + # relative path as installdir. + + compiler_basedir=$(abs_path ${compiler%/*/*}) + file_installdir=${abs_installdir/$compiler_basedir/"/usr"} + fi + fi + + add_file "$file" "$file_installdir/$file_name" + + return 0 +} + # backward compat if test "$1" = "--respect-path"; then shift@@ -67,62 +129,148 @@ if test "$1" = "--silent"; then shift fi - -added_gcc=$1 -shift -added_gxx=$1 -shift -added_as=$1 -shift -archive_name=$1 - -if test -z "$added_gcc" || test -z "$added_gxx" ; then - echo "usage: $0 <gcc_path> <g++_path>" - exit 1 +if test "$1" != "--gcc" -a "$1" != "--clang"; then + # backward compat + added_gcc=$1 + shift + added_gxx=$1 + shift + added_as=$1 + shift + archive_name=$1 + shift + gcc=1 +else + if test "$1" = "--gcc"; then + shift + added_gcc=$1 + shift + added_gxx=$1 + shift + added_as=$1 + shift + archive_name=$1 + shift + gcc=1 + elif test "$1" = "--clang"; then + shift + added_clang=$1 + shift + added_compilerwrapper=$1 + shift + clang=1 + else + usage + exit 1 + fi fi -if ! test -x "$added_gcc" ; then - echo "'$added_gcc' is no executable." - exit 1 +if test -n "$gcc"; then + if test -z "$added_gcc" || test -z "$added_gxx"; then + usage + exit 1 + fi + if ! test -x "$added_gcc" ; then + echo "'$added_gcc' is no executable." + exit 1 + fi + if ! test -x "$added_gxx" ; then + echo "'$added_gxx' is no executable." + exit 1 + fi + if test -z "$added_as" ; then + add_file /usr/bin/as /usr/bin/as + else + if ! test -x "$added_as" ; then + echo "'$added_as' is no executable." + exit 1 + fi + add_file $added_as /usr/bin/as + fi fi -if ! test -x "$added_gxx" ; then - echo "'$added_gcc' is no executable." - exit 1 +if test -n "$clang"; then + if ! test -x "$added_clang" ; then + echo "'$added_clang' is no executable." + exit 1 + fi + if ! test -x "$added_compilerwrapper" ; then + echo "'$added_compilerwrapper' is no executable." + exit 1 + fi fi +extrafiles= +while test "x$1" = "x--addfile"; do + shift + extrafiles="$extrafiles $1" + shift +done +tempdir=`mktemp -d /tmp/iceccenvXXXXXX` -add_file $added_gcc /usr/bin/gcc -add_file $added_gxx /usr/bin/g++ +# for testing the environment is usable at all +add_file /bin/true -if test -z "$added_as" ; then - add_file /usr/bin/as /usr/bin/as -else - if ! test -x "$added_as" ; then - echo "'$added_as' is no executable." - exit 1 - fi +if test -n "$gcc"; then + # getting compilers abs path + added_gcc=$(abs_path $added_gcc) + added_gxx=$(abs_path $added_gxx) - add_file $added_as /usr/bin/as -fi + if test -z "$clang"; then + add_file $added_gcc /usr/bin/gcc + add_file $added_gxx /usr/bin/g++ + else + # HACK: The clang case below will add a wrapper in place of gcc, so add the real + # gcc under a different name that the wrapper will call. + add_file $added_gcc /usr/bin/gcc.bin + add_file $added_gxx /usr/bin/g++.bin + fi + add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 + add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus + + gcc_as=$($added_gcc -print-prog-name=as) + if test "$gcc_as" = "as"; then + add_file /usr/bin/as + else + add_file "$gcc_as" /usr/bin/as + fi -add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 -add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus -specfile=`$added_gcc -print-file-name=specs` -if test -n "$specfile" && test -e "$specfile"; then - add_file "$specfile" + search_addfile $added_gcc specs + search_addfile $added_gcc liblto_plugin.so fi -ltofile=`$added_gcc -print-prog-name=lto1` -pluginfile="${ltofile%lto1}liblto_plugin.so" -if test -r "$pluginfile" -then - add_file $pluginfile ${pluginfile#*usr} - add_file $pluginfile /usr${pluginfile#*usr} +if test -n "$clang"; then + add_file $added_clang /usr/bin/clang + # HACK: Older icecream remotes have /usr/bin/{gcc|g++} hardcoded and wouldn't + # call /usr/bin/clang at all. So include a wrapper binary that will call gcc or clang + # depending on an extra argument added by icecream. + add_file $added_compilerwrapper /usr/bin/gcc + add_file $added_compilerwrapper /usr/bin/g++ + + add_file $($added_clang -print-prog-name=as) /usr/bin/as + + # clang always uses its internal .h files + clangincludes=$(dirname $($added_clang -print-file-name=include/limits.h)) + clangprefix=$(dirname $(dirname $added_clang)) + for file in $(find $clangincludes -type f); do + # get path without .. + destfile=$(readlink -e $file) + # and convert from <prefix> to /usr if needed + destfile=$(echo $destfile | sed "s#$clangprefix#/usr#" ) + add_file "$file" "$destfile" + done fi -tempdir=`mktemp -d /tmp/iceccenvXXXXXX` +for extrafile in $extrafiles; do + add_file $extrafile +done + +# special case for weird multilib setups +for dir in /lib /lib64 /usr/lib /usr/lib64; do + test -L $dir && cp -p $dir $tempdir$dir +done + new_target_files= for i in $target_files; do case $i in@@ -151,7 +299,7 @@ target_files=`for i in $new_target_files; do echo $i; done | sort` #if not use the md5 of all files as the archive name if test -z "$archive_name"; then md5sum=NONE - for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do + for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5 /sbin/md5; do if test -x $file; then md5sum=$file breakSignature · 6 lines
1.7.10.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
A message that is not in the archive (sent off-list or not yet received): CADL+O9uXOrZ9=Y08wx5PQDPBuA=oC=peT9NTHgvLA=4ZKOZbAQ@mail.gmail.com
Quoted 4 lines · Iyad Qumei
Quoted 1 line
Drop and resend with -M.
I am confused; what exactly do you want the patch to look like. Please provide legible statement so we can understand what exactly do you want?
Drop line with PR variable, like I said in first review:
drop PR variable completely, we're dropping them with every PV upgrade for couple months now.
Quoted 2 lines
Do remember the following email exchange! The patch was created originally with -M option, and I understood from your statement that it should not!!!!!
I really don't know how you got that idea, but that's not what I meant. Sorry if I wasn't clear.
Please stay on list.
Quoted 515 lines · Martin Jansa
Quoted 3 lines
Quoted 3 lines
NACK
What are you trying to say?
http://en.wikipedia.org/wiki/NAK_(protocol_message)
Quoted 1 line
This patch was created per instructions on how submit patches.
That doesn't make it correct functionality-wise.
Quoted 501 lines · Martin Jansa
Quoted 9 lines · Iyad Qumei
The original icecc script does not handle toolchain content properly, resulting in build failures, such as
gxx: fatal error: -fuse-linker-plugin, but liblto_plugin.so not found
This patch brings in the latest script form the icecream source, and modifies it for use in the OE build environment. The change was tested with OE-Core built toolchain, and external toolchain.
Quoted 5 lines
Signed-off-by Iyad Qumei <[email protected]>--- .../icecc-create-env-native_0.1.bb | 35 --- .../icecc-create-env-native_1.0.1.bb | 35 +++ .../icecc-create-env/icecc-create-env | 266+++++++++++++++-----
Quoted 2 lines
3 files changed, 242 insertions(+), 94 deletions(-) delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
Quoted 1 line
create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_1.0.1.bb
Quoted 1 line
mode change 100755 => 100644meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
Review
Quoted 2 lines
(quoted diff) +0
-0icecc-create-env-native_0.1.bb b/meta/recipes-devtools/icecc-create-env/ icecc-create-env-native_0.1.bb
Quoted 3 lines
deleted file mode 100644
index c05a76d..0000000
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
Review line 1
Quoted 3 lines
+++
/dev/null(quoted diff) +0
-1@@ -1,35 +0,0 @@ -DESCRIPTION = "This is a modified version of the icecc-create-envscript in order to\
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
Quoted 6 lines
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb deleted +0
-6-make it work with OE." -SECTION = "base" -# source file has just a "GPL" word, but upstream is GPLv2+. -# most probably just GPL would be a mistake -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM ="file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f"
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
Quoted 9 lines
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb deleted +0
-9- -PR = "r2" - -DEPENDS = "" -INHIBIT_DEFAULT_DEPS = "1" - -inherit native - -# This is needed, because otherwise there is dependency loop fromquilt-native
Review line 18
Quoted 2 lines
(quoted diff) +0
-2-# Dependency loop #1 found: -# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_install) (dependent Tasks ['quilt-native,do_compile'])Review line 19
Quoted 1 line
(quoted diff) +0
-1-# Task 10908 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_populate_sysroot) (dependent Tasks ['quilt-native,do_install'])Review line 20
Quoted 1 line
(quoted diff) +0
-1-# Task 10997 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_patch) (dependent Tasks ['icecc-create-env-native,do_unpack', 'quilt-native,do_populate_sysroot'])Review line 21
Quoted 1 line
(quoted diff) +0
-1-# Task 11001 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_configure) (dependent Tasks ['icecc-create-env-native,do_patch'])Review line 22
Quoted 1 line
(quoted diff) +0
-1-# Task 11002 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_compile) (dependent Tasks ['icecc-create-env-native,do_configure'])Review line 23
Quoted 1 line
(quoted diff) +0
-1-# Task 10998 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_install) (dependent Tasks ['icecc-create-env-native,do_compile'])Review line 24
Quoted 1 line
(quoted diff) +0
-1-# Task 10999 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_populate_sysroot) (dependent Tasks ['icecc-create-env-native,do_install'])Review line 25
Quoted 1 line
(quoted diff) +0
-1-# Task 10910 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_configure) (dependent Tasks ['quilt-native,do_patch', 'icecc-create-env-native,do_populate_sysroot'])Review line 26
Quoted 1 line
(quoted diff) +0
-1-# Task 10911 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_compile) (dependent Tasks ['quilt-native,do_configure'])Review
Quoted 10 lines
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb deleted +0
-9-PATCHTOOL = "patch" -SRC_URI = "file://icecc-create-env" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} -}(quoted diff) +0
-0icecc-create-env-native_1.0.1.bb b/meta/recipes-devtools/icecc-create-env/ icecc-create-env-native_1.0.1.bb
meta/recipes-devtools/icecc-create-env/
Quoted 4 lines
new file mode 100644
index 0000000..c05a76dmeta/recipes-devtools/icecc-create-env/ new file +0
-0icecc-create-env-native_1.0.1.bb
meta/recipes-devtools/icecc-create-env/ line 1
Quoted 2 lines
meta/recipes-devtools/icecc-create-env/ new file +1
-0@@ -0,0 +1,35 @@ +DESCRIPTION = "This is a modified version of the icecc-create-envscript in order to\
meta/recipes-devtools/icecc-create-env/ line 7
Quoted 6 lines
meta/recipes-devtools/icecc-create-env/ new file +6
-0+make it work with OE." +SECTION = "base" +# source file has just a "GPL" word, but upstream is GPLv2+. +# most probably just GPL would be a mistake +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM ="file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f"
meta/recipes-devtools/icecc-create-env/ line 9
Quoted 2 lines
meta/recipes-devtools/icecc-create-env/ new file +2
-0+ +PR = "r2"Drop and resend with -M.
meta/recipes-devtools/icecc-create-env/ line 16
Quoted 7 lines
meta/recipes-devtools/icecc-create-env/ new file +7
-0+ +DEPENDS = "" +INHIBIT_DEFAULT_DEPS = "1" + +inherit native + +# This is needed, because otherwise there is dependency loop fromquilt-native
meta/recipes-devtools/icecc-create-env/ line 18
Quoted 2 lines
meta/recipes-devtools/icecc-create-env/ new file +2
-0+# Dependency loop #1 found: +# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_install) (dependent Tasks ['quilt-native,do_compile'])meta/recipes-devtools/icecc-create-env/ line 19
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 10908 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_populate_sysroot) (dependent Tasks ['quilt-native,do_install'])meta/recipes-devtools/icecc-create-env/ line 20
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 10997 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_patch) (dependent Tasks ['icecc-create-env-native,do_unpack', 'quilt-native,do_populate_sysroot'])meta/recipes-devtools/icecc-create-env/ line 21
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 11001 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_configure) (dependent Tasks ['icecc-create-env-native,do_patch'])meta/recipes-devtools/icecc-create-env/ line 22
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 11002 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_compile) (dependent Tasks ['icecc-create-env-native,do_configure'])meta/recipes-devtools/icecc-create-env/ line 23
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 10998 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_install) (dependent Tasks ['icecc-create-env-native,do_compile'])meta/recipes-devtools/icecc-create-env/ line 24
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 10999 (meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb,
do_populate_sysroot) (dependent Tasks ['icecc-create-env-native,do_install'])meta/recipes-devtools/icecc-create-env/ line 25
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 10910 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_configure) (dependent Tasks ['quilt-native,do_patch', 'icecc-create-env-native,do_populate_sysroot'])meta/recipes-devtools/icecc-create-env/ line 26
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+# Task 10911 (meta/recipes-devtools/quilt/quilt-native_0.60.bb,
do_compile) (dependent Tasks ['quilt-native,do_configure'])Quoted 10 lines
meta/recipes-devtools/icecc-create-env/ new file +9
-0+PATCHTOOL = "patch" +SRC_URI = "file://icecc-create-env" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} +}diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
Quoted 4 lines
old mode 100755
new mode 100644
index 7e4dbc4..6d2e3c6
---a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
Quoted 1 line
+++
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
meta/recipes-devtools/icecc-create-env/ add_file () · line 39
Quoted 13 lines
meta/recipes-devtools/icecc-create-env/ new file +1
-3@@ -29,33 +29,95 @@ add_file () toadd="$name=$path" is_contained "$toadd" && return if test -z "$silent"; then - echo "adding file $toadd" + echo "adding file $toadd" fi target_files="$target_files $toadd" if test -x "$path"; then # Only call ldd when it makes sense if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then - if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then - # ldd now outputs ld as /lib/ld-linux.so.xx on current nptlbased glibc
meta/recipes-devtools/icecc-create-env/ add_file () · line 46
Quoted 7 lines
meta/recipes-devtools/icecc-create-env/ new file +0
-7- # this regexp parse the outputs like: - # ldd /usr/bin/gcc - # linux-gate.so.1 => (0xffffe000) - # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000) - # /lib/ld-linux.so.2 (0xb7fe8000) - # covering both situations ( with => and without ) - for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^]*\).*,\1,p'`; do
meta/recipes-devtools/icecc-create-env/ add_file () · line 48
Quoted 2 lines
meta/recipes-devtools/icecc-create-env/ new file +0
-2- test -f "$lib" || continue - # Check wether the same library also exists in the parentdirectory,
meta/recipes-devtools/icecc-create-env/ add_file () · line 49
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +0
-1- # and prefer that on the assumption that it is a more genericone.
meta/recipes-devtools/icecc-create-env/ add_file () · line 50
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +0
-1- local baselib=`echo "$lib" | sed's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'`
meta/recipes-devtools/icecc-create-env/ add_file () · line 39
Quoted 5 lines
meta/recipes-devtools/icecc-create-env/ new file +2
-3- test -f "$baselib" && lib=$baselib - add_file "$lib" - done + if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then + # ldd now outputs ld as /lib/ld-linux.so.xx on current nptlbased glibc
meta/recipes-devtools/icecc-create-env/ add_file () · line 46
Quoted 7 lines
meta/recipes-devtools/icecc-create-env/ new file +7
-0+ # this regexp parse the outputs like: + # ldd /usr/bin/gcc + # linux-gate.so.1 => (0xffffe000) + # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000) + # /lib/ld-linux.so.2 (0xb7fe8000) + # covering both situations ( with => and without ) + for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^]*\).*,\1,p'`; do
meta/recipes-devtools/icecc-create-env/ add_file () · line 48
Quoted 2 lines
meta/recipes-devtools/icecc-create-env/ new file +2
-0+ test -f "$lib" || continue + # Check wether the same library also exists in the parentdirectory,
meta/recipes-devtools/icecc-create-env/ add_file () · line 49
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+ # and prefer that on the assumption that it is a moregeneric one.
meta/recipes-devtools/icecc-create-env/ add_file () · line 50
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+ local baselib=`echo "$lib" | sed's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'`
Quoted 26 lines
meta/recipes-devtools/icecc-create-env/ new file +21
-0+ test -f "$baselib" && lib=$baselib + add_file "$lib" + done fi fi fi } +# returns abs path to filedir +abs_path() +{ + local path=$1 + if test -f "$path"; then + pushd $(dirname $path) > /dev/null 2>&1 + dir_path=`pwd -P` + path=$dir_path/$(basename $path) + popd > /dev/null 2>&1 + elif test -d "$path"; then + pushd $path > /dev/null 2>&1 + path=`pwd -P` + popd > /dev/null 2>&1 + fi + echo $path +} + +# Search and add file to the tarball file.meta/recipes-devtools/icecc-create-env/ add_file () · line 86
Quoted 10 lines
meta/recipes-devtools/icecc-create-env/ new file +10
-0+search_addfile() +{ + local compiler=$1 + local file_name=$2 + local file_installdir=$3 + local file="" + + file=$($compiler -print-prog-name=$file_name) + + if test -z "$file" || test "$file" = "$file_name" || ! test -e"$file"; then
Quoted 11 lines
meta/recipes-devtools/icecc-create-env/ new file +11
-0+ file=`$compiler -print-file-name=$file_name` + fi + + if ! test -e "$file"; then + return 1 + fi + + if test -z "$file_installdir"; then + # The file is going to be added to the tarball + # in the same path where the compiler found it. +meta/recipes-devtools/icecc-create-env/ add_file () · line 107
Quoted 10 lines
meta/recipes-devtools/icecc-create-env/ new file +10
-0+ file_installdir=$(dirname $file) + abs_installdir=$(abs_path $file_installdir) + + if test "$file_installdir" != "$abs_installdir"; then + # The path where the compiler found the file is relative! + # If the path where the compiler found the file is relative + # to compiler's path, we must change it to be relative to + # /usr/bin path where the compiler is going to be installed + # in the tarball file. + # Replacing relative path by abs path because the tarcommand
Quoted 132 lines
meta/recipes-devtools/icecc-create-env/ new file +89
-27+ # used to create the tarball file doesn't work well with + # relative path as installdir. + + compiler_basedir=$(abs_path ${compiler%/*/*}) + file_installdir=${abs_installdir/$compiler_basedir/"/usr"} + fi + fi + + add_file "$file" "$file_installdir/$file_name" + + return 0 +} + # backward compat if test "$1" = "--respect-path"; then shift@@ -67,62 +129,148 @@ if test "$1" = "--silent"; then shift fi - -added_gcc=$1 -shift -added_gxx=$1 -shift -added_as=$1 -shift -archive_name=$1 - -if test -z "$added_gcc" || test -z "$added_gxx" ; then - echo "usage: $0 <gcc_path> <g++_path>" - exit 1 +if test "$1" != "--gcc" -a "$1" != "--clang"; then + # backward compat + added_gcc=$1 + shift + added_gxx=$1 + shift + added_as=$1 + shift + archive_name=$1 + shift + gcc=1 +else + if test "$1" = "--gcc"; then + shift + added_gcc=$1 + shift + added_gxx=$1 + shift + added_as=$1 + shift + archive_name=$1 + shift + gcc=1 + elif test "$1" = "--clang"; then + shift + added_clang=$1 + shift + added_compilerwrapper=$1 + shift + clang=1 + else + usage + exit 1 + fi fi -if ! test -x "$added_gcc" ; then - echo "'$added_gcc' is no executable." - exit 1 +if test -n "$gcc"; then + if test -z "$added_gcc" || test -z "$added_gxx"; then + usage + exit 1 + fi + if ! test -x "$added_gcc" ; then + echo "'$added_gcc' is no executable." + exit 1 + fi + if ! test -x "$added_gxx" ; then + echo "'$added_gxx' is no executable." + exit 1 + fi + if test -z "$added_as" ; then + add_file /usr/bin/as /usr/bin/as + else + if ! test -x "$added_as" ; then + echo "'$added_as' is no executable." + exit 1 + fi + add_file $added_as /usr/bin/as + fi fi -if ! test -x "$added_gxx" ; then - echo "'$added_gcc' is no executable." - exit 1 +if test -n "$clang"; then + if ! test -x "$added_clang" ; then + echo "'$added_clang' is no executable." + exit 1 + fi + if ! test -x "$added_compilerwrapper" ; then + echo "'$added_compilerwrapper' is no executable." + exit 1 + fi fi +extrafiles= +while test "x$1" = "x--addfile"; do + shift + extrafiles="$extrafiles $1" + shift +done +tempdir=`mktemp -d /tmp/iceccenvXXXXXX` -add_file $added_gcc /usr/bin/gcc -add_file $added_gxx /usr/bin/g++ +# for testing the environment is usable at all +add_file /bin/true -if test -z "$added_as" ; then - add_file /usr/bin/as /usr/bin/as -else - if ! test -x "$added_as" ; then - echo "'$added_as' is no executable." - exit 1 - fi +if test -n "$gcc"; then + # getting compilers abs pathmeta/recipes-devtools/icecc-create-env/ if test "$1" = "--silent"; then · line 224
Quoted 10 lines
meta/recipes-devtools/icecc-create-env/ new file +7
-2+ added_gcc=$(abs_path $added_gcc) + added_gxx=$(abs_path $added_gxx) - add_file $added_as /usr/bin/as -fi + if test -z "$clang"; then + add_file $added_gcc /usr/bin/gcc + add_file $added_gxx /usr/bin/g++ + else + # HACK: The clang case below will add a wrapper in place ofgcc, so add the real
Quoted 22 lines
meta/recipes-devtools/icecc-create-env/ new file +15
-5+ # gcc under a different name that the wrapper will call. + add_file $added_gcc /usr/bin/gcc.bin + add_file $added_gxx /usr/bin/g++.bin + fi + add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 + add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus + + gcc_as=$($added_gcc -print-prog-name=as) + if test "$gcc_as" = "as"; then + add_file /usr/bin/as + else + add_file "$gcc_as" /usr/bin/as + fi -add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 -add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus -specfile=`$added_gcc -print-file-name=specs` -if test -n "$specfile" && test -e "$specfile"; then - add_file "$specfile" + search_addfile $added_gcc specs + search_addfile $added_gcc liblto_plugin.so fimeta/recipes-devtools/icecc-create-env/ if test "$1" = "--silent"; then · line 245
Quoted 10 lines
meta/recipes-devtools/icecc-create-env/ new file +3
-6-ltofile=`$added_gcc -print-prog-name=lto1` -pluginfile="${ltofile%lto1}liblto_plugin.so" -if test -r "$pluginfile" -then - add_file $pluginfile ${pluginfile#*usr} - add_file $pluginfile /usr${pluginfile#*usr} +if test -n "$clang"; then + add_file $added_clang /usr/bin/clang + # HACK: Older icecream remotes have /usr/bin/{gcc|g++} hardcodedand wouldn't
meta/recipes-devtools/icecc-create-env/ if test "$1" = "--silent"; then · line 246
Quoted 1 line
meta/recipes-devtools/icecc-create-env/ new file +1
-0+ # call /usr/bin/clang at all. So include a wrapper binary that willcall gcc or clang
meta/recipes-devtools/icecc-create-env/ if test "$1" = "--silent"; then · line 254
Quoted 8 lines
meta/recipes-devtools/icecc-create-env/ new file +8
-0+ # depending on an extra argument added by icecream. + add_file $added_compilerwrapper /usr/bin/gcc + add_file $added_compilerwrapper /usr/bin/g++ + + add_file $($added_clang -print-prog-name=as) /usr/bin/as + + # clang always uses its internal .h files + clangincludes=$(dirname $($added_clang-print-file-name=include/limits.h))
meta/recipes-devtools/icecc-create-env/ target_files=`for i in $new_target_files; do echo
Quoted 24 lines
meta/recipes-devtools/icecc-create-env/ new file +17
-1+ clangprefix=$(dirname $(dirname $added_clang)) + for file in $(find $clangincludes -type f); do + # get path without .. + destfile=$(readlink -e $file) + # and convert from <prefix> to /usr if needed + destfile=$(echo $destfile | sed "s#$clangprefix#/usr#" ) + add_file "$file" "$destfile" + done fi -tempdir=`mktemp -d /tmp/iceccenvXXXXXX` +for extrafile in $extrafiles; do + add_file $extrafile +done + +# special case for weird multilib setups +for dir in /lib /lib64 /usr/lib /usr/lib64; do + test -L $dir && cp -p $dir $tempdir$dir +done + new_target_files= for i in $target_files; do case $i in@@ -151,7 +299,7 @@ target_files=`for i in $new_target_files; do echo$i; done | sort`
Quoted 11 lines
meta/recipes-devtools/icecc-create-env/ new file +1
-2#if not use the md5 of all files as the archive name if test -z "$archive_name"; then md5sum=NONE - for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do + for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5 /sbin/md5; do if test -x $file; then md5sum=$file break --1.7.10.4
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
Martin 'JaMa' Jansa jabber: [email protected]
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]