Index: Makefile =================================================================== --- Makefile (revision 469172) +++ Makefile (working copy) @@ -18,6 +18,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= fortran gmake perl5 +.if !defined(ARCH) + ARCH!= uname -p +.endif +.if ${ARCH} == amd64 + fortran_ARGS= flang +.endif USE_GITHUB= yes GH_ACCOUNT= xianyi Index: files/patch-Makefile.system =================================================================== --- files/patch-Makefile.system (revision 469172) +++ files/patch-Makefile.system (working copy) @@ -1,14 +1,16 @@ ---- Makefile.system.orig 2015-10-27 20:44:50 UTC -+++ Makefile.system -@@ -218,6 +218,7 @@ MD5SUM = md5 -r +--- 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 -@@ -889,9 +890,17 @@ SYMBOLSUFFIX = +@@ -948,9 +951,17 @@ endif ifndef LIBNAMESUFFIX @@ -26,7 +28,7 @@ endif KERNELDIR = $(TOPDIR)/kernel/$(ARCH) -@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX +@@ -1089,24 +1100,8 @@ LIBSUFFIX = a endif @@ -51,7 +53,7 @@ LIBDLLNAME = $(LIBPREFIX).dll LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so) -@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS +@@ -1139,7 +1134,7 @@ endif export OSNAME Index: files/patch-exports+Makefile =================================================================== --- files/patch-exports+Makefile (revision 469172) +++ files/patch-exports+Makefile (nonexistent) @@ -1,18 +0,0 @@ ---- 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 Property changes on: files/patch-exports+Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property