diff options
-rw-r--r-- | meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch | 16 | ||||
-rw-r--r-- | meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb (renamed from meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb) | 5 |
2 files changed, 9 insertions, 12 deletions
diff --git a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index e9023492e0..6e4803f4f3 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch | |||
@@ -4,19 +4,17 @@ Upstream-Status: Pending | |||
4 | 4 | ||
5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
6 | 6 | ||
7 | diff --git a/Makefile b/Makefile | ||
8 | index 49d622d..cd17334 100644 | ||
9 | --- a/Makefile | 7 | --- a/Makefile |
10 | +++ b/Makefile | 8 | +++ b/Makefile |
11 | @@ -48,18 +48,17 @@ CFLAGS = -Wall -W -O2 | 9 | @@ -68,18 +68,17 @@ XGETTEXT = xgettext |
12 | CFLAGS_lib = $(CFLAGS) -fPIC | 10 | XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments |
13 | CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer | 11 | MSGMERGE = msgmerge |
14 | 12 | ||
15 | -LDFLAGS = | 13 | -LDFLAGS = |
16 | LDFLAGS_shared = --shared | 14 | LDFLAGS_shared = $(LDFLAGS) --shared |
17 | LDFLAGS_shared_LINUX = --shared | 15 | LDFLAGS_shared_LINUX = $(LDFLAGS) --shared |
18 | LDFLAGS_shared_SUN = -G | 16 | LDFLAGS_shared_SUN = $(LDFLAGS) -G |
19 | LDFLAGS_shared_HP = -b | 17 | LDFLAGS_shared_HP = $(LDFLAGS) -b |
20 | LDFLAGS_lib = $(LDFLAGS_shared) | 18 | LDFLAGS_lib = $(LDFLAGS_shared) |
21 | -LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ | 19 | -LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ |
22 | +LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ | 20 | +LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ |
diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb index b148fdcb59..de4bff8c79 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb | |||
@@ -25,13 +25,12 @@ inherit features_check | |||
25 | REQUIRED_DISTRO_FEATURES = "pam" | 25 | REQUIRED_DISTRO_FEATURES = "pam" |
26 | 26 | ||
27 | LICENSE = "BSD-1-Clause" | 27 | LICENSE = "BSD-1-Clause" |
28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" | 28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" |
29 | 29 | ||
30 | SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ | 30 | SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ |
31 | file://makefile-add-ldflags.patch \ | 31 | file://makefile-add-ldflags.patch \ |
32 | " | 32 | " |
33 | SRC_URI[md5sum] = "3878b57bcd3fdbcf3d4b362dbc6228b9" | 33 | SRC_URI[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" |
34 | SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a70ffb14" | ||
35 | 34 | ||
36 | # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam | 35 | # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam |
37 | # this package's pam_passwdqc.so needs pam | 36 | # this package's pam_passwdqc.so needs pam |