Ticket #26715: pgfortran.patch

exports/Makefile

@@ -138 +138 @@
 ifneq ($(C_COMPILER), LSB)
         $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
         -Wl,--whole-archive $< -Wl,--no-whole-archive \
-        -Wl,-soname,$(INTERNALNAME) $(EXTRALIB)
+        -Wl,-soname,$(INTERNALNAME) $(EXTRALIB) $(FEXTRALIB)
         $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
 else
 #for LSB
         env LSBCC_SHAREDLIBS=gfortran $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
         -Wl,--whole-archive $< -Wl,--no-whole-archive \
-        -Wl,-soname,$(INTERNALNAME) $(EXTRALIB)
+        -Wl,-soname,$(INTERNALNAME) $(EXTRALIB) $(FEXTRALIB)
         $(FC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
 endif
         rm -f linktest
@@ -183 +183 @@
 
 so : ../$(LIBSONAME)
         $(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
-        -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
+        -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB) $(FEXTRALIB)
         $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
         rm -f linktest
 

f_check

@@ -284 +284 @@
             && ($flags !~ /^-LIST:/)
             && ($flags !~ /^-LANG:/)
             ) {
-            if ($vendor eq "PGI") {
-                $flags =~ s/lib$/libso/;
-            }
             $linker_L .= $flags . " ";
         }
 
@@ -311 +308 @@
 
         if ($flags =~ /^\-rpath-link\@/) {
             $flags =~ s/\@/\,/g;
-            if ($vendor eq "PGI") {
-                $flags =~ s/lib$/libso/;
-            }
             $linker_L .= "-Wl,". $flags . " " ;
         }
 
@@ -322 +316 @@
             && ($flags !~ /gfortranbegin/)
             && ($flags !~ /frtbegin/)
             && ($flags !~ /pathfstart/)
-            && ($flags !~ /numa/)
             && ($flags !~ /crt[0-9]/)
             && ($flags !~ /gcc/)
             && ($flags !~ /user32/)