libxml2: Fix zlib detection the right way 585/head
authorJames Le Cuirot <james.le-cuirot@yakara.com>
Tue, 2 Dec 2014 11:10:06 +0000 (11:10 +0000)
committerJames Le Cuirot <james.le-cuirot@yakara.com>
Tue, 2 Dec 2014 11:14:42 +0000 (11:14 +0000)
The previous fix (#557) forced -lz into LDFLAGS instead of fixing the
real issue where configure was failing to detect zlib in the first
place. This was happening because it was looking in /lib, resulting in
conflicts with the host libraries.

Signed-off-by: James Le Cuirot <james.le-cuirot@yakara.com>
libs/libxml2/Makefile

index b22761f7ddb46408141e0c0e6cdd4b8f496f3b09..05eb8386986f3fa942760dd68f6fe02a4d0f7a33 100644 (file)
@@ -42,7 +42,6 @@ define Package/libxml2/description
 endef
 
 TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += -lz
 
 CONFIGURE_ARGS += \
        --enable-shared \
@@ -73,7 +72,7 @@ CONFIGURE_ARGS += \
        --with-xinclude \
        --with-xpath \
        --with-xptr \
-       --with-zlib \
+       --with-zlib=$(STAGING_DIR)/usr \
        --without-lzma
 
 HOST_CONFIGURE_ARGS += \