| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 18415c0b4c6e50ed9b99dfdae8d210590d0ab72e Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Fri, 28 Apr 2017 04:50:30 -0400 |
| 4 | Subject: [PATCH] explicitly support python3 by pkg-config |
| 5 | |
| 6 | The PYTHON_CPPFLAGS and -lpython$(PYTHON_VERSION) is hardcoded, |
| 7 | use pkg-config to replace |
| 8 | |
| 9 | Upstream-Status: Inappropriate [wr-installer specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | Makefile.am | 5 ++--- |
| 14 | configure.ac | 2 ++ |
| 15 | 2 files changed, 4 insertions(+), 3 deletions(-) |
| 16 | |
| 17 | diff --git a/Makefile.am b/Makefile.am |
| 18 | index 4569bbf..7a8daf4 100644 |
| 19 | --- a/Makefile.am |
| 20 | +++ b/Makefile.am |
| 21 | @@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 |
| 22 | AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \ |
| 23 | $(libcryptsetup_CFLAGS) $(nss_CFLAGS) |
| 24 | LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' |
| 25 | -PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) |
| 26 | |
| 27 | ## Targets |
| 28 | SUBDIRS = po |
| 29 | @@ -63,9 +62,9 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \ |
| 30 | $(LTLIBINTL) $(libcryptsetup_LIBS) $(nss_LIBS) |
| 31 | |
| 32 | python__volume_key_la_SOURCES = python/volume_key_wrap.c |
| 33 | -python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) |
| 34 | +python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(python3_CFLAGS) |
| 35 | python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) |
| 36 | -python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \ |
| 37 | +python__volume_key_la_LIBADD = lib/libvolume_key.la $(python3_LIBS) \ |
| 38 | $(glib_LIBS) $(nss_LIBS) |
| 39 | |
| 40 | src_volume_key_SOURCES = src/volume_key.c |
| 41 | diff --git a/configure.ac b/configure.ac |
| 42 | index ff35dd0..0928a6c 100644 |
| 43 | --- a/configure.ac |
| 44 | +++ b/configure.ac |
| 45 | @@ -27,6 +27,8 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz no-define subdir-objects -Wall]) |
| 46 | AC_PROG_CC |
| 47 | AM_PROG_CC_C_O |
| 48 | LT_INIT([disable-static]) |
| 49 | + |
| 50 | +PKG_CHECK_MODULES(python3, [python3]) |
| 51 | AM_PATH_PYTHON |
| 52 | |
| 53 | dnl Not gpg2, it cannot receive passphrases from gpgme |
| 54 | -- |
| 55 | 2.8.1 |
| 56 | |