You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3465
-- Commit Summary --
* Define "lt_cv_deplibs_check_method" to fix Mingw linker errors
-- File Changes --
M scripts/ci_mingw64_geany.sh (1)
-- Patch Links --
https://github.com/geany/geany/pull/3465.patch https://github.com/geany/geany/pull/3465.diff
@eht16 pushed 1 commit.
e465a2b456e7c0aba6aefc1c4b406b8089386d1a Remove unnecessary compiler and linker flags for Mingw builds
@eht16 commented on this pull request.
export NOCONFIGURE=1
export JOBS=${JOBS:-1} +export lt_cv_deplibs_check_method='pass_all'
As suggested in https://github.com/geany/geany/issues/3461. This fixes linker errors on `libuuid` with the recent Mingw GTK3 package.
@eht16 commented on this pull request.
@@ -119,7 +119,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$PACKAGE"], [Gettext package.])
AM_COND_IF([MINGW], [pkgdatadir='${prefix}/data'], [pkgdatadir='${datarootdir}/geany']) -AM_COND_IF([MINGW],[LIBS="$LIBS -liconv"])
This came in https://github.com/geany/geany/pull/2938, seems unncessary now. Mingw build is fine without it.
@eht16 commented on this pull request.
@@ -153,7 +153,7 @@ geany_private.res: $(top_srcdir)/geany_private.rc
libgeany_la_SOURCES += win32.c win32.h libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32 -libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
`-luuid` is added by glib-2.0 on Mingw, so we don't need it here (maybe not anymore, this flag was added many years ago).
@eht16 commented on this pull request.
@@ -70,19 +70,12 @@ CFLAGS="\
ARCH="x86_64" MINGW_ARCH="mingw64" HOST="x86_64-w64-mingw32" -export CC="/usr/bin/${HOST}-gcc" -export CPP="/usr/bin/${HOST}-cpp" -export CXX="/usr/bin/${HOST}-g++" -export AR="/usr/bin/${HOST}-ar" -export STRIP="/usr/bin/${HOST}-strip" -export WINDRES="/usr/bin/${HOST}-windres" -export CFLAGS="-I/windows/${MINGW_ARCH}/include/ ${CFLAGS}"
All those variables are not necessary.
I think I carried them over from older build scripts. It builds fine also without those though.
Merged #3465 into master.
github-comments@lists.geany.org