diff options
author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
---|---|---|
committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
tree | 4140720b20e8d641c11da882010d6130a75fef21 /tools/bison/patches | |
parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'tools/bison/patches')
-rw-r--r-- | tools/bison/patches/000-relocatable.patch | 18 | ||||
-rw-r--r-- | tools/bison/patches/010-intl-stub-compat.patch | 8 | ||||
-rw-r--r-- | tools/bison/patches/100-fix-gets-removal.patch | 17 |
3 files changed, 22 insertions, 21 deletions
diff --git a/tools/bison/patches/000-relocatable.patch b/tools/bison/patches/000-relocatable.patch index 50dca6d33..47c0ae8ba 100644 --- a/tools/bison/patches/000-relocatable.patch +++ b/tools/bison/patches/000-relocatable.patch @@ -3,18 +3,18 @@ @@ -81,6 +81,7 @@ MOSTLYCLEANFILES = yacc yacc: - echo '#! /bin/sh' >$@ -+ echo 'test -n "$$STAGING_DIR" && exec "$$STAGING_DIR/../host/bin/bison" -y "$$@"' >>$@ - echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ - chmod a+x $@ + $(AM_V_GEN)echo '#! /bin/sh' >$@ ++ $(AM_V_at)echo 'test -n "$$STAGING_DIR" && exec "$$STAGING_DIR/../host/bin/bison" -y "$$@"' >>$@ + $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ + $(AM_V_at)chmod a+x $@ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -1609,6 +1609,7 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -1919,6 +1919,7 @@ uninstall-am: uninstall-binPROGRAMS unin yacc: - echo '#! /bin/sh' >$@ -+ echo 'test -n "$$STAGING_DIR" && exec "$$STAGING_DIR/../host/bin/bison" -y "$$@"' >>$@ - echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ - chmod a+x $@ + $(AM_V_GEN)echo '#! /bin/sh' >$@ ++ $(AM_V_at)echo 'test -n "$$STAGING_DIR" && exec "$$STAGING_DIR/../host/bin/bison" -y "$$@"' >>$@ + $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ + $(AM_V_at)chmod a+x $@ diff --git a/tools/bison/patches/010-intl-stub-compat.patch b/tools/bison/patches/010-intl-stub-compat.patch index 2cd720b68..d2dfcadba 100644 --- a/tools/bison/patches/010-intl-stub-compat.patch +++ b/tools/bison/patches/010-intl-stub-compat.patch @@ -1,8 +1,8 @@ --- a/src/main.c +++ b/src/main.c -@@ -58,9 +58,9 @@ main (int argc, char *argv[]) +@@ -60,9 +60,9 @@ main (int argc, char *argv[]) { - program_name = argv[0]; + set_program_name (argv[0]); setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) bindtextdomain ("bison-runtime", LOCALEDIR); @@ -11,5 +11,5 @@ + bindtextdomain ("bison-runtime", LOCALEDIR); + textdomain (PACKAGE); - uniqstrs_new (); - muscle_init (); + { + char const *cp = getenv ("LC_CTYPE"); diff --git a/tools/bison/patches/100-fix-gets-removal.patch b/tools/bison/patches/100-fix-gets-removal.patch index 1b9031064..169bfd673 100644 --- a/tools/bison/patches/100-fix-gets-removal.patch +++ b/tools/bison/patches/100-fix-gets-removal.patch @@ -1,15 +1,16 @@ --- a/lib/stdio.in.h +++ b/lib/stdio.in.h -@@ -177,12 +177,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not - "use gnulib module fflush for portable POSIX compliance"); +@@ -704,13 +704,6 @@ _GL_WARN_ON_USE (getline, "getline is un + # endif #endif -/* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ +- so any use of gets warrants an unconditional warning; besides, C11 +- removed it. */ -#undef gets +-#if HAVE_RAW_DECL_GETS -_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -- - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-#endif + + + #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |