fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-14 11:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ease glib cross-compiling requirements

Browse source 
Since we're building only glib, we don't need any of the auxiliary
tools.
This commit is contained in:
Dan Nicholson 2012-05-14 15:47:32 -07:00
parent 5c2675eb81
commit e2e118ec32
3 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
glib-patches/cross-compiling.patch Normal file
View file

@ -0,0 +1,35 @@
diff --git a/glib/configure.ac b/glib/configure.ac
index d551832..da67a56 100644
--- a/glib/configure.ac
+++ b/glib/configure.ac
@@ -2447,30 +2447,6 @@ int error = EILSEQ;
], have_eilseq=yes, have_eilseq=no);
AC_MSG_RESULT($have_eilseq)
-dnl ******************************************************************
-dnl *** If we are cross-compiling, look for glib-genmarshal and ***
-dnl *** glib-compile-schemas in PATH ***
-dnl ******************************************************************
-
-AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
-if test $cross_compiling = yes; then
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
- if test x$GLIB_GENMARSHAL = xno; then
- AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
- fi
-
- AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
- if test x$GLIB_COMPILE_SCHEMAS = xno; then
- AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
- fi
-
- AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no)
- if test x$GLIB_COMPILE_RESOURCES = xno; then
- AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
- fi
-fi
-
dnl
dnl Tracing
dnl

1
glib-patches/patchlist
View file

@ -3,3 +3,4 @@ no-installed-files.patch
foreign-automake.patch
no-gregex.patch
no-pkg-config.patch
cross-compiling.patch

24
glib/configure.ac
View file

@ -2447,30 +2447,6 @@ int error = EILSEQ;
], have_eilseq=yes, have_eilseq=no);
AC_MSG_RESULT($have_eilseq)
dnl ******************************************************************
dnl *** If we are cross-compiling, look for glib-genmarshal and ***
dnl *** glib-compile-schemas in PATH ***
dnl ******************************************************************
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
if test $cross_compiling = yes; then
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
if test x$GLIB_GENMARSHAL = xno; then
AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
fi
AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
if test x$GLIB_COMPILE_SCHEMAS = xno; then
AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
fi
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no)
if test x$GLIB_COMPILE_RESOURCES = xno; then
AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
fi
fi
dnl
dnl Tracing
dnl