summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-06-20 22:01:34 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-06-20 22:01:34 (GMT)
commit21438ec500ca0962fa0f2572a6212786674d5e32 (patch)
tree980f63ece256639def497b0e97f29e2d12935148
parent377b2785c136e7439ac4f4a6e4509bc5c9fe3015 (diff)
downloadbuildroot-21438ec500ca0962fa0f2572a6212786674d5e32.tar.gz
buildroot-21438ec500ca0962fa0f2572a6212786674d5e32.tar.bz2
libdnet: fix python module build
Ensure the correct compiler/linker flags are used. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libdnet/libdnet-002-python-makefile.patch12
-rw-r--r--package/libdnet/libdnet.mk2
2 files changed, 10 insertions, 4 deletions
diff --git a/package/libdnet/libdnet-002-python-makefile.patch b/package/libdnet/libdnet-002-python-makefile.patch
index 4c8729d..fb41e43 100644
--- a/package/libdnet/libdnet-002-python-makefile.patch
+++ b/package/libdnet/libdnet-002-python-makefile.patch
@@ -1,10 +1,16 @@
---- a/python/Makefile.am 2006-01-15 18:08:23.000000000 +1100
-+++ b/python/Makefile.am 2008-09-04 15:25:52.000000000 +1000
+---
+ python/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: libdnet-1.11/python/Makefile.am
+===================================================================
+--- libdnet-1.11.orig/python/Makefile.am
++++ libdnet-1.11/python/Makefile.am
@@ -11,6 +11,7 @@
pyrexc $(srcdir)/dnet.pyx
python-build: $(srcdir)/dnet.c
-+ CC="$(CC)" LDSHARED="$(CC) -shared" $(PYTHON) setup.py build_ext -I$(PYINCDIR)
++ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR)
$(PYTHON) setup.py build
touch python-build
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 649db31..ae4c9ff 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -17,7 +17,7 @@ LIBDNET_CONF_OPT = \
ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
LIBDNET_DEPENDENCIES = python
LIBDNET_CONF_OPT += --with-python
-LIBDNET_MAKE_OPT = PYTHON=python$(PYTHON_VERSION_MAJOR) PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+LIBDNET_MAKE_OPT = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
endif