summaryrefslogtreecommitdiff
path: root/package/gpsd/patches/patch-Makefile_in
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/gpsd/patches/patch-Makefile_in
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/gpsd/patches/patch-Makefile_in')
-rw-r--r--package/gpsd/patches/patch-Makefile_in11
1 files changed, 10 insertions, 1 deletions
diff --git a/package/gpsd/patches/patch-Makefile_in b/package/gpsd/patches/patch-Makefile_in
index bd45358ee..b54aabbac 100644
--- a/package/gpsd/patches/patch-Makefile_in
+++ b/package/gpsd/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
--- gpsd-2.95.orig/Makefile.in 2010-07-14 00:48:24.000000000 +0200
-+++ gpsd-2.95/Makefile.in 2010-07-30 13:04:19.000000000 +0200
++++ gpsd-2.95/Makefile.in 2011-01-15 19:56:22.000000000 +0100
@@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources)
libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
driver_rtcm2.h packet_states.h
@@ -11,3 +11,12 @@
nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la
+@@ -996,7 +996,7 @@ clean-libLTLIBRARIES:
+ rm -f "$${dir}/so_locations"; \
+ done
+ libgps.la: $(libgps_la_OBJECTS) $(libgps_la_DEPENDENCIES)
+- $(libgps_la_LINK) -rpath $(libdir) $(libgps_la_OBJECTS) $(libgps_la_LIBADD) $(LIBS)
++ $(libgps_la_LINK) -rpath $(libdir) $(libgps_la_OBJECTS) $(libgps_la_LIBADD) $(LDFLAGS) $(LIBS)
+ libgpsd.la: $(libgpsd_la_OBJECTS) $(libgpsd_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgpsd_la_OBJECTS) $(libgpsd_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)