Skip to content

Commit e478c4b

Browse files
committed
update patch
1 parent 253e658 commit e478c4b

File tree

1 file changed

+43
-5
lines changed

1 file changed

+43
-5
lines changed

patches/0001-create-a-single-shared-object.patch

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From ebca632fd6a3b41643d2cd51da37c6c199e915be Mon Sep 17 00:00:00 2001
1+
From 80863b52c024ed2d5fda80546e7b6a0160531b9a Mon Sep 17 00:00:00 2001
22
From: mattip <[email protected]>
3-
Date: Sat, 20 Jan 2024 23:34:21 +0200
3+
Date: Sun, 21 Jan 2024 08:35:54 +0200
44
Subject: [PATCH] create a single shared object
55

66
---
7-
Makefile | 5 -----
7+
Makefile | 10 ----------
88
Makefile.install | 15 ---------------
99
Makefile.system | 3 +++
1010
exports/Makefile | 4 ++--
11-
4 files changed, 5 insertions(+), 22 deletions(-)
11+
4 files changed, 5 insertions(+), 27 deletions(-)
1212

1313
diff --git a/Makefile b/Makefile
14-
index 8621a8b3f..0febfd0a6 100644
14+
index 8621a8b3f..56a449306 100644
1515
--- a/Makefile
1616
+++ b/Makefile
1717
@@ -134,17 +134,12 @@ shared : libs netlib $(RELA)
@@ -32,6 +32,44 @@ index 8621a8b3f..0febfd0a6 100644
3232
endif
3333
ifeq ($(OSNAME), WINNT)
3434
@$(MAKE) -C exports dll
35+
@@ -213,13 +208,11 @@ endif
36+
ifdef USE_THREAD
37+
@echo USE_THREAD=$(USE_THREAD) >> Makefile.conf_last
38+
endif
39+
- @-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
40+
@touch lib.grd
41+
42+
prof : prof_blas prof_lapack
43+
44+
prof_blas :
45+
- ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
46+
for d in $(SUBDIRS) ; \
47+
do if test -d $$d; then \
48+
$(MAKE) -C $$d prof || exit 1 ; \
49+
@@ -230,7 +223,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
50+
endif
51+
52+
blas :
53+
- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
54+
for d in $(BLASDIRS) ; \
55+
do if test -d $$d; then \
56+
$(MAKE) -C $$d libs || exit 1 ; \
57+
@@ -238,7 +230,6 @@ blas :
58+
done
59+
60+
hpl :
61+
- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
62+
for d in $(BLASDIRS) ../laswp exports ; \
63+
do if test -d $$d; then \
64+
$(MAKE) -C $$d $(@F) || exit 1 ; \
65+
@@ -252,7 +243,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
66+
endif
67+
68+
hpl_p :
69+
- ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
70+
for d in $(SUBDIRS) ../laswp exports ; \
71+
do if test -d $$d; then \
72+
$(MAKE) -C $$d $(@F) || exit 1 ; \
3573
diff --git a/Makefile.install b/Makefile.install
3674
index 01899b970..105bc4271 100644
3775
--- a/Makefile.install

0 commit comments

Comments
 (0)