Ver Fonte

gamin: fix build with !BR2_LARGEFILE and python enabled

Python binding support is broken for cross compilation, disable for now.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard há 15 anos atrás
pai
commit
a1deb18ba6
2 ficheiros alterados com 8 adições e 7 exclusões
  1. 5 5
      CHANGES
  2. 3 2
      package/gamin/gamin.mk

+ 5 - 5
CHANGES

@@ -21,11 +21,11 @@
 	sdl_sound, swfdec, sysstat
 
 	Updated/fixed packages: alsamixergui, autoconf, bootutils, busybox,
-	gcc, directfb, dnsmasq, e2fsprogs, festival, gstreamer, gst-plugins-bad,
-	gst-plugins-base, gst-plugins-good, imagemagick, ipkg, iptables,
-	iw, kernel-headers, kismet, libelf, libevent, libglib2, libidn,
-	liblockfile, libmad, libpcap, libupnp, libuuid, lighttpd, ltrace,
-	lua, lzma, magiccube4d, matchbox, mdadm, nbd, ncftp, ncurses,
+	gcc, directfb, dnsmasq, e2fsprogs, festival, gamin, gstreamer,
+	gst-plugins-bad, gst-plugins-base, gst-plugins-good, imagemagick,
+	ipkg, iptables, iw, kernel-headers, kismet, libelf, libevent, libglib2,
+	libidn, liblockfile, libmad, libpcap, libupnp, libuuid, lighttpd,
+	ltrace, lua, lzma, magiccube4d, matchbox, mdadm, nbd, ncftp, ncurses,
 	netkittelnet, netsnmp, ntfs-3g, openntp, openssl, php, python, quagga,
 	radvd, rsync, rubix, samba, sawman, sdl, shared-mime-info, spawn-fcgi,
 	speech-tools, sqlite, squashfs, synergy, syslinux, target-binutils,

+ 3 - 2
package/gamin/gamin.mk

@@ -12,9 +12,8 @@ GAMIN_INSTALL_TARGET = YES
 
 GAMIN_CONF_OPT = --program-prefix="" --disable-debug
 
-ifneq ($(BR2_PACKAGE_PYTHON),y)
+# python support broken
 GAMIN_CONF_OPT += --without-python
-endif
 
 GAMIN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
@@ -22,6 +21,8 @@ GAMIN_CONF_ENV = have_abstract_sockets=no
 
 ifneq ($(BR2_LARGEFILE),y)
 GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
+# the above doesn't work with shared config.cache
+GAMIN_USE_CONFIG_CACHE = NO
 endif
 
 GAMIN_DEPENDENCIES = libglib2