pool/genders
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'python genderssetup.py ...'. With this the entire

Browse Source 
--with-extension-destdir infrastructure becomes pointless.
  The following patches remove it and make the install process
  rely on the DESTDIR make macro which is used by the autotools
  already:
  * Fix-Python-package-installation-use-root.patch
  * Remove-PERL_DESTDIR-use-DESTDIR-instead.patch
  * Remove-all-remains-of-EXTENSION_DESTDIR.patch

OBS-URL: https://build.opensuse.org/package/show/network:cluster/genders?expand=0&rev=3
This commit is contained in:
Egbert Eich 2018-01-29 06:15:55 +00:00 committed by Git OBS Bridge
parent 74ac2a9e25
commit b556eb5d18
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Fix-Python-package-installation-use-root.patch
View File

@ -2,7 +2,7 @@ From: Egbert Eich <eich@suse.com>
Date: Sat Jan 27 23:50:57 2018 +0100 Date: Sat Jan 27 23:50:57 2018 +0100
Subject: Fix Python package installation: use --root Subject: Fix Python package installation: use --root
Patch-mainline: Not yet Patch-mainline: Not yet
Git-commit: bb0b59d44608d9d3cfe1d3373967c523055213f3 Git-commit: f8aa6871f9ac452134c4077d47adef28d5e8a0a1
References: References:
Python allows the use of an alternative installation directory Python allows the use of an alternative installation directory
@ -11,37 +11,38 @@ the --prefix and --exec-prefix paths.
Signed-off-by: Egbert Eich <eich@suse.com> Signed-off-by: Egbert Eich <eich@suse.com>
--- ---
src/extensions/python/Makefile.am | 12 +++--------- src/extensions/python/Makefile.am | 12 +++++-------
1 file changed, 3 insertions(+), 9 deletions(-) 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/extensions/python/Makefile.am b/src/extensions/python/Makefile.am diff --git a/src/extensions/python/Makefile.am b/src/extensions/python/Makefile.am
index 5d62ae6..a55f5a0 100644 index 5d62ae6..86ba50d 100644
--- a/src/extensions/python/Makefile.am --- a/src/extensions/python/Makefile.am
+++ b/src/extensions/python/Makefile.am +++ b/src/extensions/python/Makefile.am
@@ -6,24 +6,18 @@ @@ -7,23 +7,21 @@
# Use Python's distutils to make/install everything into the right place. # Use Python's distutils to make/install everything into the right place.
-# DESTDIR is usually set during make install time, not configure or # DESTDIR is usually set during make install time, not configure or
-# make time, so we work around it with the --with-extension-destdir -# make time, so we work around it with the --with-extension-destdir
-# autoconf option. -# autoconf option.
- -
-PYTHON_DESTDIR = @EXTENSION_DESTDIR@ -PYTHON_DESTDIR = @EXTENSION_DESTDIR@
- +# make time, so we work around it with a shell command.
+PYDEST=$$(test -z "${DESTDIR}" || echo "--root=${DESTDIR}")
if WITH_PYTHON_EXTENSIONS if WITH_PYTHON_EXTENSIONS
all: genderssetup.py libgendersmodule.c genders.py all: genderssetup.py libgendersmodule.c genders.py
$(PYTHON) genderssetup.py build $(PYTHON) genderssetup.py build
install: install:
- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) - $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix)
+ $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) --root=$(DESTDIR) + $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) $(PYDEST)
pure_install: pure_install:
- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) - $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix)
+ $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) --root=$(DESTDIR) + $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) $(PYDEST)
install-data-local: install-data-local:
- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) - $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix)
+ $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) --root=$(DESTDIR) + $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) $(PYDEST)
clean: clean:
rm -rf build rm -rf build

9
genders.changes
View File

@ -2,7 +2,14 @@
Sun Jan 28 00:18:51 UTC 2018 - eich@suse.com Sun Jan 28 00:18:51 UTC 2018 - eich@suse.com
- Fix error in SLES build: use proper --root argument with - Fix error in SLES build: use proper --root argument with
'python genderssetup.py ...'. 'python genderssetup.py ...'. With this the entire
--with-extension-destdir infrastructure becomes pointless.
The following patches remove it and make the install process
rely on the DESTDIR make macro which is used by the autotools
already:
* Fix-Python-package-installation-use-root.patch
* Remove-PERL_DESTDIR-use-DESTDIR-instead.patch
* Remove-all-remains-of-EXTENSION_DESTDIR.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 8 11:07:09 UTC 2017 - cgoll@suse.com Fri Dec 8 11:07:09 UTC 2017 - cgoll@suse.com