about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-10-04 15:49:06 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-10-04 15:49:06 +0200
commit11c4f5010c58029e73e656d5df4f8f42c9b8e877 (patch)
tree02ea6c589466e2052fbf81a08ec6f444358be25c
parent57b4af1955e28c1623c98397b8597847d16bdd8c (diff)
downloadglibc-11c4f5010c58029e73e656d5df4f8f42c9b8e877.tar.gz
glibc-11c4f5010c58029e73e656d5df4f8f42c9b8e877.tar.xz
glibc-11c4f5010c58029e73e656d5df4f8f42c9b8e877.zip
crypt: Adjust check-local-headers.sh for nspr4 include directory [BZ #17956]
-rw-r--r--ChangeLog5
-rwxr-xr-xscripts/check-local-headers.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f782b14045..31f402a7f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-04  Florian Weimer  <fweimer@redhat.com>
+
+	* scripts/check-local-headers.sh: Ignore nspr4 header file
+	directory in addition to nspr.
+
 2017-10-04  Guido Trentalancia  <guido@trentalancia.net>
 
 	[BZ #17956]
diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index 4692361686..0cde6e8e92 100755
--- a/scripts/check-local-headers.sh
+++ b/scripts/check-local-headers.sh
@@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" '
 BEGIN {
   status = 0
   exclude = "^" includedir \
-    "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h)|cthreads\\.h|gd|nss3/|nspr/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
+    "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h)|cthreads\\.h|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
 }
 /^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
 {