c070c532b4
+ debian/patches/004_git_dont_setup_timeout_twice.patch:
- Removed, included upstream.
+ debian/patches/004_git_add_missing_include.patch:
- New patch from upstream git, add a missing include that
otherwise caused the build to fail when disabling X extensions.
+ debian/patches/*:
- Refreshed.
+ debian/libgtk3.0-0.symbols:
- Updated.
+ debian/rules:
- Bumped the shver.
- Disable silent builds.
31 lines
812 B
Diff
31 lines
812 B
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.ac
|
|
+++ b/configure.ac
|
|
@@ -197,6 +197,8 @@
|
|
# Create libtool early, because it's used in configure
|
|
LT_OUTPUT
|
|
|
|
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
|
|
+
|
|
# Make sure we use 64-bit versions of various file stuff.
|
|
AC_SYS_LARGEFILE
|
|
|
|
--- a/modules/input/Makefile.am
|
|
+++ b/modules/input/Makefile.am
|
|
@@ -176,8 +176,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.
|