Attachment #193076 for bug #228011

Lines 18-23 Link Here

(-)Makefile (+6 lines)
18	LICENSE_FILE= ${WRKSRC}/LICENSE	18	LICENSE_FILE= ${WRKSRC}/LICENSE
19		19
20	USES= fortran gmake perl5	20	USES= fortran gmake perl5
		21	.if !defined(ARCH)
		22	ARCH!= uname -p
		23	.endif
		24	.if ${ARCH} == amd64
		25	fortran_ARGS= flang
		26	.endif
21		27
22	USE_GITHUB= yes	28	USE_GITHUB= yes
23	GH_ACCOUNT= xianyi	29	GH_ACCOUNT= xianyi




--- Makefile.system.orig	2017-07-23 21:03:35.000000000 -0700
+++ Makefile.system	2018-05-05 20:36:57.037963000 -0700
@@ -230,6 +230,9 @@
 endif
 
 ifeq ($(OSNAME), FreeBSD)
+ifneq ($(ARCH), amd64)
+EXTRALIB	+= -lm %%LDFLAGS%%
+endif
 MD5SUM = md5 -r
 endif
 
@@ -948,9 +951,17 @@
 endif
 
 ifndef LIBNAMESUFFIX

 endif
 
 KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
@@ -1089,24 +1100,8 @@
 LIBSUFFIX = a
 endif
 

 
 LIBDLLNAME   = $(LIBPREFIX).dll
 LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
@@ -1139,7 +1134,7 @@
 endif
 
 export OSNAME




--- exports/Makefile.orig	2015-10-27 20:44:50 UTC
+++ exports/Makefile
@@ -140,6 +140,7 @@ endif
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
 ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
 
+EXTRALIB += -lgfortran
 so : ../$(LIBSONAME)
 
 ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
@@ -151,6 +152,7 @@ else
 endif
 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
+	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
 	$(FEXTRALIB) $(EXTRALIB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
 	rm -f linktest

Return to bug 228011

Lines 1-14 Link Here

(-)files/patch-Makefile.system (-6 / +8 lines)
1	--- Makefile.system.orig 2015-10-27 20:44:50 UTC	1	--- Makefile.system.orig 2017-07-23 21:03:35.000000000 -0700
2	+++ Makefile.system	2	+++ Makefile.system 2018-05-05 20:36:57.037963000 -0700
3	@@ -218,6 +218,7 @@ MD5SUM = md5 -r	3	@@ -230,6 +230,9 @@
4	endif	4	endif
5		5
6	ifeq ($(OSNAME), FreeBSD)	6	ifeq ($(OSNAME), FreeBSD)
		7	+ifneq ($(ARCH), amd64)
7	+EXTRALIB += -lm %%LDFLAGS%%	8	+EXTRALIB += -lm %%LDFLAGS%%
		9	+endif
8	MD5SUM = md5 -r	10	MD5SUM = md5 -r
9	endif	11	endif
10		12
11	@@ -889,9 +890,17 @@ SYMBOLSUFFIX =	13	@@ -948,9 +951,17 @@
12	endif	14	endif
13		15
14	ifndef LIBNAMESUFFIX	16	ifndef LIBNAMESUFFIX
Lines 26-32 Link Here
26	endif	28	endif
27		29
28	KERNELDIR = $(TOPDIR)/kernel/$(ARCH)	30	KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
29	@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX	31	@@ -1089,24 +1100,8 @@
30	LIBSUFFIX = a	32	LIBSUFFIX = a
31	endif	33	endif
32		34
Lines 51-57 Link Here
51		53
52	LIBDLLNAME = $(LIBPREFIX).dll	54	LIBDLLNAME = $(LIBPREFIX).dll
53	LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)	55	LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
54	@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS	56	@@ -1139,7 +1134,7 @@
55	endif	57	endif
56		58
57	export OSNAME	59	export OSNAME

Lines 1-18 Link Here

(-)files/patch-exports+Makefile (-18 lines)
1	--- exports/Makefile.orig 2015-10-27 20:44:50 UTC
2	+++ exports/Makefile
3	@@ -140,6 +140,7 @@ endif
4	#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
5	ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
6
7	+EXTRALIB += -lgfortran
8	so : ../$(LIBSONAME)
9
10	ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
11	@@ -151,6 +152,7 @@ else
12	endif
13	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
14	-Wl,--whole-archive $< -Wl,--no-whole-archive \
15	+ -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
16	$(FEXTRALIB) $(EXTRALIB)
17	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
18	rm -f linktest