diff options
| -rw-r--r-- | libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch | 39 | ||||
| -rw-r--r-- | libraries/ptlib/ptlib.SlackBuild | 4 |
2 files changed, 43 insertions, 0 deletions
diff --git a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch new file mode 100644 index 0000000000..fcc8d0d2e7 --- /dev/null +++ b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch @@ -0,0 +1,39 @@ +--- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200 ++++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100 +@@ -121,9 +121,9 @@ + static int yylex(); + + #ifdef __GNUC__ +-static int yyerror(char const *msg); ++static int yyerror(void *, char const *msg); + #else +-static void yyerror(char const *msg); ++static void yyerror(void *, char const *msg); + #endif + + +@@ -132,7 +132,8 @@ + + %} + +-%pure_parser ++%pure-parser ++%parse-param {void *parseParam} + + %union { + time_t Number; +@@ -1018,12 +1019,12 @@ + #endif + + #ifdef __GNUC__ +-int yyerror(const char * s) ++int yyerror(void *var, const char * s) + { + return 0; + } + #else +-static void yyerror(const char * s) ++static void yyerror(void *var, const char * s) + { + } + #endif diff --git a/libraries/ptlib/ptlib.SlackBuild b/libraries/ptlib/ptlib.SlackBuild index 4a837a394d..c5ff9be601 100644 --- a/libraries/ptlib/ptlib.SlackBuild +++ b/libraries/ptlib/ptlib.SlackBuild @@ -67,6 +67,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix building with bison-3.0.4 +# thanks to Dan Fandrich / OpalVOIP https://sourceforge.net/p/opalvoip/patches/259/ +patch -p1 < $CWD/ptlib-2.10.10-mga-bison-parameter.patch + # The "LIBS" variable is set to fix OpenLDAP support # # The --disable-avc is here to avoid build problems when both libdv and |