a2d3030cdb
- Removed, this check is not needed as HeaderSize can't overflow because
IconCount will be at most 16 bits, and that multiplied by 16 is not
enough to overflow an integer. (Checked with upstream)
* debian/patches/001_static-linking-dont-query-immodules.patch,
debian/patches/002_static-linking-dont-build-perf.patch:
- Add headers.
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
Description: Don't query immodules for the local tree when cross-compiling or
|
|
when --disable-shared was given
|
|
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
|
|
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -157,6 +157,7 @@
|
|
dnl Initialize libtool
|
|
AC_PROG_CC
|
|
AM_DISABLE_STATIC
|
|
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
|
|
|
|
dnl
|
|
dnl Check for a working C++ compiler, but do not bail out, if none is found.
|
|
--- a/modules/input/Makefile.am
|
|
+++ b/modules/input/Makefile.am
|
|
@@ -178,8 +178,12 @@
|
|
if CROSS_COMPILING
|
|
RUN_QUERY_IMMODULES_TEST=false
|
|
else
|
|
+if ENABLE_STATIC
|
|
+RUN_QUERY_IMMODULES_TEST=false
|
|
+else
|
|
RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)"
|
|
endif
|
|
+endif
|
|
|
|
# Running this if cross compiling or if DESTDIR is set is going to
|
|
# not work at all, so skip it.
|
|
@@ -240,7 +244,18 @@
|
|
included-modules: $(noinst_LTLIBRARIES)
|
|
|
|
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
|
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
|
|
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
|
|
+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
|
|
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
|
|
+ else \
|
|
+ echo "***" ; \
|
|
+ echo "*** Warning: gtk.immodules not built" ; \
|
|
+ echo "***" ; \
|
|
+ echo "*** Generate this file manually on host" ; \
|
|
+ echo "*** system using gtk-query-immodules-2.0" ; \
|
|
+ echo "***" ; \
|
|
+ touch gtk.immodules; \
|
|
+ fi
|
|
|
|
CLEANFILES = gtk.immodules
|
|
|