diff options
| -rw-r--r-- | meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch | 13 | ||||
| -rw-r--r-- | meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb (renamed from meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb) | 2 |
2 files changed, 13 insertions, 2 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 6e4803f4f3..4e9659aa58 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch | |||
| @@ -3,10 +3,15 @@ Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this | |||
| 3 | Upstream-Status: Pending | 3 | 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 | --- | ||
| 7 | Makefile | 5 ++--- | ||
| 8 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
| 6 | 9 | ||
| 10 | diff --git a/Makefile b/Makefile | ||
| 11 | index 404f036..a9b18f0 100644 | ||
| 7 | --- a/Makefile | 12 | --- a/Makefile |
| 8 | +++ b/Makefile | 13 | +++ b/Makefile |
| 9 | @@ -68,18 +68,17 @@ XGETTEXT = xgettext | 14 | @@ -75,13 +75,12 @@ XGETTEXT = xgettext |
| 10 | XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments | 15 | XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments |
| 11 | MSGMERGE = msgmerge | 16 | MSGMERGE = msgmerge |
| 12 | 17 | ||
| @@ -21,9 +26,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 21 | -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) | 26 | -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) |
| 22 | LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) | 27 | LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) |
| 23 | LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) | 28 | LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) |
| 29 | @@ -90,7 +89,7 @@ LDFLAGS_lib_CYGWIN = $(LDFLAGS_shared) \ | ||
| 30 | -Wl,--export-all-symbols \ | ||
| 31 | -Wl,--enable-auto-import | ||
| 24 | LDFLAGS_pam = $(LDFLAGS_shared) | 32 | LDFLAGS_pam = $(LDFLAGS_shared) |
| 25 | -LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ | 33 | -LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ |
| 26 | +LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ | 34 | +LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ |
| 27 | -Wl,--version-script,$(MAP_PAM) | 35 | -Wl,--version-script,$(MAP_PAM) |
| 28 | LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) | 36 | LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) |
| 29 | LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) | 37 | LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) |
| 38 | -- | ||
| 39 | 2.34.1 | ||
| 40 | |||
diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb index 8462701b31..8694052e61 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb | |||
| @@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" | |||
| 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[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" | 33 | SRC_URI[sha256sum] = "53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4" |
| 34 | 34 | ||
| 35 | # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam | 35 | # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam |
| 36 | # this package's pam_passwdqc.so needs pam | 36 | # this package's pam_passwdqc.so needs pam |
