Browse Source

Use same contents for macos intel and universal builds

pull/25/head
falkTX 10 months ago
parent
commit
badc8032d4
3 changed files with 1 additions and 40 deletions
  1. +1
    -0
      patches/glib/macos-universal
  2. +0
    -40
      patches/glib/macos-universal/01_skip-gettext.patch
  3. +0
    -0
      patches/glib/macos/02_aarch64-atomic-as-mutex.patch

+ 1
- 0
patches/glib/macos-universal View File

@@ -0,0 +1 @@
macos

+ 0
- 40
patches/glib/macos-universal/01_skip-gettext.patch View File

@@ -1,40 +0,0 @@
diff --git a/Makefile.in b/Makefile.in
index 3402627..27210f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -401,7 +401,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLog.pre-2-18 ChangeLog.pre-2-16 \
gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
TEST_PROGS =
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
AM_CPPFLAGS = \
diff --git a/configure.in b/configure.in
index b9c3342..e421aa0 100644
--- a/configure.in
+++ b/configure.in
@@ -465,13 +465,6 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
GLIB_GNU_GETTEXT
-if test "$gt_cv_have_gettext" != "yes" ; then
- AC_MSG_ERROR([
-*** You must have either have gettext support in your C library, or use the
-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
-])
-fi
-
LIBS="$INTLLIBS $LIBS"
GETTEXT_PACKAGE=glib20
@@ -2682,8 +2675,6 @@ dnl **************************
dnl *** Checks for gtk-doc ***
dnl **************************
-GTK_DOC_CHECK([1.11])
-
AC_ARG_ENABLE(man,
[AC_HELP_STRING([--enable-man],
[regenerate man pages from Docbook [default=no]])],enable_man=yes,

patches/glib/macos-universal/02_aarch64-atomic-as-mutex.patch → patches/glib/macos/02_aarch64-atomic-as-mutex.patch View File


Loading…
Cancel
Save