diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2016-09-08 08:04:56 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-09-12 02:13:23 -0700 |
| commit | 0665f1fc689501024af523ff79a2413614267ef7 (patch) | |
| tree | c2a517ce38f14970c7af7dbf1a969fe7d013fccc | |
| parent | 260ab618c61d683a55b12faf64f5b6c8297ebb93 (diff) | |
rpc/xdr: use ordinary regex to sed filter generated files
Versus an extended regex
While NetBSD and FreeBSD's sed has compat -r command line option,
Mac OS X's sed does not.
And there's no need to use an extended regex here; avoiding extra
logic to determine whether running on Linux or *BSD.
Change-Id: I6089f994f6c4f50eb353fc018b1b678ec93d6626
BUG: 1374278
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/15427
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
| -rwxr-xr-x | build-aux/xdrgen | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/xdrgen b/build-aux/xdrgen index 010df656377..2d808d235ec 100755 --- a/build-aux/xdrgen +++ b/build-aux/xdrgen @@ -75,7 +75,7 @@ gen_headers () rm -f $hfile; rpcgen -h -o $hfile $xfile; # the '#ifdef' part of file should be fixed - sed -r -e '/#(ifdef|ifndef|define)/s/-/_/g' $hfile > ${hfile}.new && mv ${hfile}.new $hfile; + sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' -e '/#endif/ s/-/_/' $hfile > ${hfile}.new && mv ${hfile}.new $hfile; # Gen header to temp file and append generated file append_licence_header $hfile $tmp_hfile; # now move the destination file to actual original file |