Patchwork Fix location where math-vector-fortran.h is installed.

login
register
mail settings
Submitter Martin Liška
Date Feb. 27, 2019, 10:36 a.m.
Message ID <1c3a168a-b142-d6e5-55d6-f82850610cc8@suse.cz>
Download mbox | patch
Permalink /patch/31619/
State New
Headers show

Comments

Martin Liška - Feb. 27, 2019, 10:36 a.m.
On 2/27/19 11:12 AM, Florian Weimer wrote:
> * Martin Liška:
> 
>>          is_nonsysdep_header = os.access(header, os.R_OK)
>>          if is_nonsysdep_header:
>> +            # Skip Fortran header files
>> +            if '-*- f90 -*-' in open(header).readlines()[0]:
>> +                continue
> 
> Please use “with” to close the file promptly, and do not read the entire
> file, like this (untested):
> 
>     # Skip Fortran header files.
>     with open(header) as inp:
>         if '-*- f90 -*-' in next(inp):
>             continue

Good point. Is the patch ready to be installed now?

Thanks,
Martin

> 
> Thanks,
> Florian
>

Patch

From 5e786337c48dbf33453a634725e2e95b10c73b62 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Tue, 26 Feb 2019 18:17:36 +0100
Subject: [PATCH] Fix location where math-vector-fortran.h is installed.

ChangeLog:

2019-02-26  Martin Liska  <mliska@suse.cz>

	* math/Makefile: Change location where math-vector-fortran.h is
	installed.
	* finclude/math-vector-fortran.h: Move from bits/math-vector-fortran.h.
	* sysdeps/x86/fpu/finclude/math-vector-fortran.h: Move
	from sysdeps/x86/fpu/bits/math-vector-fortran.h.
	* scripts/check-installed-headers.sh: Skip Fortran header file.
	* scripts/check-wrapper-headers.py: Filter out f90 files.
---
 math/Makefile                                            | 2 +-
 {bits => math/finclude}/math-vector-fortran.h            | 0
 scripts/check-installed-headers.sh                       | 4 ++++
 scripts/check-wrapper-headers.py                         | 5 +++++
 sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h | 0
 5 files changed, 10 insertions(+), 1 deletion(-)
 rename {bits => math/finclude}/math-vector-fortran.h (100%)
 rename sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h (100%)

diff --git a/math/Makefile b/math/Makefile
index fc4191089d..cb4eaec6a9 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -26,7 +26,7 @@  headers		:= math.h bits/mathcalls.h bits/mathinline.h \
 		   fpu_control.h complex.h bits/cmathcalls.h fenv.h \
 		   bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
 		   bits/math-finite.h bits/math-vector.h \
-		   bits/math-vector-fortran.h \
+		   finclude/math-vector-fortran.h \
 		   bits/libm-simd-decl-stubs.h bits/iscanonical.h \
 		   bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
 		   bits/long-double.h bits/mathcalls-helper-functions.h \
diff --git a/bits/math-vector-fortran.h b/math/finclude/math-vector-fortran.h
similarity index 100%
rename from bits/math-vector-fortran.h
rename to math/finclude/math-vector-fortran.h
diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh
index 8e7beffd82..937ed969ec 100644
--- a/scripts/check-installed-headers.sh
+++ b/scripts/check-installed-headers.sh
@@ -84,6 +84,10 @@  for header in "$@"; do
         (sys/elf.h)
             continue;;
 
+        # Skip Fortran header
+        (finclude/math-vector-fortran.h)
+            continue;;
+
 	# sys/sysctl.h is unsupported for x32.
 	(sys/sysctl.h)
             case "$is_x32" in
diff --git a/scripts/check-wrapper-headers.py b/scripts/check-wrapper-headers.py
index 094faa3ced..6d9a89bc98 100644
--- a/scripts/check-wrapper-headers.py
+++ b/scripts/check-wrapper-headers.py
@@ -75,6 +75,11 @@  def check_headers(args):
 
         is_nonsysdep_header = os.access(header, os.R_OK)
         if is_nonsysdep_header:
+            # Skip Fortran header files
+            with open(header) as inp:
+                if '-*- f90 -*-' in next(inp):
+                    continue
+
             include_path = os.path.join(args.root, INCLUDE, header)
             if not os.access(include_path, os.R_OK):
                 print('error: missing wrapper header {} for {}'.format(
diff --git a/sysdeps/x86/fpu/bits/math-vector-fortran.h b/sysdeps/x86/fpu/finclude/math-vector-fortran.h
similarity index 100%
rename from sysdeps/x86/fpu/bits/math-vector-fortran.h
rename to sysdeps/x86/fpu/finclude/math-vector-fortran.h
-- 
2.20.1