diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
| commit | 15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch) | |
| tree | 727d3fd768a1abe75521190b90833b3a68cce4c6 /package/glib/patches | |
| parent | 0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff) | |
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking,
but this is required to successfully link libraries or
executables with SSP
- pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/glib/patches')
| -rw-r--r-- | package/glib/patches/patch-glib_gconvert_c | 16 | ||||
| -rw-r--r-- | package/glib/patches/patch-ltmain_sh | 11 |
2 files changed, 27 insertions, 0 deletions
diff --git a/package/glib/patches/patch-glib_gconvert_c b/package/glib/patches/patch-glib_gconvert_c new file mode 100644 index 000000000..bd9db0404 --- /dev/null +++ b/package/glib/patches/patch-glib_gconvert_c @@ -0,0 +1,16 @@ +--- glib-2.27.5.orig/glib/gconvert.c 2010-09-13 15:40:53.000000000 +0200 ++++ glib-2.27.5/glib/gconvert.c 2011-01-14 17:17:40.000000000 +0100 +@@ -58,13 +58,6 @@ + + #include "glibintl.h" + +-#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) +-#error GNU libiconv in use but included iconv.h not from libiconv +-#endif +-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) +-#error GNU libiconv not in use but included iconv.h is from libiconv +-#endif +- + + /** + * SECTION:conversions diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh new file mode 100644 index 000000000..559afa25c --- /dev/null +++ b/package/glib/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- glib-2.27.5.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100 ++++ glib-2.27.5/ltmain.sh 2011-01-14 17:22:21.000000000 +0100 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |