[geany/geany] 1d9681: Merge pull request #3465 from eht16/issue3461_fix_mingw_ci_build - Commits

6 May 2023


      Branch:      refs/heads/master
Author:      Enrico Tröger enrico.troeger@uvena.de
Committer:   GitHub noreply@github.com
Date:        Sat, 06 May 2023 14:19:37 UTC
Commit:      1d9681d78c0294c8c29925cdc89c2d8ae19b5abf
             https://github.com/geany/geany/commit/1d9681d78c0294c8c29925cdc89c2d8ae19b5a...
Log Message:
-----------
Merge pull request #3465 from eht16/issue3461_fix_mingw_ci_build
Fix Mingw CI build
Modified Paths:
--------------
    configure.ac
    scripts/ci_mingw64_geany.sh
    src/Makefile.am
Modified: configure.ac
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -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"])
 AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))])
 AC_SUBST([pkgdatadir])
Modified: scripts/ci_mingw64_geany.sh
9 lines changed, 1 insertions(+), 8 deletions(-)
===================================================================
@@ -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}"
 export LDFLAGS="-static-libgcc ${LDFLAGS}"
 export PKG_CONFIG_SYSROOT_DIR="/windows"
 export PKG_CONFIG_PATH="/windows/${MINGW_ARCH}/lib/pkgconfig/"
-export PKG_CONFIG="/usr/bin/pkg-config"
 export NOCONFIGURE=1
 export JOBS=${JOBS:-1}
+export lt_cv_deplibs_check_method='pass_all'
# stop on errors
 set -e
Modified: src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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
+libgeany_la_LDFLAGS += -mwindows -mms-bitfields -no-undefined
 geany_LDFLAGS       += -mwindows -mms-bitfields
CLEANFILES          += geany_private.res
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    