[gimp/wip/Jehan/native-win64-build] Yeah ccache was the culprit!



commit e76ae952256155ee070cb332c4d527407a97cf25
Author: Jehan <jehan girinstud io>
Date:   Tue May 4 19:44:48 2021 +0200

    Yeah ccache was the culprit!
    
    I should have tested the simpler build first!

 build/windows/build-msys2.sh | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/build/windows/build-msys2.sh b/build/windows/build-msys2.sh
index 23afaade63..43c7071cf6 100644
--- a/build/windows/build-msys2.sh
+++ b/build/windows/build-msys2.sh
@@ -72,9 +72,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-suitesparse \
     mingw-w64-$MSYS2_ARCH-vala \
-    mingw-w64-$MSYS2_ARCH-xpm-nox \
-    mingw-w64-$MSYS2_ARCH-babl \
-    mingw-w64-$MSYS2_ARCH-gegl
+    mingw-w64-$MSYS2_ARCH-xpm-nox
 
 #mkdir -p _ccache
 #export CCACHE_BASEDIR="$(pwd)"
@@ -97,41 +95,12 @@ export XDG_DATA_DIRS="/mingw64/share/"
 git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/babl.git _babl
 git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/gegl.git _gegl
 
-#export BASEDIR=`realpath ~`
-export BASEDIR=`pwd`
-export WINBASEDIR=`echo $BASEDIR|sed 's*^/c*C:*'`
-pwd
-echo ${BASEDIR}
-echo ${WINBASEDIR}
 mkdir _babl/_build
 cd _babl/_build
-printf "Babl" | python3 ../babl/identfilter.py
-printf "BablTest" | python3 ../babl/identfilter.py
 git apply ../../build/windows/patches/0001-Introspection-in-verbose-mode.patch
 git apply ../../build/windows/patches/0001-Add-some-quotes.patch
 meson -Dprefix="${GIMP_PREFIX}" -Denable-vapi=false -Dwith-docs=false --buildtype=plain -Dwith-lcms=true 
-Denable-gir=true ..
-ninja || \
-C:/msys64/mingw64/bin/g-ir-scanner.exe --no-libtool --namespace=Babl \
---nsversion=0.1 --warn-all --output babl/Babl-0.1.gir --c-include=babl.h \
---identifier-filter-cmd="C:/msys64/mingw64/bin/python.exe ${WINBASEDIR}/_babl/babl/identfilter.py" \
--DBABL_IS_BEING_COMPILED -I${WINBASEDIR}/_babl/babl -I${WINBASEDIR}/_babl/_build/babl -I./. \
--I../. -I./babl/base/. -I../babl/base/. \
---filelist=${WINBASEDIR}/_babl/_build/babl/libbabl-0.1-0.dll.p/Babl_0.1_gir_filelist \
---cflags-begin -fno-unsafe-math-optimizations \
--Wdeclaration-after-statement -Winit-self -Wmissing-declarations \
--Wmissing-prototypes -Wold-style-definition -Wpointer-arith -mmmx -msse \
--mfpmath=sse -mstackrealign -I./. -I../. -I./babl/base/. \
--I../babl/base/. -IC:/msys64/mingw64/include \
--IC:/msys64/mingw64/include/gobject-introspection-1.0 \
--IC:/msys64/mingw64/include/glib-2.0 \
--IC:/msys64/mingw64/lib/glib-2.0/include --cflags-end \
---add-include-path=C:/msys64/mingw64/share/gir-1.0 -L./babl --library \
-babl-0.1 --extra-library=m -LC:/msys64/mingw64/lib --extra-library=lcms2 \
---extra-library=girepository-1.0 --extra-library=gobject-2.0 \
---extra-library=glib-2.0 --extra-library=intl --sources-top-dirs \
-${WINBASEDIR}/_babl/subprojects/ \
---sources-top-dirs ${WINBASEDIR}/_babl/_build/subprojects/
-
+ninja
 ninja install
 
 mkdir ../../_gegl/_build


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