From: Michael Shigorin <mike@altlinux.org>
To: selinux@vger.kernel.org
Cc: Daniel J Walsh <dwalsh@redhat.com>,
Nicolas Iooss <nicolas.iooss@m4x.org>
Subject: [PATCH] non-gcc-specific exception.sh
Date: Mon, 7 Oct 2019 16:20:20 +0300 [thread overview]
Message-ID: <20191007132020.GG4928@imap.altlinux.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
Hello,
please find attached the patch to (hopefully) improve
self-surgery script that uses gcc-specific -aux-info now.
Should help clang, icc and the like (in my case there's
no proper gcc port for the target platform just yet).
--
---- WBR, Michael Shigorin / http://altlinux.org
------ http://opennet.ru / http://anna-news.info
[-- Attachment #2: 0001-exception.sh-fixed-to-work-with-non-gcc.patch --]
[-- Type: text/x-patch, Size: 2005 bytes --]
From ccfa41adf46367e132ba7556fad53dfce9ddffaf Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Mon, 7 Oct 2019 16:00:39 +0300
Subject: [PATCH] exception.sh: fixed to work with non-gcc
-aux-info is a gccism absent in clang, icc and the like;
let's reimplement this in a slightly cleaner way with -E.
Suggested-by: Evgeny Mareev
---
libselinux/src/exception.sh | 12 +++++-------
libsemanage/src/exception.sh | 12 +++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/libselinux/src/exception.sh b/libselinux/src/exception.sh
index d6c8c71..459295c 100755
--- a/libselinux/src/exception.sh
+++ b/libselinux/src/exception.sh
@@ -15,10 +15,8 @@ echo "
;;
esac
}
-if ! ${CC:-gcc} -x c -c -I../include - -aux-info temp.aux < ../include/selinux/selinux.h
-then
- # clang does not support -aux-info so fall back to gcc
- gcc -x c -c -I../include - -aux-info temp.aux < ../include/selinux/selinux.h
-fi
-for i in `awk '/<stdin>.*extern int/ { print $6 }' temp.aux`; do except $i ; done
-rm -f -- temp.aux -.o
+
+# equivalent of gcc-specific -aux-info
+${CC:-gcc} -E -I../include -xc ../include/selinux/selinux.h |
+ sed -n 's/^extern * int *\(\w*\) *(.*$/\1/p' |
+ while read f; do except $f; done
diff --git a/libsemanage/src/exception.sh b/libsemanage/src/exception.sh
index 97bc2ae..11586a1 100644
--- a/libsemanage/src/exception.sh
+++ b/libsemanage/src/exception.sh
@@ -9,10 +9,8 @@ echo "
}
"
}
-if ! ${CC:-gcc} -x c -c -I../include - -aux-info temp.aux < ../include/semanage/semanage.h
-then
- # clang does not support -aux-info so fall back to gcc
- gcc -x c -c -I../include - -aux-info temp.aux < ../include/semanage/semanage.h
-fi
-for i in `awk '/extern int/ { print $6 }' temp.aux`; do except $i ; done
-rm -f -- temp.aux -.o
+
+# equivalent of gcc-specific -aux-info
+${CC:-gcc} -E -I../include -xc ../include/semanage/semanage.h |
+ sed -n 's/^extern * int *\(\w*\) *(.*$/\1/p' |
+ while read f; do except $f; done
--
2.10.4
next reply other threads:[~2019-10-07 13:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 13:20 Michael Shigorin [this message]
2019-10-07 16:27 ` [PATCH] non-gcc-specific exception.sh Nicolas Iooss
2019-10-07 19:21 ` Michael Shigorin
2019-10-12 16:55 ` Nicolas Iooss
2019-10-12 17:23 ` Michael Shigorin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191007132020.GG4928@imap.altlinux.org \
--to=mike@altlinux.org \
--cc=dwalsh@redhat.com \
--cc=nicolas.iooss@m4x.org \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).