diff mbox

[babeltrace,stable-1.5] Fix: use LDFLAGS instead of LIBS for python bindings

Message ID 1496419004-6922-1-git-send-email-mjeanson@efficios.com
State Accepted, archived
Delegated to: Jérémie Galarneau
Headers show

Commit Message

Michael Jeanson June 2, 2017, 3:56 p.m. UTC
Turns out that contrary to what is documented some versions of distutils
don't honor the LIBS variable, use LDFLAGS instead.

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 bindings/python/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Jérémie Galarneau June 13, 2017, 3:41 p.m. UTC | #1
Merged in stable-1.5. Thanks!

Jérémie

On 2 June 2017 at 11:56, Michael Jeanson <mjeanson at efficios.com> wrote:
> Turns out that contrary to what is documented some versions of distutils
> don't honor the LIBS variable, use LDFLAGS instead.
>
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  bindings/python/Makefile.am | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
> index f6806a8..2ceab03 100644
> --- a/bindings/python/Makefile.am
> +++ b/bindings/python/Makefile.am
> @@ -25,8 +25,7 @@ BINDINGS_DEPS=setup.py \
>  BUILD_FLAGS=CC="$(CC)" \
>                 CFLAGS="$(GLIB_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" \
>                 CPPFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)" \
> -               LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
> -               LIBS="$(GLIB_LIBS) $(LIBS)"
> +               LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) $(LIBS)"
>
>  build-python-bindings.stamp: $(BINDINGS_DEPS)
>         $(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build_ext
> --
> 2.7.4
>
diff mbox

Patch

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index f6806a8..2ceab03 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -25,8 +25,7 @@  BINDINGS_DEPS=setup.py \
 BUILD_FLAGS=CC="$(CC)" \
 		CFLAGS="$(GLIB_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" \
 		CPPFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)" \
-		LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
-		LIBS="$(GLIB_LIBS) $(LIBS)"
+		LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) $(LIBS)"
 
 build-python-bindings.stamp: $(BINDINGS_DEPS)
 	$(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build_ext