diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-03-19 22:31:45 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-08-04 20:24:17 -0700 |
commit | 60021a087e2b05a6ac97568f7a30c460659927aa (patch) | |
tree | 2b68b40f3cfc3429d56f4e473f4ee82e41962aed | |
parent | 6ee7d0642660d8a7510df9832583edcf9b65f137 (diff) | |
download | meta-openembedded-60021a087e2b05a6ac97568f7a30c460659927aa.tar.gz |
gradm: Fix GNU_HASH QA errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch | 26 | ||||
-rw-r--r-- | meta-oe/recipes-support/gradm/gradm_3.1.bb | 4 |
2 files changed, 29 insertions, 1 deletions
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 000000000..09a60127a --- /dev/null +++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From d67e93ada37d7237983fd10894c18b92f4243d50 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 18 Mar 2017 08:51:45 -0700 | ||
4 | Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Makefile | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/Makefile b/Makefile | ||
12 | index 28557ff..deed94c 100644 | ||
13 | --- a/Makefile | ||
14 | +++ b/Makefile | ||
15 | @@ -29,7 +29,7 @@ OPT_FLAGS := -O2 | ||
16 | # for older versions of grsecurity, comment the above line and uncomment the below: | ||
17 | #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) | ||
18 | CFLAGS := $(OPT_FLAGS) -fPIE -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE | ||
19 | -LDFLAGS= -pie | ||
20 | +LDFLAGS+= -pie | ||
21 | INSTALL = /usr/bin/install -c | ||
22 | |||
23 | # FHS | ||
24 | -- | ||
25 | 2.12.0 | ||
26 | |||
diff --git a/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-oe/recipes-support/gradm/gradm_3.1.bb index 252b19de2..1a4261a9e 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" | |||
12 | DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
13 | 13 | ||
14 | SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ | 14 | SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ |
15 | file://0001-Makefile-remove-strip.patch" | 15 | file://0001-Makefile-remove-strip.patch \ |
16 | file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ | ||
17 | " | ||
16 | SRC_URI[md5sum] = "ecec72d3a9b6d84c00eda97957b707b6" | 18 | SRC_URI[md5sum] = "ecec72d3a9b6d84c00eda97957b707b6" |
17 | SRC_URI[sha256sum] = "2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50" | 19 | SRC_URI[sha256sum] = "2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50" |
18 | 20 | ||