Skip to content

Commit b99f16f

Browse files
committed
objconv cannot do in-place modification of files
1 parent cf82345 commit b99f16f

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

deps/openblas-symbol-rename.patch

+23-10
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ index d2ff741..ec6339d 100644
2727

2828
include $(TOPDIR)/Makefile.$(ARCH)
2929
diff --git a/exports/Makefile b/exports/Makefile
30-
index c798bc7..9ed5a0f 100644
30+
index c798bc7..f68da88 100644
3131
--- a/exports/Makefile
3232
+++ b/exports/Makefile
33-
@@ -88,12 +88,17 @@ dll : ../$(LIBDLLNAME)
33+
@@ -88,12 +88,18 @@ dll : ../$(LIBDLLNAME)
3434
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
3535

3636
libopenblas.def : gensymbol
@@ -44,26 +44,39 @@ index c798bc7..9ed5a0f 100644
4444
+ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
4545
$(LIBDYNNAME) : ../$(LIBNAME) osx.def
4646
+else
47-
+$(LIBDYNNAME) : ../$(LIBNAME) osx.def objconv.def
48-
+ $(OBJCONV) @objconv.def ../$(LIBNAME)
47+
+../$(LIBNAME).renamed : ../$(LIBNAME) objconv.def
48+
+ $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).renamed
49+
+$(LIBDYNNAME) : ../$(LIBNAME).renamed osx.def
4950
+endif
5051
$(FC) $(FFLAGS) -all_load -headerpad_max_install_names -install_name $(CURDIR)/../$(LIBDYNNAME) -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
5152

5253
dllinit.$(SUFFIX) : dllinit.c
53-
@@ -103,7 +108,12 @@ ifeq ($(OSNAME), Linux)
54+
@@ -103,16 +109,22 @@ ifeq ($(OSNAME), Linux)
5455

5556
so : ../$(LIBSONAME)
5657

5758
+ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
5859
../$(LIBSONAME) : ../$(LIBNAME) linktest.c
5960
+else
60-
+../$(LIBSONAME) : ../$(LIBNAME) linktest.c objcopy.def
61-
+ $(OBJCOPY) --redefine-syms objcopy.def ../$(LIBNAME)
61+
+../$(LIBNAME).renamed : ../$(LIBNAME) objcopy.def
62+
+ $(OBJCOPY) --redefine-syms objcopy.def ../$(LIBNAME) ../$(LIBNAME).renamed
63+
+../$(LIBSONAME) : ../$(LIBNAME).renamed linktest.c
6264
+endif
6365
ifneq ($(C_COMPILER), LSB)
6466
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
65-
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
66-
@@ -125,7 +135,12 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
67+
- -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
68+
+ -Wl,--whole-archive $< -Wl,--no-whole-archive \
69+
-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
70+
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
71+
else
72+
#for LSB
73+
env LSBCC_SHAREDLIBS=gfortran $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
74+
- -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
75+
+ -Wl,--whole-archive $< -Wl,--no-whole-archive \
76+
-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
77+
$(FC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
78+
endif
79+
@@ -125,7 +137,12 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
6780

6881
so : ../$(LIBSONAME)
6982

@@ -76,7 +89,7 @@ index c798bc7..9ed5a0f 100644
7689
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
7790
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
7891
$(FEXTRALIB) $(EXTRALIB)
79-
@@ -178,17 +193,23 @@ static : ../$(LIBNAME)
92+
@@ -178,17 +195,23 @@ static : ../$(LIBNAME)
8093
rm -f goto.$(SUFFIX)
8194

8295
osx.def : gensymbol ../Makefile.system ../getarch.c

0 commit comments

Comments
 (0)