From e5193b90786716749c272a7cbbffd3581cedc90a Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Thu, 10 Jan 2019 22:19:56 +0100 Subject: [PATCH] fixes for xmlada and gprbuild --- conf/toolchains/native-mingw.conf | 2 +- recipes-devtools/mingw-w64/mingw-w64-common.inc | 4 ++-- recipes-gnat/gprbuild/gprbuild-cross_1.0.0.bb | 6 ++++-- recipes-gnat/xmlada/xmlada-cross_1.0.0.bb | 7 ++----- scripts/build.py | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/conf/toolchains/native-mingw.conf b/conf/toolchains/native-mingw.conf index dc973b8..1f5e2f1 100644 --- a/conf/toolchains/native-mingw.conf +++ b/conf/toolchains/native-mingw.conf @@ -14,4 +14,4 @@ PREFERRED_PROVIDERS = " \ " PREPATH = "${TOPDIR}/tmp/${BUILD}.${BUILD}.${HOST}/INSTALL/bin" -IMAGE_FEATURES = "virtual/final-gcc gdb-cross gdbserver-cross mingw-w64-tools" +IMAGE_FEATURES = "virtual/final-gcc gdb-cross gprbuild-cross gdbserver-cross mingw-w64-tools" diff --git a/recipes-devtools/mingw-w64/mingw-w64-common.inc b/recipes-devtools/mingw-w64/mingw-w64-common.inc index 668ab2d..521d8c4 100644 --- a/recipes-devtools/mingw-w64/mingw-w64-common.inc +++ b/recipes-devtools/mingw-w64/mingw-w64-common.inc @@ -1,9 +1,9 @@ LIC_FILES_CHKSUM="file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "1.0.0+git${SRCPV}" - +SRCREV = "2d4e517ad0c7a9f0bd7001c42e6c131b977c15d9" SRC_URI = " \ - git://git.code.sf.net/p/mingw-w64/mingw-w64;protocol=https;rev=master \ + git://git.code.sf.net/p/mingw-w64/mingw-w64;protocol=https \ " S = "${WORKDIR}/git" diff --git a/recipes-gnat/gprbuild/gprbuild-cross_1.0.0.bb b/recipes-gnat/gprbuild/gprbuild-cross_1.0.0.bb index a4e1365..e4d04ae 100644 --- a/recipes-gnat/gprbuild/gprbuild-cross_1.0.0.bb +++ b/recipes-gnat/gprbuild/gprbuild-cross_1.0.0.bb @@ -12,11 +12,13 @@ do_configure() { do_compile() { make -f ${S}/Makefile ${MAKE_JX} all make -f ${S}/Makefile ${MAKE_JX} libgpr.build.static -# make -f ${S}/Makefile ${MAKE_JX} libgpr.build.shared + make -f ${S}/Makefile ${MAKE_JX} libgpr.build.shared + make -f ${S}/Makefile ${MAKE_JX} libgpr.build.static-pic } do_install() { make -f ${S}/Makefile install make -f ${S}/Makefile libgpr.install.static -# make -f ${S}/Makefile libgpr.install.shared + make -f ${S}/Makefile libgpr.install.shared + make -f ${S}/Makefile libgpr.install.static-pic } diff --git a/recipes-gnat/xmlada/xmlada-cross_1.0.0.bb b/recipes-gnat/xmlada/xmlada-cross_1.0.0.bb index 24a69a4..0c61f8c 100644 --- a/recipes-gnat/xmlada/xmlada-cross_1.0.0.bb +++ b/recipes-gnat/xmlada/xmlada-cross_1.0.0.bb @@ -17,15 +17,12 @@ addtask preconfigure before do_configure do_configure () { ${S}/configure \ --srcdir=${S} \ - --target=${TARGET} \ - --disable-shared + --target=${TARGET} } + do_install () { make all install IPREFIX=${INSTALL_DIR} } -do_fetch() { - : -} deltask do_patch diff --git a/scripts/build.py b/scripts/build.py index 78e6ddd..8e00d7e 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -209,7 +209,7 @@ def runBitbake(target, recipe): stamp = makeStamp(target, recipe) if hasStamp(stamp): logging.info('{} already done. Skipping'.format(stamp)) - print('{} already built. Skipping'.format(target)) + print('{}:{} already built. Skipping'.format(target,recipe)) return deps = getDependencies(target)