python3

Author: sfomel

framework/configure.py

@@ -376,6 +376,13 @@ def cc(context):
             if os.path.isdir('/sw/lib'):
                 context.env['LIBPATH'] = path_get(context,'LIBPATH',
                                                   '/sw/lib')
+        if os.path.isdir('/opt/homebrew'):  # paths for Homebrew
+            if os.path.isdir('/opt/homebrew/include'):
+                context.env['CPPPATH'] = path_get(context, 'CPPPATH',
+                                                  '/opt/homebrew/include')
+            if os.path.isdir('/opt/homebrew/lib'):
+                context.env['LIBPATH'] = path_get(context, 'LIBPATH',
+                                                  '/opt/homebrew/lib')
         if os.path.isdir('/usr/local/Homebrew'):  # paths for Homebrew
             if os.path.isdir('/usr/local/include'):
                 context.env['CPPPATH'] = path_get(context, 'CPPPATH',
@@ -693,7 +700,7 @@ def sfpen(context):
                  'fedora':'netpbm-devel',
                  'centos':'netpbm-devel',
                  'suse'  :'libnetpbm-devel',
-                 'ubuntu':'libnetpbm10-dev'}
+                 'ubuntu':'libnetpbm11-dev'}
 
 def ppm(context):
     context.Message("checking for ppm ... ")
@@ -899,6 +906,7 @@ def ffmpeg(context):
     else:
         for top in ('/usr/include','/usr/local/include',
                     '/usr/include/x86_64-linux-gnu/',
+                    '/usr/include/aarch64-linux-gnu/',
                     '/sw/include','/opt/local/include',
                     '/usr/include/ffmpeg'):
             ffmpegpath = os.path.join(top,'ffmpeg')
@@ -2198,9 +2206,9 @@ def f77(context):
     oldlink = context.env.get('LINK')
     context.env['LINK'] = F77
     res = context.TryLink(text,'.f')
-    context.env['LINK'] = oldlink
     context.Result(res)
     if not res:
+        context.env['LINK'] = oldlink
         del context.env['F77']
         sys.exit(unix_failure)
     F77base = os.path.basename(F77)