diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-14 15:47:32 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-14 15:57:12 -0700 |
| commit | e2e118ec32075f93967f8a6c3ee34f1949372c3f (patch) | |
| tree | 6b464526a9c8ccefd07244fbd886046a12fea11d | |
| parent | 5c2675eb811bb324b1bafa030323e3e3eef375b0 (diff) | |
Ease glib cross-compiling requirements
Since we're building only glib, we don't need any of the auxiliary
tools.
| -rw-r--r-- | glib-patches/cross-compiling.patch | 35 | ||||
| -rw-r--r-- | glib-patches/patchlist | 1 | ||||
| -rw-r--r-- | glib/configure.ac | 24 |
3 files changed, 36 insertions, 24 deletions
diff --git a/glib-patches/cross-compiling.patch b/glib-patches/cross-compiling.patch new file mode 100644 index 0000000..9960b42 --- /dev/null +++ b/glib-patches/cross-compiling.patch @@ -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 diff --git a/glib-patches/patchlist b/glib-patches/patchlist index 636863e..e324cbb 100644 --- a/glib-patches/patchlist +++ b/glib-patches/patchlist @@ -3,3 +3,4 @@ no-installed-files.patch foreign-automake.patch no-gregex.patch no-pkg-config.patch +cross-compiling.patch 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 |