mirror of https://github.com/pyodide/pyodide.git
166 lines
6.5 KiB
Diff
166 lines
6.5 KiB
Diff
From 8aae131e7bf4cfe3979edbbdce21803e1c5f9ac1 Mon Sep 17 00:00:00 2001
|
|
From: Roman Yurchak <rth.yurchak@pm.me>
|
|
Date: Thu, 25 Oct 2018 11:50:14 +0200
|
|
Subject: [PATCH 3/3] Remove redundant symbols
|
|
|
|
---
|
|
Makefile | 9 +++++++++
|
|
SRC/Makefile | 30 ++++++++++++++++++++----------
|
|
make.inc | 6 +-----
|
|
3 files changed, 30 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index b3467a6..83baba5 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -5,6 +5,15 @@
|
|
#
|
|
|
|
include make.inc
|
|
+include ../Makefile.envs
|
|
+
|
|
+TOPDIR=$(abspath .)
|
|
+
|
|
+CFLAGS = $(CFLAGS_OPT) -I$(TOPDIR)/INCLUDE -fPIC -DNO_BLAS_WRAP
|
|
+LDFLAGS = $(LDFLAGS_OPT) -fPIC
|
|
+DRVCFLAGS = $(CFLAGS)
|
|
+F2CCFLAGS = $(CFLAGS)
|
|
+
|
|
|
|
all: f2clib lib
|
|
#all: f2clib lapack_install lib lapack_testing blas_testing variants_testing
|
|
diff --git a/SRC/Makefile b/SRC/Makefile
|
|
index 7491963..0cc1cda 100644
|
|
--- a/SRC/Makefile
|
|
+++ b/SRC/Makefile
|
|
@@ -50,9 +50,9 @@ include $(TOPDIR)/make.inc
|
|
#
|
|
#######################################################################
|
|
|
|
-ALLAUX = maxloc.o ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o \
|
|
+ALLAUX = maxloc.o ilaenv.o ieeeck.o lsamen.o iparmq.o \
|
|
ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
|
|
- ../INSTALL/ilaver.o ../INSTALL/lsame.o
|
|
+ ../INSTALL/ilaver.o
|
|
|
|
ALLXAUX =
|
|
|
|
@@ -90,11 +90,20 @@ DZLAUX = \
|
|
dsteqr.o dsterf.o dlaisnan.o disnan.o \
|
|
../INSTALL/dlamch.o ../INSTALL/dsecnd.o
|
|
|
|
+# We remove symbols that are included in scipy/linalg/src/lapack_deprecations/
|
|
+# cgegv.f dgegv.f sgegv.f zgegv.f
|
|
+# to avoid "symbol multiply defined" errors when linking statically
|
|
+# We also remove
|
|
+# clahqr, dlahqr, slahqr, zlahqr
|
|
+# to avoid duplicate symbol error when building scipy 0.17.1
|
|
+# scipy/sparse/linalg/eigen/arpack/_arpack.wasm
|
|
+
|
|
+
|
|
SLASRC = \
|
|
sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o \
|
|
sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o \
|
|
sgebrd.o sgecon.o sgeequ.o sgees.o sgeesx.o sgeev.o sgeevx.o \
|
|
- sgegs.o sgegv.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
|
|
+ sgegs.o sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
|
|
sgels.o sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o \
|
|
sgeqp3.o sgeqpf.o sgeqr2.o sgeqrf.o sgerfs.o sgerq2.o sgerqf.o \
|
|
sgesc2.o sgesdd.o sgesv.o sgesvd.o sgesvx.o sgetc2.o sgetf2.o \
|
|
@@ -104,7 +113,7 @@ SLASRC = \
|
|
sggrqf.o sggsvd.o sggsvp.o sgtcon.o sgtrfs.o sgtsv.o \
|
|
sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o \
|
|
shsein.o shseqr.o slabrd.o slacon.o slacn2.o \
|
|
- slaein.o slaexc.o slag2.o slags2.o slagtm.o slagv2.o slahqr.o \
|
|
+ slaein.o slaexc.o slag2.o slags2.o slagtm.o slagv2.o \
|
|
slahrd.o slahr2.o slaic1.o slaln2.o slals0.o slalsa.o slalsd.o \
|
|
slangb.o slange.o slangt.o slanhs.o slansb.o slansp.o \
|
|
slansy.o slantb.o slantp.o slantr.o slanv2.o \
|
|
@@ -152,11 +161,12 @@ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \
|
|
sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \
|
|
slascl2.o sla_wwaddw.o
|
|
|
|
+
|
|
CLASRC = \
|
|
cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o cgbsvx.o \
|
|
cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \
|
|
cgecon.o cgeequ.o cgees.o cgeesx.o cgeev.o cgeevx.o \
|
|
- cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o cgelqf.o \
|
|
+ cgegs.o cgehd2.o cgehrd.o cgelq2.o cgelqf.o \
|
|
cgels.o cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \
|
|
cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o cgerq2.o cgerqf.o \
|
|
cgesc2.o cgesdd.o cgesv.o cgesvd.o cgesvx.o cgetc2.o cgetf2.o cgetrf.o \
|
|
@@ -176,7 +186,7 @@ CLASRC = \
|
|
clacgv.o clacon.o clacn2.o clacp2.o clacpy.o clacrm.o clacrt.o cladiv.o \
|
|
claed0.o claed7.o claed8.o \
|
|
claein.o claesy.o claev2.o clags2.o clagtm.o \
|
|
- clahef.o clahqr.o \
|
|
+ clahef.o \
|
|
clahrd.o clahr2.o claic1.o clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \
|
|
clanhb.o clanhe.o \
|
|
clanhp.o clanhs.o clanht.o clansb.o clansp.o clansy.o clantb.o \
|
|
@@ -226,7 +236,7 @@ DLASRC = \
|
|
dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o \
|
|
dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \
|
|
dgebrd.o dgecon.o dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o \
|
|
- dgegs.o dgegv.o dgehd2.o dgehrd.o dgelq2.o dgelqf.o \
|
|
+ dgegs.o dgehd2.o dgehrd.o dgelq2.o dgelqf.o \
|
|
dgels.o dgelsd.o dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o \
|
|
dgeqp3.o dgeqpf.o dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o \
|
|
dgesc2.o dgesdd.o dgesv.o dgesvd.o dgesvx.o dgetc2.o dgetf2.o \
|
|
@@ -236,7 +246,7 @@ DLASRC = \
|
|
dggrqf.o dggsvd.o dggsvp.o dgtcon.o dgtrfs.o dgtsv.o \
|
|
dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o \
|
|
dhsein.o dhseqr.o dlabrd.o dlacon.o dlacn2.o \
|
|
- dlaein.o dlaexc.o dlag2.o dlags2.o dlagtm.o dlagv2.o dlahqr.o \
|
|
+ dlaein.o dlaexc.o dlag2.o dlags2.o dlagtm.o dlagv2.o \
|
|
dlahrd.o dlahr2.o dlaic1.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
|
|
dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o dlansp.o \
|
|
dlansy.o dlantb.o dlantp.o dlantr.o dlanv2.o \
|
|
@@ -290,7 +300,7 @@ ZLASRC = \
|
|
zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o \
|
|
zgbtf2.o zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \
|
|
zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \
|
|
- zgegs.o zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
|
|
+ zgegs.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
|
|
zgels.o zgelsd.o zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
|
|
zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerq2.o zgerqf.o \
|
|
zgesc2.o zgesdd.o zgesv.o zgesvd.o zgesvx.o zgetc2.o zgetf2.o zgetrf.o \
|
|
@@ -310,7 +320,7 @@ ZLASRC = \
|
|
zlacgv.o zlacon.o zlacn2.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o \
|
|
zlaed0.o zlaed7.o zlaed8.o \
|
|
zlaein.o zlaesy.o zlaev2.o zlags2.o zlagtm.o \
|
|
- zlahef.o zlahqr.o \
|
|
+ zlahef.o \
|
|
zlahrd.o zlahr2.o zlaic1.o zlals0.o zlalsa.o zlalsd.o zlangb.o zlange.o \
|
|
zlangt.o zlanhb.o \
|
|
zlanhe.o \
|
|
diff --git a/make.inc b/make.inc
|
|
index 567c737..d010f57 100644
|
|
--- a/make.inc
|
|
+++ b/make.inc
|
|
@@ -21,19 +21,15 @@ PLAT = _WA
|
|
# and desired load options for your machine.
|
|
#
|
|
#######################################################
|
|
+
|
|
# This is used to compile C libary
|
|
#CC = gcc # inherit $CC from emmake
|
|
# if no wrapping of the blas library is needed, uncomment next line
|
|
#CC = gcc -DNO_BLAS_WRAP
|
|
-CFLAGS = -O3 -I$(TOPDIR)/INCLUDE -fPIC -DNO_BLAS_WRAP
|
|
-LDFLAGS = -O3
|
|
LOADER = $(CC)
|
|
LOADOPTS =
|
|
NOOPT = -O0 -I$(TOPDIR)/INCLUDE
|
|
-DRVCFLAGS = $(CFLAGS)
|
|
-F2CCFLAGS = $(CFLAGS)
|
|
#######################################################################
|
|
-
|
|
#
|
|
# Timer for the SECOND and DSECND routines
|
|
#
|
|
--
|
|
2.19.0
|
|
|