diff options
Diffstat (limited to 'meta/recipes-core/libxcrypt')
-rw-r--r-- | meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | 33 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt.inc | 20 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb) | 0 |
4 files changed, 43 insertions, 14 deletions
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch new file mode 100644 index 0000000000..94aa3fed49 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Fri, 30 Apr 2021 10:35:02 +0100 | ||
4 | Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version | ||
5 | |||
6 | If you pass CFLAGS with a leading space, " " gets passed to popen and convinces | ||
7 | gcc to try and open a file called " ". This results in a confusing error message | ||
8 | like: | ||
9 | |||
10 | x86_64-pokysdk-linux-gcc: error: : No such file or directory | ||
11 | |||
12 | Avoid this by stripping empty elements out of CFLAGS. | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] | ||
15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
16 | |||
17 | --- | ||
18 | build-aux/scripts/compute-symver-floor | 2 ++ | ||
19 | 1 file changed, 2 insertions(+) | ||
20 | |||
21 | diff --git a/build-aux/scripts/compute-symver-floor b/build-aux/scripts/compute-symver-floor | ||
22 | index 4ec82e1..8117342 100644 | ||
23 | --- a/build-aux/scripts/compute-symver-floor | ||
24 | +++ b/build-aux/scripts/compute-symver-floor | ||
25 | @@ -36,6 +36,8 @@ sub preprocessor_check { | ||
26 | die "C compiler not available\n" unless @CC; | ||
27 | |||
28 | @CFLAGS = sh_split($ENV{CFLAGS} // q{}); | ||
29 | + # Remove empty elements, particularly leading ones which cause issues with popen below | ||
30 | + @CFLAGS = grep {$_} @CFLAGS; | ||
31 | |||
32 | # Remove empty elements, particularly leading ones which | ||
33 | # cause issues with popen below. | ||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb index ba74eb1f94..d5546ce9ba 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | |||
@@ -10,9 +10,9 @@ EXCLUDE_FROM_WORLD = "1" | |||
10 | 10 | ||
11 | API = "--enable-obsolete-api" | 11 | API = "--enable-obsolete-api" |
12 | 12 | ||
13 | do_install_append () { | 13 | do_install:append () { |
14 | rm -rf ${D}${includedir} | 14 | rm -rf ${D}${includedir} |
15 | rm -rf ${D}${libdir}/pkgconfig | 15 | rm -rf ${D}${libdir}/pkgconfig |
16 | rm -rf ${D}${libdir}/libcrypt.so | ||
16 | rm -rf ${D}${datadir} | 17 | rm -rf ${D}${datadir} |
17 | } | 18 | } |
18 | |||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index e9f968b556..ba93d91aef 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc | |||
@@ -2,30 +2,26 @@ SUMMARY = "Extended cryptographic library (from glibc)" | |||
2 | DESCRIPTION = "Forked code from glibc libary to extract only crypto part." | 2 | DESCRIPTION = "Forked code from glibc libary to extract only crypto part." |
3 | HOMEPAGE = "https://github.com/besser82/libxcrypt" | 3 | HOMEPAGE = "https://github.com/besser82/libxcrypt" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPL-2.1-only" |
6 | LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \ | 6 | LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ |
7 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | 7 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ |
8 | " | 8 | " |
9 | 9 | ||
10 | inherit autotools pkgconfig | 10 | inherit autotools pkgconfig |
11 | 11 | ||
12 | SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" | 12 | SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" |
13 | SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029" | 13 | SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf" |
14 | SRCBRANCH ?= "develop" | 14 | SRCBRANCH ?= "master" |
15 | 15 | ||
16 | PROVIDES = "virtual/crypt" | 16 | SRC_URI += "file://fix_cflags_handling.patch" |
17 | 17 | ||
18 | FILES_${PN} = "${libdir}/libcrypt*.so.* \ | 18 | PROVIDES = "virtual/crypt" |
19 | ${libdir}/libcrypt-*.so \ | ||
20 | ${libdir}/libowcrypt*.so.* \ | ||
21 | ${libdir}/libowcrypt-*.so \ | ||
22 | " | ||
23 | 19 | ||
24 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
25 | 21 | ||
26 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 22 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
27 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" | 23 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" |
28 | CPPFLAGS_append_class-nativesdk = " -Wno-error" | 24 | CPPFLAGS:append:class-nativesdk = " -Wno-error" |
29 | 25 | ||
30 | API = "--disable-obsolete-api" | 26 | API = "--disable-obsolete-api" |
31 | EXTRA_OECONF += "${API}" | 27 | EXTRA_OECONF += "${API}" |
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb index 79dba2f6dc..79dba2f6dc 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb | |||