summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-29 08:03:32 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-29 14:04:38 (GMT)
commitd2e5763e529e4ed387e30854f80e801273ecdbaf (patch)
treefb63b2693e9022e42d4acb397683dd20ed6dd05f
parenta302e3aaa0a7e4eec1a82143efbbd09629b499ea (diff)
downloadbuildroot-d2e5763e529e4ed387e30854f80e801273ecdbaf.tar.gz
buildroot-d2e5763e529e4ed387e30854f80e801273ecdbaf.tar.bz2
libeXosip: add dependency on host-pkg-config and remove useless flags
When libeXosip fails to use pkg-config to find libosip, it defaults to thinking that libosip is installed in $(prefix)/lib and $(prefix)/include, which is of course wrong. There was an attempt to fix this by passing OSIP_CFLAGS and OSIP_LIBS variables to libeXosip ./configure script, but it still does not work: checking pkg-config is at least version 0.9.0... ./configure: line 21035: /home/test/outputs/test-41/host/usr/bin/pkg-config: No such file or directory no checking for OSIP... configure: WARNING: assuming osip can be found in -I${prefix}/include and -L${exec_prefix}/lib Therefore, the correct fix is to depend on host-pkg-config. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libeXosip2/libeXosip2.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 7f282b7..30eac9f 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -22,8 +22,6 @@ $(LIBEXOSIP2_DIR)/.configured: $(LIBEXOSIP2_DIR)/.unpacked
(cd $(LIBEXOSIP2_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
- OSIP_CFLAGS="$(TARGET_CFLAGS)" \
- OSIP_LIBS="-L$(STAGING_DIR)/usr/lib -losip2 -losipparser2" \
./configure $(QUIET) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -73,7 +71,7 @@ $(TARGET_DIR)/usr/bin/sip_reg: $(STAGING_DIR)/usr/bin/sip_reg
-libeXosip2: libosip2 $(TARGET_DIR)/usr/lib/libeXosip2.so
+libeXosip2: host-pkg-config libosip2 $(TARGET_DIR)/usr/lib/libeXosip2.so
libeXosip2-source: $(DL_DIR)/$(LIBEXOSIP2_SOURCE)