[pyferret] 75/110: Link against correct libpyferret during build

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit 9548673f8ee00ba4cf7f9d8954af560030b35206
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 14 04:21:31 2016 +0100

    Link against correct libpyferret during build
---
 debian/ef_utility/platform_specific.mk.debian |  3 +--
 debian/rules                                  | 16 ++++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/ef_utility/platform_specific.mk.debian b/debian/ef_utility/platform_specific.mk.debian
index fe044e5..6e1e52b 100644
--- a/debian/ef_utility/platform_specific.mk.debian
+++ b/debian/ef_utility/platform_specific.mk.debian
@@ -27,8 +27,7 @@ RANLIB		= /usr/bin/ranlib
 
 LD		= gfortran
 LD_DYN_FLAGS	= -fPIC  -shared 
-SYSLIBS		= -L$(INSTALL_FER_DIR)/lib64/$(PYTHON_EXE)/site-packages/pyferret \
-		  -L$(INSTALL_FER_DIR)/lib/$(PYTHON_EXE)/site-packages/pyferret -lpyferret
+SYSLIBS		= -L$(INSTALL_FER_DIR)/lib/$(PYTHON_EXE) -lpyferret
 
 CPP		= /lib/cpp
 CPP_FLAGS	= -P -traditional $(INCLUDES)
diff --git a/debian/rules b/debian/rules
index 3776afb..20f0094 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,8 @@ ARCH:=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(ARCH)
 INSTALLDIR:=$(CURDIR)/debian/tmp
 
-PY2VERS:=$(shell pyversions -r)
-PY3VERS:=$(shell py3versions -r)
+PY2:=$(shell pyversions -r)
+PY3:=$(shell py3versions -r)
 
 override_dh_auto_build:
 	cp debian/platform_specific.mk.debian .
@@ -27,16 +27,20 @@ override_dh_auto_build:
                 -e 's%@INSTALLDIR@%${INSTALLDIR}%' \
                 < debian/site_specific.mk.in > site_specific.mk
 	cp site_specific.mk external_functions/ef_utility
+	# Need temp. libraries during build.
+	mkdir -p $(INSTALLDIR)/lib/$(PY2)
+	mkdir -p $(INSTALLDIR)/lib/$(PY3)
+	ln -s $(CURDIR)/install/lib/$(PY2)/site-packages/pyferret/libpyferret.so \
+		$(INSTALLDIR)/lib/$(PY2)/site-packages/pyferret/libpyferret.so
+	ln -s $(CURDIR)/install/lib/$(PY3)/site-packages//pyferret/libpyferret.cpython-35m-$(ARCH).so \
+		$(INSTALLDIR)/lib/$(PY3)/libpyferret.so
 
 override_dh_auto_install:
-	for p in $(PY2VERS) $(PY3VERS) ; do \
+	for p in $(PY2) $(PY3) ; do \
 		$(MAKE) HOSTTYPE=debian PYTHON_EXE=$$p clean all install ; \
 		done
 	find debian -name '*.pyo' -o -name '*.pyc' -delete
 	find debian -type d -name __pycache__ -delete
-	# libpyferret.so needs a link because its linked by externally loaded modules
-	# FIXME: How to cope when there are two versions?
-	dh_link -p python-ferret /usr/lib/python2.7/dist-packages/pyferret/libpyferret.$(ARCH).so $(LIBDIR)/libpyferret.so
 	dh_numpy
 	dh_numpy3
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git