From 60021a087e2b05a6ac97568f7a30c460659927aa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 19 Mar 2017 22:31:45 -0700 Subject: gradm: Fix GNU_HASH QA errors Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- ...file-Append-instead-of-overriding-LDFLAGS.patch | 26 ++++++++++++++++++++++ meta-oe/recipes-support/gradm/gradm_3.1.bb | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch diff --git a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch new file mode 100644 index 0000000000..09a60127a4 --- /dev/null +++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch @@ -0,0 +1,26 @@ +From d67e93ada37d7237983fd10894c18b92f4243d50 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 18 Mar 2017 08:51:45 -0700 +Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS + +Signed-off-by: Khem Raj +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 28557ff..deed94c 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: + #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) + CFLAGS := $(OPT_FLAGS) -fPIE -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE +-LDFLAGS= -pie ++LDFLAGS+= -pie + INSTALL = /usr/bin/install -c + + # FHS +-- +2.12.0 + diff --git a/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-oe/recipes-support/gradm/gradm_3.1.bb index 252b19de2d..1a4261a9ea 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1.bb @@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ - file://0001-Makefile-remove-strip.patch" + file://0001-Makefile-remove-strip.patch \ + file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ + " SRC_URI[md5sum] = "ecec72d3a9b6d84c00eda97957b707b6" SRC_URI[sha256sum] = "2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50" -- cgit 1.2.3-korg