summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-03-28 11:32:08 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-03-28 11:32:08 +0200
commit6fec3f0d5ce1ca33f8536c95369c46c7d445f248 (patch)
tree95e23169168398f676af5006a2ec72de47ccab28
parent87bd8834cc5934fe0feacd993bbac1dab10cc228 (diff)
add -lssp in case of stack protection
-rw-r--r--package/dmidecode/Makefile4
-rw-r--r--package/dmidecode/patches/patch-Makefile10
-rw-r--r--package/dmidecode/patches/patch-Makefile.orig8
3 files changed, 16 insertions, 6 deletions
diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile
index 4c037298c..8829c91b2 100644
--- a/package/dmidecode/Makefile
+++ b/package/dmidecode/Makefile
@@ -18,6 +18,10 @@ $(eval $(call PKG_template,DMIDECODE,dmidecode,$(PKG_VERSION)-${PKG_RELEASE},${P
CONFIG_STYLE:= manual
+ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+TARGET_LDFLAGS+= -lssp
+endif
+
dmidecode-install:
$(INSTALL_DIR) $(IDIR_DMIDECODE)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/dmidecode \
diff --git a/package/dmidecode/patches/patch-Makefile b/package/dmidecode/patches/patch-Makefile
index cf37262cb..7ce93b990 100644
--- a/package/dmidecode/patches/patch-Makefile
+++ b/package/dmidecode/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- dmidecode-2.11.orig/Makefile 2010-10-11 16:08:16.000000000 +0200
-+++ dmidecode-2.11/Makefile 2011-10-17 19:22:27.000000000 +0200
++++ dmidecode-2.11/Makefile 2012-03-28 11:31:33.000000000 +0200
@@ -12,8 +12,8 @@
# (at your option) any later version.
#
@@ -11,8 +11,12 @@
-Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
#CFLAGS += -DBIGENDIAN
#CFLAGS += -DALIGNMENT_WORKAROUND
-@@ -26,7 +26,7 @@ CFLAGS += -O2
- LDFLAGS =
+@@ -23,10 +23,10 @@ CFLAGS += -O2
+ #CFLAGS += -g
+
+ # Pass linker flags here
+-LDFLAGS =
++LDFLAGS ?=
DESTDIR =
-prefix = /usr/local
diff --git a/package/dmidecode/patches/patch-Makefile.orig b/package/dmidecode/patches/patch-Makefile.orig
index fcd3c6dd7..cf37262cb 100644
--- a/package/dmidecode/patches/patch-Makefile.orig
+++ b/package/dmidecode/patches/patch-Makefile.orig
@@ -1,14 +1,16 @@
--- dmidecode-2.11.orig/Makefile 2010-10-11 16:08:16.000000000 +0200
-+++ dmidecode-2.11/Makefile 2011-10-17 19:21:58.000000000 +0200
-@@ -12,7 +12,7 @@
++++ dmidecode-2.11/Makefile 2011-10-17 19:22:27.000000000 +0200
+@@ -12,8 +12,8 @@
# (at your option) any later version.
#
-CC = gcc
+-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+CC ?= gcc
- CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
++CFLAGS ?= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
-Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
#CFLAGS += -DBIGENDIAN
+ #CFLAGS += -DALIGNMENT_WORKAROUND
@@ -26,7 +26,7 @@ CFLAGS += -O2
LDFLAGS =