| Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame] | 1 | From f60dc1063607ca1f201ba4cbda467d8af3f78f64 Mon Sep 17 00:00:00 2001 |
| 2 | From: Miroslav Lichvar <mlichvar@redhat.com> |
| 3 | Date: Tue, 1 Oct 2019 16:37:55 +0200 |
| 4 | Subject: [PATCH] don't ignore CFLAGS when building snack |
| 5 | |
| 6 | In addition to the flags returned by python-config --cflags, use the |
| 7 | user-specified CFLAGS when building the snack object. |
| 8 | |
| 9 | Upstream-Status: Backport from master |
| 10 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> |
| 11 | --- |
| 12 | Makefile.in | 4 ++-- |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/Makefile.in b/Makefile.in |
| 16 | index be5f87b..6facd5e 100644 |
| 17 | --- a/Makefile.in |
| 18 | +++ b/Makefile.in |
| 19 | @@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH) |
| 20 | PIFLAGS=`$$pyconfig --includes`; \ |
| 21 | PLDFLAGS=`$$pyconfig --ldflags`; \ |
| 22 | PLFLAGS=`$$pyconfig --libs`; \ |
| 23 | - echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ |
| 24 | - $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ |
| 25 | + echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ |
| 26 | + $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ |
| 27 | echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ |
| 28 | $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ |
| 29 | done || : |