[gimp/wip/Jehan/gitlab-ci-more-win] Test again.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/gitlab-ci-more-win] Test again.
- Date: Fri, 7 May 2021 00:00:07 +0000 (UTC)
commit a6429e05e826dfe7d7ba293d6ee95c61bc33ce83
Author: Jehan <jehan girinstud io>
Date: Fri May 7 01:59:57 2021 +0200
Test again.
build/windows/gitlab-ci/dll_link.py | 2 ++
build/windows/gitlab-ci/package-gimp-msys2.sh | 2 ++
2 files changed, 4 insertions(+)
---
diff --git a/build/windows/gitlab-ci/dll_link.py b/build/windows/gitlab-ci/dll_link.py
index 59190098e3..c1bd30398d 100755
--- a/build/windows/gitlab-ci/dll_link.py
+++ b/build/windows/gitlab-ci/dll_link.py
@@ -73,6 +73,8 @@ def find_dependencies(obj, srcdir):
objdump = 'x86_64-w64-mingw32-objdump'
elif 'PE32' in file_type:
objdump = 'i686-w64-mingw32-objdump'
+ print("Objdump is: {}".format(objdump))
+ objdump = 'objdump.exe'
if objdump is None:
sys.stderr.write('File type of {} unknown: {}\n'.format(obj, file_type))
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 3bec9189a3..dfd0820ea0 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -30,6 +30,7 @@ pacman --noconfirm -Suy
# Install the required packages
pacman --noconfirm -S --needed \
base-devel \
+ mingw-w64-$MSYS2_ARCH-binutils \
mingw-w64-$MSYS2_ARCH-toolchain \
mingw-w64-$MSYS2_ARCH-ccache \
\
@@ -72,6 +73,7 @@ pacman --noconfirm -S --needed \
export GIMP_PREFIX=`realpath ./_install`
export GIMP_DISTRIB=`realpath ./gimp-w64`
export MSYS_PREFIX="/c/msys64/mingw64/"
+export PATH="$GIMP_PREFIX/bin:/mingw64/bin:$PATH"
# Package ressources.
mkdir -p ${GIMP_DISTRIB}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]