| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 06710ab89fc7d7a82a378289aa3fcd92d33074f2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 27 Apr 2017 03:31:00 -0400 |
| 4 | Subject: [PATCH] remove python2 support |
| 5 | |
| 6 | We do not require python2, so remove it. |
| 7 | |
| 8 | Upstream-Status: Inappropriate workaround |
| 9 | |
| 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 11 | --- |
| 12 | configure.ac | 15 --------------- |
| 13 | src/client-python/reportclient/Makefile.am | 9 --------- |
| 14 | src/report-python/Makefile.am | 19 ------------------- |
| 15 | 3 files changed, 43 deletions(-) |
| 16 | |
| 17 | diff --git a/configure.ac b/configure.ac |
| 18 | index eb50382..826d0fe 100644 |
| 19 | --- a/configure.ac |
| 20 | +++ b/configure.ac |
| 21 | @@ -166,15 +166,6 @@ do |
| 22 | done |
| 23 | fi dnl end NO_MANTISBT |
| 24 | |
| 25 | -AC_PATH_PROG([PYTHON_CONFIG], [python-config], [no]) |
| 26 | -[if test "$PYTHON_CONFIG" = "no"] |
| 27 | -[then] |
| 28 | - [echo "The python-config program was not found in the search path. Please ensure"] |
| 29 | - [echo "that it is installed and its directory is included in the search path."] |
| 30 | - [echo "Then run configure again before attempting to build libreport."] |
| 31 | - [exit 1] |
| 32 | -[fi] |
| 33 | - |
| 34 | AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) |
| 35 | [if test "$PYTHON3_CONFIG" = "no"] |
| 36 | [then] |
| 37 | @@ -184,9 +175,6 @@ AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) |
| 38 | [exit 1] |
| 39 | [fi] |
| 40 | |
| 41 | -PYTHON_CFLAGS=`python-config --cflags 2> /dev/null` |
| 42 | -PYTHON_LIBS=`python-config --libs 2> /dev/null` |
| 43 | - |
| 44 | PYTHON3_CFLAGS=`python3-config --cflags 2> /dev/null` |
| 45 | PYTHON3_LIBS=`python3-config --libs 2> /dev/null` |
| 46 | |
| 47 | @@ -198,9 +186,6 @@ PYTHON3_DIR=`$PYTHON3 -c "import distutils.sysconfig; \ |
| 48 | PYTHON3_EXECDIR=`$PYTHON3 -c "import distutils.sysconfig; \ |
| 49 | print(distutils.sysconfig.get_python_lib(1,0,prefix='$PYTHON3_EXEC_PREFIX'))"` |
| 50 | |
| 51 | -AC_SUBST(PYTHON_CFLAGS) |
| 52 | -AC_SUBST(PYTHON_LIBS) |
| 53 | - |
| 54 | AC_SUBST(PYTHON3_CFLAGS) |
| 55 | AC_SUBST(PYTHON3_LIBS) |
| 56 | AC_SUBST(python3dir, $PYTHON3_DIR) |
| 57 | diff --git a/src/client-python/reportclient/Makefile.am b/src/client-python/reportclient/Makefile.am |
| 58 | index 46ac42f..fb5216a 100644 |
| 59 | --- a/src/client-python/reportclient/Makefile.am |
| 60 | +++ b/src/client-python/reportclient/Makefile.am |
| 61 | @@ -4,13 +4,10 @@ PYFILES = \ |
| 62 | dnfdebuginfo.py \ |
| 63 | yumdebuginfo.py |
| 64 | |
| 65 | -py2clientdir = $(pyexecdir)/reportclient |
| 66 | py3clientdir = $(py3execdir)/reportclient |
| 67 | |
| 68 | -py2client_PYTHON = $(PYFILES) |
| 69 | py3client_PYTHON = $(PYFILES) |
| 70 | |
| 71 | -py2client_LTLIBRARIES = _reportclient.la |
| 72 | py3client_LTLIBRARIES = _reportclient3.la |
| 73 | |
| 74 | PYEXTFILES = \ |
| 75 | @@ -33,12 +30,6 @@ PYEXTLDFLAGS = \ |
| 76 | -avoid-version \ |
| 77 | -Wl,-z,relro -Wl,-z,now |
| 78 | |
| 79 | -_reportclient_la_SOURCES = $(PYEXTFILES) |
| 80 | -_reportclient_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON_CFLAGS) |
| 81 | -_reportclient_la_LDFLAGS = $(PYEXTLDFLAGS) \ |
| 82 | - -export-symbols-regex init_reportclient |
| 83 | -_reportclient_la_LIBADD = ../../lib/libreport.la |
| 84 | - |
| 85 | _reportclient3_la_SOURCES = $(PYEXTFILES) |
| 86 | _reportclient3_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON3_CFLAGS) |
| 87 | _reportclient3_la_LDFLAGS = $(PYEXTLDFLAGS) \ |
| 88 | diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am |
| 89 | index 793cebd..241dcb7 100644 |
| 90 | --- a/src/report-python/Makefile.am |
| 91 | +++ b/src/report-python/Makefile.am |
| 92 | @@ -1,12 +1,9 @@ |
| 93 | PYFILES = __init__.py accountmanager.py |
| 94 | |
| 95 | -pyreportexecdir = $(pyexecdir)/report |
| 96 | py3reportexecdir = $(py3execdir)/report |
| 97 | |
| 98 | -pyreportexec_PYTHON = $(PYFILES) |
| 99 | py3reportexec_PYTHON = $(PYFILES) |
| 100 | |
| 101 | -pyreportexec_LTLIBRARIES = _pyreport.la |
| 102 | py3reportexec_LTLIBRARIES = _py3report.la |
| 103 | |
| 104 | PYEXTFILES = \ |
| 105 | @@ -34,20 +31,6 @@ PYEXTLDFLAGS = \ |
| 106 | -avoid-version \ |
| 107 | -Wl,-z,relro -Wl,-z,now |
| 108 | |
| 109 | -_pyreport_la_SOURCES = $(PYEXTFILES) |
| 110 | - |
| 111 | -_pyreport_la_CPPFLAGS = \ |
| 112 | - $(PYEXTCPPFLAGS) \ |
| 113 | - $(PYTHON_CFLAGS) |
| 114 | - |
| 115 | -_pyreport_la_LDFLAGS = \ |
| 116 | - $(PYEXTLDFLAGS) \ |
| 117 | - -export-symbols-regex init_pyreport |
| 118 | - |
| 119 | -_pyreport_la_LIBADD = \ |
| 120 | - ../lib/libreport.la \ |
| 121 | - $(PYTHON2_LIBS) |
| 122 | - |
| 123 | _py3report_la_SOURCES = $(PYEXTFILES) |
| 124 | |
| 125 | _py3report_la_CPPFLAGS = \ |
| 126 | @@ -64,7 +47,6 @@ _py3report_la_LIBADD = \ |
| 127 | |
| 128 | # report compat: |
| 129 | |
| 130 | -pyreportioexecdir = $(pyexecdir)/report/io |
| 131 | py3reportioexecdir = $(py3execdir)/report/io |
| 132 | |
| 133 | PYIOFILES = \ |
| 134 | @@ -73,5 +55,4 @@ PYIOFILES = \ |
| 135 | io/NewtIO.py \ |
| 136 | io/TextIO.py |
| 137 | |
| 138 | -pyreportioexec_PYTHON = $(PYIOFILES) |
| 139 | py3reportioexec_PYTHON = $(PYIOFILES) |
| 140 | -- |
| 141 | 2.8.1 |
| 142 | |