Browse Source

Fix win32 glib cross-build in some systems

Closes #6
tags/v1.1
falkTX 9 months ago
parent
commit
6cd39e448d
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      bootstrap-plugins.sh
  2. +1
    -1
      patches/glib/01_skip-gettext.patch

+ 2
- 0
bootstrap-plugins.sh View File

@@ -91,6 +91,8 @@ if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
GLIB_EXTRAFLAGS+=" ac_cv_func_posix_getgrgid_r=yes"
patch_file glib ${GLIB_VERSION} "configure.in" 's/G_ATOMIC_I486/G_ATOMIC_NOT_I486/'
fi
elif [ "${WIN32}" -eq 1 ] && [ -n "${EXE_WRAPPER}" ]; then
patch_file glib ${GLIB_VERSION} "gobject/Makefile.in" "s|glib_genmarshal = ./glib-genmarshal|glib_genmarshal = ${EXE_WRAPPER} ./glib-genmarshal.exe|"
fi

build_autoconfgen glib ${GLIB_VERSION} "${GLIB_EXTRAFLAGS}"


+ 1
- 1
patches/glib/01_skip-gettext.patch View File

@@ -7,7 +7,7 @@ index 3402627..27210f1 100644
TEST_PROGS =
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
AM_CPPFLAGS = \


Loading…
Cancel
Save