summaryrefslogtreecommitdiff
path: root/package/bluez
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/bluez
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (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/bluez')
-rw-r--r--package/bluez/patches/patch-Makefile_in10
-rw-r--r--package/bluez/patches/patch-ltmain_sh11
2 files changed, 16 insertions, 5 deletions
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
index 4334402d7..2c4cf7336 100644
--- a/package/bluez/patches/patch-Makefile_in
+++ b/package/bluez/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
---- bluez-4.59.orig/Makefile.in Thu Dec 24 17:42:48 2009
-+++ bluez-4.59/Makefile.in Tue Dec 29 01:31:12 2009
-@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am
+--- bluez-4.59.orig/Makefile.in 2009-12-24 17:42:48.000000000 +0100
++++ bluez-4.59/Makefile.in 2011-01-14 19:24:13.000000000 +0100
+@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__
$(am__EXEEXT_10) $(am__EXEEXT_11)
@SBC_TRUE@am__append_1 = sbc/libsbc.la
@SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
@@ -8,7 +8,7 @@
@NETLINK_TRUE@am__append_4 = plugins/netlink.la
@ECHOPLUGIN_TRUE@am__append_5 = echo
@ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c
-@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(
+@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_l
@DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT)
@SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
@SBC_TRUE@ sbc/sbcenc$(EXEEXT)
@@ -16,7 +16,7 @@
@TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \
@TOOLS_TRUE@ tools/hcieventmask$(EXEEXT) \
@TOOLS_TRUE@ tools/hcisecfilter$(EXEEXT)
-@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(loc
@SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
@SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
@SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
diff --git a/package/bluez/patches/patch-ltmain_sh b/package/bluez/patches/patch-ltmain_sh
new file mode 100644
index 000000000..e323f1b54
--- /dev/null
+++ b/package/bluez/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- bluez-4.59.orig/ltmain.sh 2009-12-24 17:42:43.000000000 +0100
++++ bluez-4.59/ltmain.sh 2011-01-14 19:25:00.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"