tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] fix math/py-scipy linker error on CentOS 7



Hi,

I had this weird linker error, probably relating to my introduction of
BLAS linker flags, trying to build py-scipy. The issue is more general,
though, and there is an upstream patch that is part of the current
release.

Please consider importing the attached patch (also part of the
collection at
http://src.rrz.uni-hamburg.de/extra/pkgsrc-patches/2019Q1/) to the
2019Q1 branch. The version in trunk should just be updated to 1.2.x, I
presume.


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg
diff -ruN -x CVS -x Makefile -x options.mk -x buildlink3.mk pkgsrc-2019Q1/math/py-scipy/distinfo pkgsrc/math/py-scipy/distinfo
--- pkgsrc-2019Q1/math/py-scipy/distinfo	2018-09-03 11:04:24.000000000 +0200
+++ pkgsrc/math/py-scipy/distinfo	2019-04-12 23:12:29.374255574 +0200
@@ -5,3 +5,4 @@
 SHA512 (scipy-1.1.0.tar.gz) = 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
 Size (scipy-1.1.0.tar.gz) = 15583560 bytes
 SHA1 (patch-scipy_special___round.h) = bc05a935e6423ce8395450ad3b30e88826939422
+SHA1 (patch-setup_py-linkerversion.patch) = b4de14025493d6d2f7ddb7f9b0662e1b4fdab2a0
diff -ruN -x CVS -x Makefile -x options.mk -x buildlink3.mk pkgsrc-2019Q1/math/py-scipy/patches/patch-setup_py-linkerversion.patch pkgsrc/math/py-scipy/patches/patch-setup_py-linkerversion.patch
--- pkgsrc-2019Q1/math/py-scipy/patches/patch-setup_py-linkerversion.patch	1970-01-01 01:00:00.000000000 +0100
+++ pkgsrc/math/py-scipy/patches/patch-setup_py-linkerversion.patch	2019-04-12 23:11:47.814225855 +0200
@@ -0,0 +1,32 @@
+$NetBSD$
+
+This patch can be dropped once updating to 1.2.x. It fixes build
+failures regarding linker flags:
+
+ld: anonymous version tag cannot be combined with other version tags
+
+From 34d3d0a4aac379aa01bdf987f8898faf90cb1613 Mon Sep 17 00:00:00 2001
+From: Tyler Reddy <tyler.je.reddy%gmail.com@localhost>
+Date: Tue, 6 Nov 2018 10:47:01 -0800
+Subject: [PATCH] BLD: version-script handling in setup.py
+
+* remove any version-script flags prior
+to processing of extra_link_args in
+setup.py to resolve gh-8680
+---
+ setup.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git setup.py setup.py
+index eefdaf289ff..a4a9c1c31eb 100755
+--- setup.py
++++ setup.py
+@@ -211,6 +211,8 @@ def build_extension(self, ext):
+                 script_fn = os.path.join(self.build_temp, 'link-version-{}.map'.format(ext.name))
+                 with open(script_fn, 'w') as f:
+                     f.write(text)
++                    # line below fixes gh-8680
++                    ext.extra_link_args = [arg for arg in ext.extra_link_args if not "version-script" in arg]
+                     ext.extra_link_args.append('-Wl,--version-script=' + script_fn)
+ 
+             old_build_ext.build_extension(self, ext)


Home | Main Index | Thread Index | Old Index