[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4955/8267] libgpg-error: Don't replace the syscfg header for mingw32



commit 16c918126d01ec7fa0bb7338708d383c993e2757
Author: Nathan Rossi <nathan nathanrossi com>
Date:   Tue Feb 21 23:17:28 2017 +1000

    libgpg-error: Don't replace the syscfg header for mingw32
    
    For mingw32 targets do not attempt to replace the
    syscfg/lock-obj-pub.*.h as for mingw32 there are no arch specific
    headers that are included in the libgpg-error source.
    
    (From OE-Core rev: 45a5253a6c8d3e394c1a74491b95fc63a1616646)
    
    Signed-off-by: Nathan Rossi <nathan nathanrossi com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../libgpg-error/libgpg-error_1.26.bb              |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb 
b/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
index b9e3b00..090db1b 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
@@ -26,7 +26,10 @@ inherit autotools binconfig-disabled pkgconfig gettext
 CPPFLAGS += "-P"
 do_compile_prepend() {
        TARGET_FILE=linux-gnu
-       if [ ${TARGET_OS} != "linux" ]; then
+       if [ ${TARGET_OS} = "mingw32" ]; then
+               # There are no arch specific syscfg files for mingw32
+               TARGET_FILE=
+       elif [ ${TARGET_OS} != "linux" ]; then
                TARGET_FILE=${TARGET_OS}
        fi
 
@@ -42,8 +45,10 @@ do_compile_prepend() {
          *)          TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; 
        esac
 
-       cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \
-         ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h
+       if [ -n "$TARGET_FILE" ]; then
+               cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \
+                       ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h
+       fi
 }
 
 do_install_append() {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]