diff options
author | Britney Fransen <brfransen@gmail.com> | 2016-01-23 20:13:24 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2016-01-23 20:13:24 (GMT) |
commit | 3a89a259a67fbb52f4d3d2740dd0a8aea229a4c0 (patch) | |
tree | b231eccb21fc44835b571127c32179bb829b99ee /abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch | |
parent | c8c0f0b8f3c2b130e1181d1516ab9c9aeae5f3f0 (diff) | |
download | linhes_pkgbuild-3a89a259a67fbb52f4d3d2740dd0a8aea229a4c0.zip linhes_pkgbuild-3a89a259a67fbb52f4d3d2740dd0a8aea229a4c0.tar.gz linhes_pkgbuild-3a89a259a67fbb52f4d3d2740dd0a8aea229a4c0.tar.bz2 |
samba: update to 4.3.4
Diffstat (limited to 'abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch')
-rw-r--r-- | abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch b/abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch deleted file mode 100644 index cb2378a..0000000 --- a/abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001 -From: Alexander Bokovoy <ab@samba.org> -Date: Wed, 6 Feb 2013 10:17:57 +0200 -Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output - -When PIDL calls out to C preprocessor to expand IDL files -and parse the output, it filters out linemarkers and line control -information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html -and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control - -With gcc 4.8 stdc-predef.h is included automatically and linemarker for the -file has extended flags that PIDL couldn't parse ('system header that needs to -be extern "C" protected for C++') - -Thanks to Jakub Jelinek <jakub@redhat.com> for explanation of the linemarker format. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 - -Reviewed-by: Andreas Schneider <asn@samba.org> -(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526) - -Signed-off-by: Andreas Schneider <asn@samba.org> ---- - pidl/idl.yp | 4 +++- - pidl/lib/Parse/Pidl/IDL.pm | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/pidl/idl.yp b/pidl/idl.yp -index b5c5185..c8a65f6 100644 ---- a/pidl/idl.yp -+++ b/pidl/idl.yp -@@ -610,7 +610,9 @@ again: - - for ($parser->YYData->{INPUT}) { - if (/^\#/) { -- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { -+ # Linemarker format is described at -+ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html -+ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { - $parser->YYData->{LINE} = $1-1; - $parser->YYData->{FILE} = $2; - goto again; -diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm -index d4820ff..6927c89 100644 ---- a/pidl/lib/Parse/Pidl/IDL.pm -+++ b/pidl/lib/Parse/Pidl/IDL.pm -@@ -2576,7 +2576,9 @@ again: - - for ($parser->YYData->{INPUT}) { - if (/^\#/) { -- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { -+ # Linemarker format is described at -+ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html -+ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { - $parser->YYData->{LINE} = $1-1; - $parser->YYData->{FILE} = $2; - goto again; --- -1.8.1.1 - |