* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
[not found] ` <20180407213510.474412329D5@git.openembedded.org>
@ 2018-04-08 17:00 ` Martin Jansa
2018-04-08 22:06 ` Richard Purdie
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Martin Jansa @ 2018-04-08 17:00 UTC (permalink / raw)
To: openembedded-devel, Richard Purdie; +Cc: openembedded-commits
On Ubuntu 14.04 this fails with:
../git/gen-des-tables.c: In function ‘write_table_u8’:
../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations are
only allowed in C99 mode
for (size_t i = 0; i < m; i++)
^
I'll try to add explicit -std=gnu99 to support building on such older host
distributions with older gcc.
On Sat, Apr 7, 2018 at 11:35 PM, <git@git.openembedded.org> wrote:
> This is an automated email from the git hooks/post-receive script.
>
> rpurdie pushed a commit to branch master
> in repository openembedded-core.
>
> commit c1573cb7faeb296fe7077a60d02443d5ed5bded0
> Author: Richard Purdie <richard.purdie@linuxfoundation.org>
> AuthorDate: Fri Apr 6 14:53:53 2018 +0200
>
> nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
>
> Fedora28[1] has decided to go ahead and use libxcrypt to replace
> libcrypt from glibc
> despite the change not having merged into glibc upstream yet. This
> breaks the use of
> uninative in OE on fedora28 since binaries there are now using new
> symbols only found
> in libxcrypt. libxcrypt is meant to be backwards compatible with
> libcrypt but not the
> reverse.
>
> Since this will impact OE in the next release cycle, this changes
> nativesdk only
> to use this new model and adds libxcrypt to work in that case. This
> allows us to
> build a uninative which is compatible with fedora28 and previous other
> OSes.
>
> In order to work, recipes will now need to depend on virtual/crypt
> where they use
> libcrypt since its now a separate library and we can't depend on it
> from glibc to
> preseve backwards compatibility since glibc needs to build first. For
> now, only the
> problematic nativesdk recipes have been fixed up. For target use, the
> default
> provider remains glibc for now. Assuming this change is merged into
> upstream glibc,
> we will need to roll this change out for the target but we will do
> this in the next
> release cycle when we can better deal with the resulting bugs.
>
> [1] https://fedoraproject.org/wiki/Changes/Replace_glibc_
> libcrypt_with_libxcrypt
>
> Original patch from Charles-Antoine Couret <charles-antoine.couret@
> essensium.com>,
> tweaked by RP to add virtual provides, SkipRecipe for libxcrypt and
> other minor
> tweaks.
>
> Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@
> essensium.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/conf/bitbake.conf | 1 +
> meta/recipes-core/glibc/glibc.inc | 5 +-
> .../glibc/0031-nativesdk-deprecate-libcrypt.patch | 419
> +++++++++++++++++++++
> meta/recipes-core/glibc/glibc_2.27.bb | 1 +
> meta/recipes-core/glibc/site_config/headers | 1 -
> meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb | 31 ++
> meta/recipes-core/meta/uninative-tarball.bb | 1 +
> meta/recipes-core/musl/musl_git.bb | 2 +-
> meta/recipes-core/util-linux/util-linux.inc | 2 +-
> meta/recipes-devtools/perl/perl_5.24.1.bb | 2 +-
> meta/recipes-extended/shadow/shadow.inc | 3 +-
> 11 files changed, 461 insertions(+), 7 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 93f57f3..60590e2 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -187,6 +187,7 @@ ASSUME_PROVIDED = "\
> tar-native \
> virtual/libintl-native \
> virtual/libiconv-native \
> + virtual/crypt-native \
> texinfo-native \
> bash-native \
> sed-native \
> diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/
> glibc.inc
> index 361a6fd..9e02ffd 100644
> --- a/meta/recipes-core/glibc/glibc.inc
> +++ b/meta/recipes-core/glibc/glibc.inc
> @@ -35,7 +35,10 @@ siteconfig_do_siteconfig_gencache_prepend = " \
> DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial
> linux-libc-headers virtual/${TARGET_PREFIX}libc-initial"
> # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
> #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
> -PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
> +
> +CRYPTPROVIDES = "virtual/crypt"
> +CRYPTPROVIDES_class-nativesdk = ""
> +PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc
> ${CRYPTPROVIDES}"
> PROVIDES += "virtual/libintl virtual/libiconv"
> inherit autotools texinfo distro_features_check systemd
>
> diff --git a/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
> b/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
> new file mode 100644
> index 0000000..a9132ed
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/0031-nativesdk-
> deprecate-libcrypt.patch
> @@ -0,0 +1,419 @@
> +Background information:
> +
> +https://sourceware.org/ml/libc-alpha/2017-08/msg01257.html
> +https://fedoraproject.org/wiki/Changes/Replace_glibc_
> libcrypt_with_libxcrypt
> +
> +Upstream-Status: Submitted [libc-alpha@sourceware.org]
> +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> +
> +From: Zack Weinberg <zackw@panix.com>
> +Subject: [PATCH] Deprecate libcrypt and don't build it by default
> +
> +Back in June, Björn Esser proposed to add OpenBSD-compatible bcrypt
> +support to our implementation of crypt(3), and Zack Weinberg replied
> +that it might actually make more sense to _remove_ libcrypt from
> +glibc, freeing up libcrypt.so.1 and crypt.h to be provided by a
> +separate project that could move faster. (For instance, libxcrypt:
> +https://github.com/besser82/libxcrypt)
> +
> +This patch disables build and installation of libcrypt by default. It
> +can be re-enabled with --enable-obsolete-crypt to configure. Unlike
> +libnsl, we do *not* install a runtime shared library; that's left to
> +the replacement. (Unlike the SunRPC situation, I think we can
> +probably drop this code altogether in a release or two.)
> +
> +The function prototypes for crypt and encrypt are removed from
> +unistd.h, and the function prototype for setkey is removed from
> +stdlib.h; they do *not* come back with --enable-obsolete-crypt. This
> +means glibc no longer provides the POSIX CRYPT option, and the macro
> +_XOPEN_CRYPT is also removed from unistd.h to indicate that.
> +(_SC_XOPEN_CRYPT is still defined, but sysconf(_SC_XOPEN_CRYPT) will
> +return -1 at runtime.) These functions are also unconditionally
> +removed from conform/data/{stdlib,unistd}.h-data.
> +
> + * posix/unistd.h (_XOPEN_CRYPT, crypt, encrypt): Don't declare.
> + * stdlib/stdlib.h (setkey): Don't declare.
> +
> + * configure.ac (--enable-obsolete-crypt): New configure option.
> + * configure: Regenerate.
> + * config.make.in (build-obsolete-crypt): New makefile variable.
> + * crypt/Banner: Delete file.
> + * crypt/Makefile: Don't build anything unless
> + $(build-obsolete-crypt) is 'yes'.
> + * sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile: Only add
> things
> + to libcrypt-sysdep_routines when $(build-obsolete-crypt) is 'yes'.
> + * sysdeps/sparc/sparc64/multiarch/Makefile: Likewise.
> + * sysdeps/unix/sysv/linux/arm/Makefile: Likewise.
> +
> + * conform/Makefile: Only include libcrypt.a in linknamespace tests
> + when $(build-obsolete-crypt) is 'yes'.
> + * conform/data/stdlib.h-data (setkey): Don't expect.
> + * conform/data/unistd.h-data (crypt, encrypt): Don't expect.
> + * elf/Makefile: Only perform various tests of
> libcrypt.so/libcrypt.a
> + when $(build-obsolete-crypt) is 'yes'.
> + * elf/tst-linkall-static.c: Don't include crypt.h when USE_CRYPT
> + is false.
> +---
> + NEWS | 18 ++++++++++++++++++
> + config.make.in | 1 +
> + configure | 13 +++++++++++++
> + configure.ac | 8 ++++++++
> + conform/Makefile | 14 ++++++++++----
> + conform/data/stdlib.h-data | 3 ---
> + conform/data/unistd.h-data | 6 ------
> + crypt/Makefile | 5 +++++
> + elf/Makefile | 16 ++++++++++++----
> + elf/tst-linkall-static.c | 2 ++
> + posix/unistd.h | 16 ----------------
> + stdlib/stdlib.h | 6 ------
> + sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile | 2 ++
> + sysdeps/sparc/sparc64/multiarch/Makefile | 2 ++
> + sysdeps/unix/sysv/linux/arm/Makefile | 2 ++
> + 15 files changed, 75 insertions(+), 39 deletions(-)
> +
> +diff --git a/config.make.in b/config.make.in
> +index 9e5e24b2c6..8fe610d04d 100644
> +--- a/config.make.in
> ++++ b/config.make.in
> +@@ -82,6 +82,7 @@ mach-interface-list = @mach_interface_list@
> +
> + experimental-malloc = @experimental_malloc@
> +
> ++build-obsolete-crypt = @build_obsolete_crypt@
> + nss-crypt = @libc_cv_nss_crypt@
> + static-nss-crypt = @libc_cv_static_nss_crypt@
> +
> +diff --git a/configure b/configure
> +index 7a8bd3f817..46f6bd7f86 100755
> +--- a/configure
> ++++ b/configure
> +@@ -672,6 +672,7 @@ base_machine
> + have_tunables
> + build_pt_chown
> + build_nscd
> ++build_obsolete_crypt
> + build_obsolete_nsl
> + link_obsolete_rpc
> + libc_cv_static_nss_crypt
> +@@ -782,6 +783,7 @@ enable_experimental_malloc
> + enable_nss_crypt
> + enable_obsolete_rpc
> + enable_obsolete_nsl
> ++enable_obsolete_crypt
> + enable_systemtap
> + enable_build_nscd
> + enable_nscd
> +@@ -1453,6 +1455,7 @@ Optional Features:
> + link-time usage
> + --enable-obsolete-nsl build and install the obsolete libnsl library
> and
> + depending NSS modules
> ++ --enable-obsolete-crypt build and install the obsolete libcrypt library
> + --enable-systemtap enable systemtap static probe points
> [default=no]
> + --disable-build-nscd disable building and installing the nscd daemon
> + --disable-nscd library functions will not contact the nscd
> daemon
> +@@ -3632,6 +3635,16 @@ if test "$build_obsolete_nsl" = yes; then
> +
> + fi
> +
> ++# Check whether --enable-obsolete-crypt was given.
> ++if test "${enable_obsolete_crypt+set}" = set; then :
> ++ enableval=$enable_obsolete_crypt; build_obsolete_crypt=$enableval
> ++else
> ++ build_obsolete_crypt=no
> ++fi
> ++
> ++
> ++
> ++
> + # Check whether --enable-systemtap was given.
> + if test "${enable_systemtap+set}" = set; then :
> + enableval=$enable_systemtap; systemtap=$enableval
> +diff --git a/configure.ac b/configure.ac
> +index ca1282a6b3..0142353740 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -378,6 +378,14 @@ if test "$build_obsolete_nsl" = yes; then
> + AC_DEFINE(LINK_OBSOLETE_NSL)
> + fi
> +
> ++AC_ARG_ENABLE([obsolete-crypt],
> ++ AC_HELP_STRING([--enable-obsolete-crypt],
> ++ [build and install the obsolete libcrypt
> library]),
> ++ [build_obsolete_crypt=$enableval],
> ++ [build_obsolete_crypt=no])
> ++AC_SUBST(build_obsolete_crypt)
> ++
> ++
> + AC_ARG_ENABLE([systemtap],
> + [AS_HELP_STRING([--enable-systemtap],
> + [enable systemtap static probe points @<:@default=no@
> :>@])],
> +diff --git a/conform/Makefile b/conform/Makefile
> +index 864fdeca21..5ef474fb24 100644
> +--- a/conform/Makefile
> ++++ b/conform/Makefile
> +@@ -193,22 +193,28 @@ linknamespace-libs-thr = $(linknamespace-libs-isoc)
> \
> + $(common-objpfx)rt/librt.a
> $(static-thread-library)
> + linknamespace-libs-posix = $(linknamespace-libs-thr) \
> + $(common-objpfx)dlfcn/libdl.a
> +-linknamespace-libs-xsi = $(linknamespace-libs-posix) \
> +- $(common-objpfx)crypt/libcrypt.a
> ++linknamespace-libs-xsi = $(linknamespace-libs-posix)
> + linknamespace-libs-ISO = $(linknamespace-libs-isoc)
> + linknamespace-libs-ISO99 = $(linknamespace-libs-isoc)
> + linknamespace-libs-ISO11 = $(linknamespace-libs-isoc)
> +-linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) \
> +- $(common-objpfx)crypt/libcrypt.a
> ++linknamespace-libs-XPG4 = $(linknamespace-libs-isoc)
> + linknamespace-libs-XPG42 = $(linknamespace-libs-XPG4)
> + linknamespace-libs-POSIX = $(linknamespace-libs-thr)
> + linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi)
> + linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi)
> + linknamespace-libs-POSIX2008 = $(linknamespace-libs-posix)
> + linknamespace-libs-XOPEN2K8 = $(linknamespace-libs-xsi)
> ++
> ++ifeq ($(build-obsolete-crypt),yes)
> ++linknamespace-libs-xsi += $(common-objpfx)crypt/libcrypt.a
> ++linknamespace-libs-XPG4 += $(common-objpfx)crypt/libcrypt.a
> ++endif
> ++
> + linknamespace-libs = $(foreach std,$(conformtest-standards),\
> + $(linknamespace-libs-$(std)))
> +
> ++
> ++
> + $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \
> + $(linknamespace-libs)
> + LC_ALL=C $(READELF) -W -s $(linknamespace-libs-$*) > $@; \
> +diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
> +index d8fcccc2fb..6913828196 100644
> +--- a/conform/data/stdlib.h-data
> ++++ b/conform/data/stdlib.h-data
> +@@ -149,9 +149,6 @@ function {unsigned short int*} seed48 (unsigned short
> int[3])
> + #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
> && !defined XPG4 && !defined XPG42 && !defined UNIX98
> + function int setenv (const char*, const char*, int)
> + #endif
> +-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
> && !defined POSIX2008
> +-function void setkey (const char*)
> +-#endif
> + #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4 &&
> !defined POSIX && !defined POSIX2008
> + function {char*} setstate (char*)
> + #endif
> +diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
> +index ddf4f25132..aa070528e8 100644
> +--- a/conform/data/unistd.h-data
> ++++ b/conform/data/unistd.h-data
> +@@ -437,9 +437,6 @@ function int chroot (const char*)
> + function int chown (const char*, uid_t, gid_t)
> + function int close (int)
> + function size_t confstr (int, char*, size_t)
> +-#if !defined POSIX && !defined POSIX2008
> +-function {char*} crypt (const char*, const char*)
> +-#endif
> + #if defined XPG4 || defined XPG42 || defined UNIX98
> + function {char*} ctermid (char*)
> + function {char*} cuserid (char*)
> +@@ -449,9 +446,6 @@ allow cuserid
> + #endif
> + function int dup (int)
> + function int dup2 (int, int)
> +-#if !defined POSIX && !defined POSIX2008
> +-function void encrypt (char[64], int)
> +-#endif
> + function int execl (const char*, const char*, ...)
> + function int execle (const char*, const char*, ...)
> + function int execlp (const char*, const char*, ...)
> +diff --git a/crypt/Makefile b/crypt/Makefile
> +index 303800df73..024ec2c6ab 100644
> +--- a/crypt/Makefile
> ++++ b/crypt/Makefile
> +@@ -22,6 +22,8 @@ subdir := crypt
> +
> + include ../Makeconfig
> +
> ++ifeq ($(build-obsolete-crypt),yes)
> ++
> + headers := crypt.h
> +
> + extra-libs := libcrypt
> +@@ -52,9 +54,11 @@ tests += md5test sha256test sha512test
> + # machine over a minute.
> + xtests = md5test-giant
> + endif
> ++endif
> +
> + include ../Rules
> +
> ++ifeq ($(build-obsolete-crypt),yes)
> + ifneq ($(nss-crypt),yes)
> + md5-routines := md5 $(filter md5%,$(libcrypt-sysdep_routines))
> + sha256-routines := sha256 $(filter sha256%,$(libcrypt-sysdep_routines))
> +@@ -71,3 +75,4 @@ $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.so
> + else
> + $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.a
> + endif
> ++endif
> +diff --git a/elf/Makefile b/elf/Makefile
> +index 2a432d8bee..366f7b80ec 100644
> +--- a/elf/Makefile
> ++++ b/elf/Makefile
> +@@ -385,15 +385,19 @@ $(objpfx)tst-_dl_addr_inside_object:
> $(objpfx)dl-addr-obj.os
> + CFLAGS-tst-_dl_addr_inside_object.c += $(PIE-ccflag)
> + endif
> +
> +-# By default tst-linkall-static should try to use crypt routines to test
> +-# static libcrypt use.
> +-CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=1
> ++ifeq ($(build-obsolete-crypt),yes)
> ++# If the libcrypt library is being built, tst-linkall-static should
> ++# try to use crypt routines to test static libcrypt use.
> ++CFLAGS-tst-linkall-static.c = -DUSE_CRYPT=1
> + # However, if we are using NSS crypto and we don't have a static
> + # library, then we exclude the use of crypt functions in the test.
> + # We similarly exclude libcrypt.a from the static link (see below).
> + ifeq (yesno,$(nss-crypt)$(static-nss-crypt))
> + CFLAGS-tst-linkall-static.c += -UUSE_CRYPT -DUSE_CRYPT=0
> + endif
> ++else
> ++CFLAGS-tst-linkall-static.c = -DUSE_CRYPT=0
> ++endif
> +
> + include ../Rules
> +
> +@@ -1113,8 +1117,10 @@ localplt-built-dso := $(addprefix
> $(common-objpfx),\
> + rt/librt.so \
> + dlfcn/libdl.so \
> + resolv/libresolv.so \
> +- crypt/libcrypt.so \
> + )
> ++ifeq ($(build-obsolete-crypt),yes)
> ++localplt-built-dso += $(addprefix $(common-objpfx), crypt/libcrypt.so)
> ++endif
> + ifeq ($(build-mathvec),yes)
> + localplt-built-dso += $(addprefix $(common-objpfx), mathvec/libmvec.so)
> + endif
> +@@ -1395,6 +1401,7 @@ $(objpfx)tst-linkall-static: \
> + $(common-objpfx)resolv/libanl.a \
> + $(static-thread-library)
> +
> ++ifeq ($(build-obsolete-crypt),yes)
> + # If we are using NSS crypto and we have the ability to link statically
> + # then we include libcrypt.a, otherwise we leave out libcrypt.a and
> + # link as much as we can into the tst-linkall-static test. This assumes
> +@@ -1410,6 +1417,7 @@ ifeq (no,$(nss-crypt))
> + $(objpfx)tst-linkall-static: \
> + $(common-objpfx)crypt/libcrypt.a
> + endif
> ++endif
> +
> + # The application depends on the DSO, and the DSO loads the plugin.
> + # The plugin also depends on the DSO. This creates the circular
> +diff --git a/elf/tst-linkall-static.c b/elf/tst-linkall-static.c
> +index e8df38f74e..0ffae7c723 100644
> +--- a/elf/tst-linkall-static.c
> ++++ b/elf/tst-linkall-static.c
> +@@ -18,7 +18,9 @@
> +
> + #include <math.h>
> + #include <pthread.h>
> ++#if USE_CRYPT
> + #include <crypt.h>
> ++#endif
> + #include <resolv.h>
> + #include <dlfcn.h>
> + #include <utmp.h>
> +diff --git a/posix/unistd.h b/posix/unistd.h
> +index 4d149f9945..e75ce4d4ec 100644
> +--- a/posix/unistd.h
> ++++ b/posix/unistd.h
> +@@ -107,9 +107,6 @@ __BEGIN_DECLS
> + /* The X/Open Unix extensions are available. */
> + #define _XOPEN_UNIX 1
> +
> +-/* Encryption is present. */
> +-#define _XOPEN_CRYPT 1
> +-
> + /* The enhanced internationalization capabilities according to XPG4.2
> + are present. */
> + #define _XOPEN_ENH_I18N 1
> +@@ -1118,20 +1115,7 @@ ssize_t copy_file_range (int __infd, __off64_t
> *__pinoff,
> + extern int fdatasync (int __fildes);
> + #endif /* Use POSIX199309 */
> +
> +-
> +-/* XPG4.2 specifies that prototypes for the encryption functions must
> +- be defined here. */
> + #ifdef __USE_XOPEN
> +-/* Encrypt at most 8 characters from KEY using salt to perturb DES. */
> +-extern char *crypt (const char *__key, const char *__salt)
> +- __THROW __nonnull ((1, 2));
> +-
> +-/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
> +- block in place. */
> +-extern void encrypt (char *__glibc_block, int __edflag)
> +- __THROW __nonnull ((1));
> +-
> +-
> + /* Swab pairs bytes in the first N bytes of the area pointed to by
> + FROM and copy the result to TO. The value of TO must not be in the
> + range [FROM - N + 1, FROM - 1]. If N is odd the first byte in FROM
> +diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
> +index 6b1ead31e0..8e23e93557 100644
> +--- a/stdlib/stdlib.h
> ++++ b/stdlib/stdlib.h
> +@@ -958,12 +958,6 @@ extern int getsubopt (char **__restrict __optionp,
> + #endif
> +
> +
> +-#ifdef __USE_XOPEN
> +-/* Setup DES tables according KEY. */
> +-extern void setkey (const char *__key) __THROW __nonnull ((1));
> +-#endif
> +-
> +-
> + /* X/Open pseudo terminal handling. */
> +
> + #ifdef __USE_XOPEN2KXSI
> +diff --git a/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> b/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> +index a6d08f3a00..d8b8297fb0 100644
> +--- a/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> ++++ b/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> +@@ -1,6 +1,8 @@
> + ifeq ($(subdir),crypt)
> ++ifeq ($(build-obsolete-crypt),yes)
> + libcrypt-sysdep_routines += md5-crop sha256-crop sha512-crop
> + endif
> ++endif
> +
> + ifeq ($(subdir),locale)
> + localedef-aux += md5-crop
> +diff --git a/sysdeps/sparc/sparc64/multiarch/Makefile
> b/sysdeps/sparc/sparc64/multiarch/Makefile
> +index eaf758e7aa..0198f9886f 100644
> +--- a/sysdeps/sparc/sparc64/multiarch/Makefile
> ++++ b/sysdeps/sparc/sparc64/multiarch/Makefile
> +@@ -1,6 +1,8 @@
> + ifeq ($(subdir),crypt)
> ++ifeq ($(build-obsolete-crypt),yes)
> + libcrypt-sysdep_routines += md5-crop sha256-crop sha512-crop
> + endif
> ++endif
> +
> + ifeq ($(subdir),locale)
> + localedef-aux += md5-crop
> +diff --git a/sysdeps/unix/sysv/linux/arm/Makefile
> b/sysdeps/unix/sysv/linux/arm/Makefile
> +index 4adc35de04..6cab4f3a31 100644
> +--- a/sysdeps/unix/sysv/linux/arm/Makefile
> ++++ b/sysdeps/unix/sysv/linux/arm/Makefile
> +@@ -19,8 +19,10 @@ endif
> + # Add a syscall function to each library that needs one.
> +
> + ifeq ($(subdir),crypt)
> ++ifeq ($(build-obsolete-crypt),yes)
> + libcrypt-sysdep_routines += libc-do-syscall
> + endif
> ++endif
> +
> + ifeq ($(subdir),rt)
> + librt-sysdep_routines += libc-do-syscall
> +--
> +2.16.0
> +
> diff --git a/meta/recipes-core/glibc/glibc_2.27.bb
> b/meta/recipes-core/glibc/glibc_2.27.bb
> index 772351a..c814798 100644
> --- a/meta/recipes-core/glibc/glibc_2.27.bb
> +++ b/meta/recipes-core/glibc/glibc_2.27.bb
> @@ -54,6 +54,7 @@ NATIVESDKFIXES_class-nativesdk = "\
> file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
> \
> file://0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
> \
> file://relocate-locales.patch \
> + file://0031-nativesdk-deprecate-libcrypt.patch \
> "
>
> S = "${WORKDIR}/git"
> diff --git a/meta/recipes-core/glibc/site_config/headers
> b/meta/recipes-core/glibc/site_config/headers
> index 609ab53..69fedea 100644
> --- a/meta/recipes-core/glibc/site_config/headers
> +++ b/meta/recipes-core/glibc/site_config/headers
> @@ -9,7 +9,6 @@ asm/page.h
> asm/types.h
> assert.h
> byteswap.h
> -crypt.h
> ctype.h
> dirent.h
> dlfcn.h
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> new file mode 100644
> index 0000000..b1982c1
> --- /dev/null
> +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> @@ -0,0 +1,31 @@
> +SUMMARY = "Extended cryptographic library (from glibc)"
> +DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
> +HOMEPAGE = "https://github.com/besser82/libxcrypt"
> +SECTION = "libs"
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM ?= "file://LICENSING;md5=d1cc18f512ded3bd6000f3729f31be08
> \
> + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> +"
> +
> +inherit autotools
> +
> +SRCREV ?= "215b32aa4e0b255c3356a96bd6d257661bad73ca"
> +SRCBRANCH ?= "master"
> +
> +SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
> +
> +PROVIDES = "virtual/crypt"
> +
> +FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so
> ${libdir}/libowcrypt*.so.* ${libdir}/libowcrypt-*.so"
> +
> +S = "${WORKDIR}/git"
> +
> +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
> +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
> +
> +python () {
> + if not bb.data.inherits_class('nativesdk', d):
> + raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case
> for now")
> +}
> +
> +BBCLASSEXTEND = "nativesdk"
> diff --git a/meta/recipes-core/meta/uninative-tarball.bb
> b/meta/recipes-core/meta/uninative-tarball.bb
> index 5fabf7f..38c3a31 100644
> --- a/meta/recipes-core/meta/uninative-tarball.bb
> +++ b/meta/recipes-core/meta/uninative-tarball.bb
> @@ -13,6 +13,7 @@ TOOLCHAIN_HOST_TASK = "\
> nativesdk-glibc-gconv-utf-16 \
> nativesdk-glibc-gconv-cp1252 \
> nativesdk-patchelf \
> + nativesdk-libxcrypt \
> "
>
> INHIBIT_DEFAULT_DEPS = "1"
> diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/
> musl_git.bb
> index 8906ac6..9f8c512 100644
> --- a/meta/recipes-core/musl/musl_git.bb
> +++ b/meta/recipes-core/musl/musl_git.bb
> @@ -15,7 +15,7 @@ SRC_URI = "git://git.musl-libc.org/musl \
>
> S = "${WORKDIR}/git"
>
> -PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc
> virtual/libiconv virtual/libintl"
> +PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc
> virtual/libiconv virtual/libintl virtual/crypt"
>
> DEPENDS = "virtual/${TARGET_PREFIX}binutils \
> virtual/${TARGET_PREFIX}gcc-initial \
> diff --git a/meta/recipes-core/util-linux/util-linux.inc
> b/meta/recipes-core/util-linux/util-linux.inc
> index 5e40b20..157416d 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=
> 1715f5ee3e01203ca1e1e0b9ee65918c
>
> #gtk-doc is not enabled as it requires xmlto which requires util-linux
> inherit autotools gettext pkgconfig systemd update-alternatives
> python3-dir bash-completion ptest
> -DEPENDS = "zlib ncurses"
> +DEPENDS = "zlib ncurses virtual/crypt"
> DEPENDS_append_class-native = " lzo-native"
> DEPENDS_append_class-nativesdk = " lzo-native"
>
> diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb
> b/meta/recipes-devtools/perl/perl_5.24.1.bb
> index 66ccd7f..222dd88 100644
> --- a/meta/recipes-devtools/perl/perl_5.24.1.bb
> +++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
> @@ -1,7 +1,7 @@
> require perl.inc
>
> # We need gnugrep (for -I)
> -DEPENDS = "db grep-native gdbm zlib"
> +DEPENDS = "db grep-native gdbm zlib virtual/crypt"
>
> # Pick up patches from debian
> # http://ftp.de.debian.org/debian/pool/main/p/perl/perl_
> 5.22.0-1.debian.tar.xz
> diff --git a/meta/recipes-extended/shadow/shadow.inc
> b/meta/recipes-extended/shadow/shadow.inc
> index 48a3be8..673207f 100644
> --- a/meta/recipes-extended/shadow/shadow.inc
> +++ b/meta/recipes-extended/shadow/shadow.inc
> @@ -6,8 +6,7 @@ LICENSE = "BSD | Artistic-1.0"
> LIC_FILES_CHKSUM = "file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5 \
> file://src/passwd.c;beginline=8;endline=30;md5=
> d83888ea14ae61951982d77125947661"
>
> -DEPENDS_class-native = ""
> -DEPENDS_class-nativesdk = ""
> +DEPENDS = "virtual/crypt"
>
> SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${
> PV}.tar.xz \
> file://shadow-4.1.3-dots-in-usernames.patch \
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-08 17:00 ` [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead Martin Jansa
@ 2018-04-08 22:06 ` Richard Purdie
2018-04-09 0:52 ` Khem Raj
2018-04-09 7:51 ` [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS Martin Jansa
2 siblings, 0 replies; 11+ messages in thread
From: Richard Purdie @ 2018-04-08 22:06 UTC (permalink / raw)
To: Martin Jansa, openembedded-devel; +Cc: openembedded-commits
On Sun, 2018-04-08 at 19:00 +0200, Martin Jansa wrote:
> On Ubuntu 14.04 this fails with:
>
> ../git/gen-des-tables.c: In function ‘write_table_u8’:
> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations
> are only allowed in C99 mode
> for (size_t i = 0; i < m; i++)
> ^
>
> I'll try to add explicit -std=gnu99 to support building on such older
> host distributions with older gcc.
Thanks, looks like centos6 has the same issue:
https://autobuilder.yocto.io/builders/buildtools/builds/906/steps/BuildImages/logs/stdio
Didn't show up in the first round of testing :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-08 17:00 ` [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead Martin Jansa
2018-04-08 22:06 ` Richard Purdie
@ 2018-04-09 0:52 ` Khem Raj
2018-04-09 22:23 ` Andre McCurdy
2018-04-09 7:51 ` [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS Martin Jansa
2 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2018-04-09 0:52 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel, openembedded-commits
On Sun, Apr 8, 2018 at 10:00 AM Martin Jansa <martin.jansa@gmail.com> wrote:
> On Ubuntu 14.04 this fails with:
>
> ../git/gen-des-tables.c: In function ‘write_table_u8’:
> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations are
> only allowed in C99 mode
> for (size_t i = 0; i < m; i++)
> ^
>
You can patch this to move declaration just above loop if that helps we
should apply such a patch for compatibility sake but I wonder if there are
more c99 assumptions at work here
It’s probably to keep this limited to use of old distros only and may be
make no changes in layer proper
>
> I'll try to add explicit -std=gnu99 to support building on such older host
> distributions with older gcc.
>
> On Sat, Apr 7, 2018 at 11:35 PM, <git@git.openembedded.org> wrote:
>
> > This is an automated email from the git hooks/post-receive script.
> >
> > rpurdie pushed a commit to branch master
> > in repository openembedded-core.
> >
> > commit c1573cb7faeb296fe7077a60d02443d5ed5bded0
> > Author: Richard Purdie <richard.purdie@linuxfoundation.org>
> > AuthorDate: Fri Apr 6 14:53:53 2018 +0200
> >
> > nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
> >
> > Fedora28[1] has decided to go ahead and use libxcrypt to replace
> > libcrypt from glibc
> > despite the change not having merged into glibc upstream yet. This
> > breaks the use of
> > uninative in OE on fedora28 since binaries there are now using new
> > symbols only found
> > in libxcrypt. libxcrypt is meant to be backwards compatible with
> > libcrypt but not the
> > reverse.
> >
> > Since this will impact OE in the next release cycle, this changes
> > nativesdk only
> > to use this new model and adds libxcrypt to work in that case. This
> > allows us to
> > build a uninative which is compatible with fedora28 and previous
> other
> > OSes.
> >
> > In order to work, recipes will now need to depend on virtual/crypt
> > where they use
> > libcrypt since its now a separate library and we can't depend on it
> > from glibc to
> > preseve backwards compatibility since glibc needs to build first. For
> > now, only the
> > problematic nativesdk recipes have been fixed up. For target use, the
> > default
> > provider remains glibc for now. Assuming this change is merged into
> > upstream glibc,
> > we will need to roll this change out for the target but we will do
> > this in the next
> > release cycle when we can better deal with the resulting bugs.
> >
> > [1] https://fedoraproject.org/wiki/Changes/Replace_glibc_
> > libcrypt_with_libxcrypt
> >
> > Original patch from Charles-Antoine Couret <charles-antoine.couret@
> > essensium.com>,
> > tweaked by RP to add virtual provides, SkipRecipe for libxcrypt and
> > other minor
> > tweaks.
> >
> > Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@
> > essensium.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/conf/bitbake.conf | 1 +
> > meta/recipes-core/glibc/glibc.inc | 5 +-
> > .../glibc/0031-nativesdk-deprecate-libcrypt.patch | 419
> > +++++++++++++++++++++
> > meta/recipes-core/glibc/glibc_2.27.bb | 1 +
> > meta/recipes-core/glibc/site_config/headers | 1 -
> > meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb | 31 ++
> > meta/recipes-core/meta/uninative-tarball.bb | 1 +
> > meta/recipes-core/musl/musl_git.bb | 2 +-
> > meta/recipes-core/util-linux/util-linux.inc | 2 +-
> > meta/recipes-devtools/perl/perl_5.24.1.bb | 2 +-
> > meta/recipes-extended/shadow/shadow.inc | 3 +-
> > 11 files changed, 461 insertions(+), 7 deletions(-)
> >
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > index 93f57f3..60590e2 100644
> > --- a/meta/conf/bitbake.conf
> > +++ b/meta/conf/bitbake.conf
> > @@ -187,6 +187,7 @@ ASSUME_PROVIDED = "\
> > tar-native \
> > virtual/libintl-native \
> > virtual/libiconv-native \
> > + virtual/crypt-native \
> > texinfo-native \
> > bash-native \
> > sed-native \
> > diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/
> > glibc.inc
> > index 361a6fd..9e02ffd 100644
> > --- a/meta/recipes-core/glibc/glibc.inc
> > +++ b/meta/recipes-core/glibc/glibc.inc
> > @@ -35,7 +35,10 @@ siteconfig_do_siteconfig_gencache_prepend = " \
> > DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial
> > linux-libc-headers virtual/${TARGET_PREFIX}libc-initial"
> > # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect
> this
> > #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
> > -PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
> > +
> > +CRYPTPROVIDES = "virtual/crypt"
> > +CRYPTPROVIDES_class-nativesdk = ""
> > +PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc
> > ${CRYPTPROVIDES}"
> > PROVIDES += "virtual/libintl virtual/libiconv"
> > inherit autotools texinfo distro_features_check systemd
> >
> > diff --git
> a/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
> > b/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
> > new file mode 100644
> > index 0000000..a9132ed
> > --- /dev/null
> > +++ b/meta/recipes-core/glibc/glibc/0031-nativesdk-
> > deprecate-libcrypt.patch
> > @@ -0,0 +1,419 @@
> > +Background information:
> > +
> > +https://sourceware.org/ml/libc-alpha/2017-08/msg01257.html
> > +https://fedoraproject.org/wiki/Changes/Replace_glibc_
> > libcrypt_with_libxcrypt
> > +
> > +Upstream-Status: Submitted [libc-alpha@sourceware.org]
> > +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > +
> > +From: Zack Weinberg <zackw@panix.com>
> > +Subject: [PATCH] Deprecate libcrypt and don't build it by default
> > +
> > +Back in June, Björn Esser proposed to add OpenBSD-compatible bcrypt
> > +support to our implementation of crypt(3), and Zack Weinberg replied
> > +that it might actually make more sense to _remove_ libcrypt from
> > +glibc, freeing up libcrypt.so.1 and crypt.h to be provided by a
> > +separate project that could move faster. (For instance, libxcrypt:
> > +https://github.com/besser82/libxcrypt)
> > +
> > +This patch disables build and installation of libcrypt by default. It
> > +can be re-enabled with --enable-obsolete-crypt to configure. Unlike
> > +libnsl, we do *not* install a runtime shared library; that's left to
> > +the replacement. (Unlike the SunRPC situation, I think we can
> > +probably drop this code altogether in a release or two.)
> > +
> > +The function prototypes for crypt and encrypt are removed from
> > +unistd.h, and the function prototype for setkey is removed from
> > +stdlib.h; they do *not* come back with --enable-obsolete-crypt. This
> > +means glibc no longer provides the POSIX CRYPT option, and the macro
> > +_XOPEN_CRYPT is also removed from unistd.h to indicate that.
> > +(_SC_XOPEN_CRYPT is still defined, but sysconf(_SC_XOPEN_CRYPT) will
> > +return -1 at runtime.) These functions are also unconditionally
> > +removed from conform/data/{stdlib,unistd}.h-data.
> > +
> > + * posix/unistd.h (_XOPEN_CRYPT, crypt, encrypt): Don't declare.
> > + * stdlib/stdlib.h (setkey): Don't declare.
> > +
> > + * configure.ac (--enable-obsolete-crypt): New configure option.
> > + * configure: Regenerate.
> > + * config.make.in (build-obsolete-crypt): New makefile variable.
> > + * crypt/Banner: Delete file.
> > + * crypt/Makefile: Don't build anything unless
> > + $(build-obsolete-crypt) is 'yes'.
> > + * sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile: Only add
> > things
> > + to libcrypt-sysdep_routines when $(build-obsolete-crypt) is
> 'yes'.
> > + * sysdeps/sparc/sparc64/multiarch/Makefile: Likewise.
> > + * sysdeps/unix/sysv/linux/arm/Makefile: Likewise.
> > +
> > + * conform/Makefile: Only include libcrypt.a in linknamespace
> tests
> > + when $(build-obsolete-crypt) is 'yes'.
> > + * conform/data/stdlib.h-data (setkey): Don't expect.
> > + * conform/data/unistd.h-data (crypt, encrypt): Don't expect.
> > + * elf/Makefile: Only perform various tests of
> > libcrypt.so/libcrypt.a
> > + when $(build-obsolete-crypt) is 'yes'.
> > + * elf/tst-linkall-static.c: Don't include crypt.h when USE_CRYPT
> > + is false.
> > +---
> > + NEWS | 18
> ++++++++++++++++++
> > + config.make.in | 1 +
> > + configure | 13 +++++++++++++
> > + configure.ac | 8 ++++++++
> > + conform/Makefile | 14 ++++++++++----
> > + conform/data/stdlib.h-data | 3 ---
> > + conform/data/unistd.h-data | 6 ------
> > + crypt/Makefile | 5 +++++
> > + elf/Makefile | 16 ++++++++++++----
> > + elf/tst-linkall-static.c | 2 ++
> > + posix/unistd.h | 16 ----------------
> > + stdlib/stdlib.h | 6 ------
> > + sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile | 2 ++
> > + sysdeps/sparc/sparc64/multiarch/Makefile | 2 ++
> > + sysdeps/unix/sysv/linux/arm/Makefile | 2 ++
> > + 15 files changed, 75 insertions(+), 39 deletions(-)
> > +
> > +diff --git a/config.make.in b/config.make.in
> > +index 9e5e24b2c6..8fe610d04d 100644
> > +--- a/config.make.in
> > ++++ b/config.make.in
> > +@@ -82,6 +82,7 @@ mach-interface-list = @mach_interface_list@
> > +
> > + experimental-malloc = @experimental_malloc@
> > +
> > ++build-obsolete-crypt = @build_obsolete_crypt@
> > + nss-crypt = @libc_cv_nss_crypt@
> > + static-nss-crypt = @libc_cv_static_nss_crypt@
> > +
> > +diff --git a/configure b/configure
> > +index 7a8bd3f817..46f6bd7f86 100755
> > +--- a/configure
> > ++++ b/configure
> > +@@ -672,6 +672,7 @@ base_machine
> > + have_tunables
> > + build_pt_chown
> > + build_nscd
> > ++build_obsolete_crypt
> > + build_obsolete_nsl
> > + link_obsolete_rpc
> > + libc_cv_static_nss_crypt
> > +@@ -782,6 +783,7 @@ enable_experimental_malloc
> > + enable_nss_crypt
> > + enable_obsolete_rpc
> > + enable_obsolete_nsl
> > ++enable_obsolete_crypt
> > + enable_systemtap
> > + enable_build_nscd
> > + enable_nscd
> > +@@ -1453,6 +1455,7 @@ Optional Features:
> > + link-time usage
> > + --enable-obsolete-nsl build and install the obsolete libnsl library
> > and
> > + depending NSS modules
> > ++ --enable-obsolete-crypt build and install the obsolete libcrypt
> library
> > + --enable-systemtap enable systemtap static probe points
> > [default=no]
> > + --disable-build-nscd disable building and installing the nscd
> daemon
> > + --disable-nscd library functions will not contact the nscd
> > daemon
> > +@@ -3632,6 +3635,16 @@ if test "$build_obsolete_nsl" = yes; then
> > +
> > + fi
> > +
> > ++# Check whether --enable-obsolete-crypt was given.
> > ++if test "${enable_obsolete_crypt+set}" = set; then :
> > ++ enableval=$enable_obsolete_crypt; build_obsolete_crypt=$enableval
> > ++else
> > ++ build_obsolete_crypt=no
> > ++fi
> > ++
> > ++
> > ++
> > ++
> > + # Check whether --enable-systemtap was given.
> > + if test "${enable_systemtap+set}" = set; then :
> > + enableval=$enable_systemtap; systemtap=$enableval
> > +diff --git a/configure.ac b/configure.ac
> > +index ca1282a6b3..0142353740 100644
> > +--- a/configure.ac
> > ++++ b/configure.ac
> > +@@ -378,6 +378,14 @@ if test "$build_obsolete_nsl" = yes; then
> > + AC_DEFINE(LINK_OBSOLETE_NSL)
> > + fi
> > +
> > ++AC_ARG_ENABLE([obsolete-crypt],
> > ++ AC_HELP_STRING([--enable-obsolete-crypt],
> > ++ [build and install the obsolete libcrypt
> > library]),
> > ++ [build_obsolete_crypt=$enableval],
> > ++ [build_obsolete_crypt=no])
> > ++AC_SUBST(build_obsolete_crypt)
> > ++
> > ++
> > + AC_ARG_ENABLE([systemtap],
> > + [AS_HELP_STRING([--enable-systemtap],
> > + [enable systemtap static probe points @<:@default=no@
> > :>@])],
> > +diff --git a/conform/Makefile b/conform/Makefile
> > +index 864fdeca21..5ef474fb24 100644
> > +--- a/conform/Makefile
> > ++++ b/conform/Makefile
> > +@@ -193,22 +193,28 @@ linknamespace-libs-thr =
> $(linknamespace-libs-isoc)
> > \
> > + $(common-objpfx)rt/librt.a
> > $(static-thread-library)
> > + linknamespace-libs-posix = $(linknamespace-libs-thr) \
> > + $(common-objpfx)dlfcn/libdl.a
> > +-linknamespace-libs-xsi = $(linknamespace-libs-posix) \
> > +- $(common-objpfx)crypt/libcrypt.a
> > ++linknamespace-libs-xsi = $(linknamespace-libs-posix)
> > + linknamespace-libs-ISO = $(linknamespace-libs-isoc)
> > + linknamespace-libs-ISO99 = $(linknamespace-libs-isoc)
> > + linknamespace-libs-ISO11 = $(linknamespace-libs-isoc)
> > +-linknamespace-libs-XPG4 = $(linknamespace-libs-isoc) \
> > +- $(common-objpfx)crypt/libcrypt.a
> > ++linknamespace-libs-XPG4 = $(linknamespace-libs-isoc)
> > + linknamespace-libs-XPG42 = $(linknamespace-libs-XPG4)
> > + linknamespace-libs-POSIX = $(linknamespace-libs-thr)
> > + linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi)
> > + linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi)
> > + linknamespace-libs-POSIX2008 = $(linknamespace-libs-posix)
> > + linknamespace-libs-XOPEN2K8 = $(linknamespace-libs-xsi)
> > ++
> > ++ifeq ($(build-obsolete-crypt),yes)
> > ++linknamespace-libs-xsi += $(common-objpfx)crypt/libcrypt.a
> > ++linknamespace-libs-XPG4 += $(common-objpfx)crypt/libcrypt.a
> > ++endif
> > ++
> > + linknamespace-libs = $(foreach std,$(conformtest-standards),\
> > + $(linknamespace-libs-$(std)))
> > +
> > ++
> > ++
> > + $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \
> > + $(linknamespace-libs)
> > + LC_ALL=C $(READELF) -W -s $(linknamespace-libs-$*) > $@; \
> > +diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
> > +index d8fcccc2fb..6913828196 100644
> > +--- a/conform/data/stdlib.h-data
> > ++++ b/conform/data/stdlib.h-data
> > +@@ -149,9 +149,6 @@ function {unsigned short int*} seed48 (unsigned
> short
> > int[3])
> > + #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
> > && !defined XPG4 && !defined XPG42 && !defined UNIX98
> > + function int setenv (const char*, const char*, int)
> > + #endif
> > +-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
> > && !defined POSIX2008
> > +-function void setkey (const char*)
> > +-#endif
> > + #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG4
> &&
> > !defined POSIX && !defined POSIX2008
> > + function {char*} setstate (char*)
> > + #endif
> > +diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
> > +index ddf4f25132..aa070528e8 100644
> > +--- a/conform/data/unistd.h-data
> > ++++ b/conform/data/unistd.h-data
> > +@@ -437,9 +437,6 @@ function int chroot (const char*)
> > + function int chown (const char*, uid_t, gid_t)
> > + function int close (int)
> > + function size_t confstr (int, char*, size_t)
> > +-#if !defined POSIX && !defined POSIX2008
> > +-function {char*} crypt (const char*, const char*)
> > +-#endif
> > + #if defined XPG4 || defined XPG42 || defined UNIX98
> > + function {char*} ctermid (char*)
> > + function {char*} cuserid (char*)
> > +@@ -449,9 +446,6 @@ allow cuserid
> > + #endif
> > + function int dup (int)
> > + function int dup2 (int, int)
> > +-#if !defined POSIX && !defined POSIX2008
> > +-function void encrypt (char[64], int)
> > +-#endif
> > + function int execl (const char*, const char*, ...)
> > + function int execle (const char*, const char*, ...)
> > + function int execlp (const char*, const char*, ...)
> > +diff --git a/crypt/Makefile b/crypt/Makefile
> > +index 303800df73..024ec2c6ab 100644
> > +--- a/crypt/Makefile
> > ++++ b/crypt/Makefile
> > +@@ -22,6 +22,8 @@ subdir := crypt
> > +
> > + include ../Makeconfig
> > +
> > ++ifeq ($(build-obsolete-crypt),yes)
> > ++
> > + headers := crypt.h
> > +
> > + extra-libs := libcrypt
> > +@@ -52,9 +54,11 @@ tests += md5test sha256test sha512test
> > + # machine over a minute.
> > + xtests = md5test-giant
> > + endif
> > ++endif
> > +
> > + include ../Rules
> > +
> > ++ifeq ($(build-obsolete-crypt),yes)
> > + ifneq ($(nss-crypt),yes)
> > + md5-routines := md5 $(filter md5%,$(libcrypt-sysdep_routines))
> > + sha256-routines := sha256 $(filter sha256%,$(libcrypt-sysdep_routines))
> > +@@ -71,3 +75,4 @@ $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.so
> > + else
> > + $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.a
> > + endif
> > ++endif
> > +diff --git a/elf/Makefile b/elf/Makefile
> > +index 2a432d8bee..366f7b80ec 100644
> > +--- a/elf/Makefile
> > ++++ b/elf/Makefile
> > +@@ -385,15 +385,19 @@ $(objpfx)tst-_dl_addr_inside_object:
> > $(objpfx)dl-addr-obj.os
> > + CFLAGS-tst-_dl_addr_inside_object.c += $(PIE-ccflag)
> > + endif
> > +
> > +-# By default tst-linkall-static should try to use crypt routines to
> test
> > +-# static libcrypt use.
> > +-CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=1
> > ++ifeq ($(build-obsolete-crypt),yes)
> > ++# If the libcrypt library is being built, tst-linkall-static should
> > ++# try to use crypt routines to test static libcrypt use.
> > ++CFLAGS-tst-linkall-static.c = -DUSE_CRYPT=1
> > + # However, if we are using NSS crypto and we don't have a static
> > + # library, then we exclude the use of crypt functions in the test.
> > + # We similarly exclude libcrypt.a from the static link (see below).
> > + ifeq (yesno,$(nss-crypt)$(static-nss-crypt))
> > + CFLAGS-tst-linkall-static.c += -UUSE_CRYPT -DUSE_CRYPT=0
> > + endif
> > ++else
> > ++CFLAGS-tst-linkall-static.c = -DUSE_CRYPT=0
> > ++endif
> > +
> > + include ../Rules
> > +
> > +@@ -1113,8 +1117,10 @@ localplt-built-dso := $(addprefix
> > $(common-objpfx),\
> > + rt/librt.so \
> > + dlfcn/libdl.so \
> > + resolv/libresolv.so \
> > +- crypt/libcrypt.so \
> > + )
> > ++ifeq ($(build-obsolete-crypt),yes)
> > ++localplt-built-dso += $(addprefix $(common-objpfx), crypt/libcrypt.so)
> > ++endif
> > + ifeq ($(build-mathvec),yes)
> > + localplt-built-dso += $(addprefix $(common-objpfx), mathvec/libmvec.so)
> > + endif
> > +@@ -1395,6 +1401,7 @@ $(objpfx)tst-linkall-static: \
> > + $(common-objpfx)resolv/libanl.a \
> > + $(static-thread-library)
> > +
> > ++ifeq ($(build-obsolete-crypt),yes)
> > + # If we are using NSS crypto and we have the ability to link statically
> > + # then we include libcrypt.a, otherwise we leave out libcrypt.a and
> > + # link as much as we can into the tst-linkall-static test. This
> assumes
> > +@@ -1410,6 +1417,7 @@ ifeq (no,$(nss-crypt))
> > + $(objpfx)tst-linkall-static: \
> > + $(common-objpfx)crypt/libcrypt.a
> > + endif
> > ++endif
> > +
> > + # The application depends on the DSO, and the DSO loads the plugin.
> > + # The plugin also depends on the DSO. This creates the circular
> > +diff --git a/elf/tst-linkall-static.c b/elf/tst-linkall-static.c
> > +index e8df38f74e..0ffae7c723 100644
> > +--- a/elf/tst-linkall-static.c
> > ++++ b/elf/tst-linkall-static.c
> > +@@ -18,7 +18,9 @@
> > +
> > + #include <math.h>
> > + #include <pthread.h>
> > ++#if USE_CRYPT
> > + #include <crypt.h>
> > ++#endif
> > + #include <resolv.h>
> > + #include <dlfcn.h>
> > + #include <utmp.h>
> > +diff --git a/posix/unistd.h b/posix/unistd.h
> > +index 4d149f9945..e75ce4d4ec 100644
> > +--- a/posix/unistd.h
> > ++++ b/posix/unistd.h
> > +@@ -107,9 +107,6 @@ __BEGIN_DECLS
> > + /* The X/Open Unix extensions are available. */
> > + #define _XOPEN_UNIX 1
> > +
> > +-/* Encryption is present. */
> > +-#define _XOPEN_CRYPT 1
> > +-
> > + /* The enhanced internationalization capabilities according to XPG4.2
> > + are present. */
> > + #define _XOPEN_ENH_I18N 1
> > +@@ -1118,20 +1115,7 @@ ssize_t copy_file_range (int __infd, __off64_t
> > *__pinoff,
> > + extern int fdatasync (int __fildes);
> > + #endif /* Use POSIX199309 */
> > +
> > +-
> > +-/* XPG4.2 specifies that prototypes for the encryption functions must
> > +- be defined here. */
> > + #ifdef __USE_XOPEN
> > +-/* Encrypt at most 8 characters from KEY using salt to perturb DES. */
> > +-extern char *crypt (const char *__key, const char *__salt)
> > +- __THROW __nonnull ((1, 2));
> > +-
> > +-/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
> > +- block in place. */
> > +-extern void encrypt (char *__glibc_block, int __edflag)
> > +- __THROW __nonnull ((1));
> > +-
> > +-
> > + /* Swab pairs bytes in the first N bytes of the area pointed to by
> > + FROM and copy the result to TO. The value of TO must not be in the
> > + range [FROM - N + 1, FROM - 1]. If N is odd the first byte in FROM
> > +diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
> > +index 6b1ead31e0..8e23e93557 100644
> > +--- a/stdlib/stdlib.h
> > ++++ b/stdlib/stdlib.h
> > +@@ -958,12 +958,6 @@ extern int getsubopt (char **__restrict __optionp,
> > + #endif
> > +
> > +
> > +-#ifdef __USE_XOPEN
> > +-/* Setup DES tables according KEY. */
> > +-extern void setkey (const char *__key) __THROW __nonnull ((1));
> > +-#endif
> > +-
> > +-
> > + /* X/Open pseudo terminal handling. */
> > +
> > + #ifdef __USE_XOPEN2KXSI
> > +diff --git a/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> > b/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> > +index a6d08f3a00..d8b8297fb0 100644
> > +--- a/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> > ++++ b/sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
> > +@@ -1,6 +1,8 @@
> > + ifeq ($(subdir),crypt)
> > ++ifeq ($(build-obsolete-crypt),yes)
> > + libcrypt-sysdep_routines += md5-crop sha256-crop sha512-crop
> > + endif
> > ++endif
> > +
> > + ifeq ($(subdir),locale)
> > + localedef-aux += md5-crop
> > +diff --git a/sysdeps/sparc/sparc64/multiarch/Makefile
> > b/sysdeps/sparc/sparc64/multiarch/Makefile
> > +index eaf758e7aa..0198f9886f 100644
> > +--- a/sysdeps/sparc/sparc64/multiarch/Makefile
> > ++++ b/sysdeps/sparc/sparc64/multiarch/Makefile
> > +@@ -1,6 +1,8 @@
> > + ifeq ($(subdir),crypt)
> > ++ifeq ($(build-obsolete-crypt),yes)
> > + libcrypt-sysdep_routines += md5-crop sha256-crop sha512-crop
> > + endif
> > ++endif
> > +
> > + ifeq ($(subdir),locale)
> > + localedef-aux += md5-crop
> > +diff --git a/sysdeps/unix/sysv/linux/arm/Makefile
> > b/sysdeps/unix/sysv/linux/arm/Makefile
> > +index 4adc35de04..6cab4f3a31 100644
> > +--- a/sysdeps/unix/sysv/linux/arm/Makefile
> > ++++ b/sysdeps/unix/sysv/linux/arm/Makefile
> > +@@ -19,8 +19,10 @@ endif
> > + # Add a syscall function to each library that needs one.
> > +
> > + ifeq ($(subdir),crypt)
> > ++ifeq ($(build-obsolete-crypt),yes)
> > + libcrypt-sysdep_routines += libc-do-syscall
> > + endif
> > ++endif
> > +
> > + ifeq ($(subdir),rt)
> > + librt-sysdep_routines += libc-do-syscall
> > +--
> > +2.16.0
> > +
> > diff --git a/meta/recipes-core/glibc/glibc_2.27.bb
> > b/meta/recipes-core/glibc/glibc_2.27.bb
> > index 772351a..c814798 100644
> > --- a/meta/recipes-core/glibc/glibc_2.27.bb
> > +++ b/meta/recipes-core/glibc/glibc_2.27.bb
> > @@ -54,6 +54,7 @@ NATIVESDKFIXES_class-nativesdk = "\
> >
> file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
> > \
> >
> file://0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
> > \
> > file://relocate-locales.patch \
> > + file://0031-nativesdk-deprecate-libcrypt.patch \
> > "
> >
> > S = "${WORKDIR}/git"
> > diff --git a/meta/recipes-core/glibc/site_config/headers
> > b/meta/recipes-core/glibc/site_config/headers
> > index 609ab53..69fedea 100644
> > --- a/meta/recipes-core/glibc/site_config/headers
> > +++ b/meta/recipes-core/glibc/site_config/headers
> > @@ -9,7 +9,6 @@ asm/page.h
> > asm/types.h
> > assert.h
> > byteswap.h
> > -crypt.h
> > ctype.h
> > dirent.h
> > dlfcn.h
> > diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> > b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> > new file mode 100644
> > index 0000000..b1982c1
> > --- /dev/null
> > +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> > @@ -0,0 +1,31 @@
> > +SUMMARY = "Extended cryptographic library (from glibc)"
> > +DESCRIPTION = "Forked code from glibc libary to extract only crypto
> part."
> > +HOMEPAGE = "https://github.com/besser82/libxcrypt"
> > +SECTION = "libs"
> > +LICENSE = "LGPLv2.1"
> > +LIC_FILES_CHKSUM ?=
> "file://LICENSING;md5=d1cc18f512ded3bd6000f3729f31be08
> > \
> > + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> > +"
> > +
> > +inherit autotools
> > +
> > +SRCREV ?= "215b32aa4e0b255c3356a96bd6d257661bad73ca"
> > +SRCBRANCH ?= "master"
> > +
> > +SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}
> <http://github.com/besser82/libxcrypt.git;branch=$%7BSRCBRANCH%7D>"
> > +
> > +PROVIDES = "virtual/crypt"
> > +
> > +FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so
> > ${libdir}/libowcrypt*.so.* ${libdir}/libowcrypt-*.so"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
> > +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
> > +
> > +python () {
> > + if not bb.data.inherits_class('nativesdk', d):
> > + raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case
> > for now")
> > +}
> > +
> > +BBCLASSEXTEND = "nativesdk"
> > diff --git a/meta/recipes-core/meta/uninative-tarball.bb
> > b/meta/recipes-core/meta/uninative-tarball.bb
> > index 5fabf7f..38c3a31 100644
> > --- a/meta/recipes-core/meta/uninative-tarball.bb
> > +++ b/meta/recipes-core/meta/uninative-tarball.bb
> > @@ -13,6 +13,7 @@ TOOLCHAIN_HOST_TASK = "\
> > nativesdk-glibc-gconv-utf-16 \
> > nativesdk-glibc-gconv-cp1252 \
> > nativesdk-patchelf \
> > + nativesdk-libxcrypt \
> > "
> >
> > INHIBIT_DEFAULT_DEPS = "1"
> > diff --git a/meta/recipes-core/musl/musl_git.bb
> b/meta/recipes-core/musl/
> > musl_git.bb
> > index 8906ac6..9f8c512 100644
> > --- a/meta/recipes-core/musl/musl_git.bb
> > +++ b/meta/recipes-core/musl/musl_git.bb
> > @@ -15,7 +15,7 @@ SRC_URI = "git://git.musl-libc.org/musl \
> >
> > S = "${WORKDIR}/git"
> >
> > -PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc
> > virtual/libiconv virtual/libintl"
> > +PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc
> > virtual/libiconv virtual/libintl virtual/crypt"
> >
> > DEPENDS = "virtual/${TARGET_PREFIX}binutils \
> > virtual/${TARGET_PREFIX}gcc-initial \
> > diff --git a/meta/recipes-core/util-linux/util-linux.inc
> > b/meta/recipes-core/util-linux/util-linux.inc
> > index 5e40b20..157416d 100644
> > --- a/meta/recipes-core/util-linux/util-linux.inc
> > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > @@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=
> > 1715f5ee3e01203ca1e1e0b9ee65918c
> >
> > #gtk-doc is not enabled as it requires xmlto which requires util-linux
> > inherit autotools gettext pkgconfig systemd update-alternatives
> > python3-dir bash-completion ptest
> > -DEPENDS = "zlib ncurses"
> > +DEPENDS = "zlib ncurses virtual/crypt"
> > DEPENDS_append_class-native = " lzo-native"
> > DEPENDS_append_class-nativesdk = " lzo-native"
> >
> > diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb
> > b/meta/recipes-devtools/perl/perl_5.24.1.bb
> > index 66ccd7f..222dd88 100644
> > --- a/meta/recipes-devtools/perl/perl_5.24.1.bb
> > +++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
> > @@ -1,7 +1,7 @@
> > require perl.inc
> >
> > # We need gnugrep (for -I)
> > -DEPENDS = "db grep-native gdbm zlib"
> > +DEPENDS = "db grep-native gdbm zlib virtual/crypt"
> >
> > # Pick up patches from debian
> > # http://ftp.de.debian.org/debian/pool/main/p/perl/perl_
> > 5.22.0-1.debian.tar.xz
> > diff --git a/meta/recipes-extended/shadow/shadow.inc
> > b/meta/recipes-extended/shadow/shadow.inc
> > index 48a3be8..673207f 100644
> > --- a/meta/recipes-extended/shadow/shadow.inc
> > +++ b/meta/recipes-extended/shadow/shadow.inc
> > @@ -6,8 +6,7 @@ LICENSE = "BSD | Artistic-1.0"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5
> \
> > file://src/passwd.c;beginline=8;endline=30;md5=
> > d83888ea14ae61951982d77125947661"
> >
> > -DEPENDS_class-native = ""
> > -DEPENDS_class-nativesdk = ""
> > +DEPENDS = "virtual/crypt"
> >
> > SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${
> > PV}.tar.xz \
> > file://shadow-4.1.3-dots-in-usernames.patch \
> >
> > --
> > To stop receiving notification emails like this one, please contact
> > the administrator of this repository.
> > --
> > _______________________________________________
> > Openembedded-commits mailing list
> > Openembedded-commits@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-commits
> >
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS
2018-04-08 17:00 ` [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead Martin Jansa
2018-04-08 22:06 ` Richard Purdie
2018-04-09 0:52 ` Khem Raj
@ 2018-04-09 7:51 ` Martin Jansa
2018-04-09 21:59 ` Khem Raj
2 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2018-04-09 7:51 UTC (permalink / raw)
To: openembedded-core
* add it to allow older distributions e.g. Ubuntu 14.04 with gcc 4.8
to build this, otherwise it fails with:
../git/gen-des-tables.c: In function 'write_table_u8':
../git/gen-des-tables.c:307:3: error: 'for' loop initial declarations are only allowed in C99 mode
for (size_t i = 0; i < m; i++)
^
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
index b1982c1991..a1be4be7ef 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
@@ -20,7 +20,7 @@ FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so ${libdir}/libowc
S = "${WORKDIR}/git"
-BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
python () {
--
2.15.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS
2018-04-09 7:51 ` [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS Martin Jansa
@ 2018-04-09 21:59 ` Khem Raj
2018-04-09 22:03 ` Martin Jansa
0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2018-04-09 21:59 UTC (permalink / raw)
To: Martin Jansa, openembedded-core
On 4/9/18 12:51 AM, Martin Jansa wrote:
> * add it to allow older distributions e.g. Ubuntu 14.04 with gcc 4.8
> to build this, otherwise it fails with:
> ../git/gen-des-tables.c: In function 'write_table_u8':
> ../git/gen-des-tables.c:307:3: error: 'for' loop initial declarations are only allowed in C99 mode
> for (size_t i = 0; i < m; i++)
> ^
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> index b1982c1991..a1be4be7ef 100644
> --- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> @@ -20,7 +20,7 @@ FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so ${libdir}/libowc
>
> S = "${WORKDIR}/git"
>
> -BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
> +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
This might change behaviour with gcc5+ e.g. where default is gnu11
in anycase, I think if we could limit this to native version can limit
the impact.
> TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
>
> python () {
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS
2018-04-09 21:59 ` Khem Raj
@ 2018-04-09 22:03 ` Martin Jansa
0 siblings, 0 replies; 11+ messages in thread
From: Martin Jansa @ 2018-04-09 22:03 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]
The anonymous python bellow this chunk limits this whole recipe only
for nativesdk (I don't know why it uses BBCLASSEXTEND + anonymous python
instead of just inheritting nativesdk directly from nativesdk-libxcrypt
recipe to make it more obvious ...).
On Mon, Apr 9, 2018 at 11:59 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On 4/9/18 12:51 AM, Martin Jansa wrote:
> > * add it to allow older distributions e.g. Ubuntu 14.04 with gcc 4.8
> > to build this, otherwise it fails with:
> > ../git/gen-des-tables.c: In function 'write_table_u8':
> > ../git/gen-des-tables.c:307:3: error: 'for' loop initial declarations
> are only allowed in C99 mode
> > for (size_t i = 0; i < m; i++)
> > ^
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> > index b1982c1991..a1be4be7ef 100644
> > --- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> > +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
> > @@ -20,7 +20,7 @@ FILES_${PN} = "${libdir}/libcrypt*.so.*
> ${libdir}/libcrypt-*.so ${libdir}/libowc
> >
> > S = "${WORKDIR}/git"
> >
> > -BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
> > +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
>
> This might change behaviour with gcc5+ e.g. where default is gnu11
> in anycase, I think if we could limit this to native version can limit
> the impact.
>
> > TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
> >
> > python () {
> >
>
>
[-- Attachment #2: Type: text/html, Size: 2725 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-09 0:52 ` Khem Raj
@ 2018-04-09 22:23 ` Andre McCurdy
2018-04-09 22:31 ` Khem Raj
2018-04-09 22:40 ` Martin Jansa
0 siblings, 2 replies; 11+ messages in thread
From: Andre McCurdy @ 2018-04-09 22:23 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-commits, openembedded-devel
On Sun, Apr 8, 2018 at 5:52 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Sun, Apr 8, 2018 at 10:00 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> On Ubuntu 14.04 this fails with:
>>
>> ../git/gen-des-tables.c: In function ‘write_table_u8’:
>> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations are
>> only allowed in C99 mode
>> for (size_t i = 0; i < m; i++)
>> ^
>
> You can patch this to move declaration just above loop if that helps we
> should apply such a patch for compatibility sake but I wonder if there are
> more c99 assumptions at work here
It looks like the upstream intention is to be buildable with c99 + GNU
extensions, so explicitly setting -std=gnu99 seems reasonable.
https://github.com/besser82/libxcrypt#portability-notes
There even seems to be a configure check for it, so not sure why
Centos6 etc get through to a build failure?
https://github.com/besser82/libxcrypt/blob/develop/configure.ac#L33
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-09 22:23 ` Andre McCurdy
@ 2018-04-09 22:31 ` Khem Raj
2018-04-09 22:45 ` Andre McCurdy
2018-04-09 22:40 ` Martin Jansa
1 sibling, 1 reply; 11+ messages in thread
From: Khem Raj @ 2018-04-09 22:31 UTC (permalink / raw)
To: Andre McCurdy; +Cc: openembedded-commits, openembedded-devel
On 4/9/18 3:23 PM, Andre McCurdy wrote:
> On Sun, Apr 8, 2018 at 5:52 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> On Sun, Apr 8, 2018 at 10:00 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>>> On Ubuntu 14.04 this fails with:
>>>
>>> ../git/gen-des-tables.c: In function ‘write_table_u8’:
>>> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations are
>>> only allowed in C99 mode
>>> for (size_t i = 0; i < m; i++)
>>> ^
>>
>> You can patch this to move declaration just above loop if that helps we
>> should apply such a patch for compatibility sake but I wonder if there are
>> more c99 assumptions at work here
>
> It looks like the upstream intention is to be buildable with c99 + GNU
> extensions, so explicitly setting -std=gnu99 seems reasonable.
see this statement worries me from same document you quote below.
A few C2011 features are used; the intention is not to use any of them
without a fallback, but we do not currently test this.
>
> https://github.com/besser82/libxcrypt#portability-notes
>
> There even seems to be a configure check for it, so not sure why
> Centos6 etc get through to a build failure?
>
> https://github.com/besser82/libxcrypt/blob/develop/configure.ac#L33
>
thats not checking the defaults, its checking if c99 is supported or not
and that is true for a lot of older compilers.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-09 22:23 ` Andre McCurdy
2018-04-09 22:31 ` Khem Raj
@ 2018-04-09 22:40 ` Martin Jansa
1 sibling, 0 replies; 11+ messages in thread
From: Martin Jansa @ 2018-04-09 22:40 UTC (permalink / raw)
To: Andre McCurdy; +Cc: openembedded-commits, openembedded-devel
ac_prog_cc_stdc on Ubuntu 14.04 where it was failing for me evaluates to c11
On Tue, Apr 10, 2018 at 12:23 AM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Sun, Apr 8, 2018 at 5:52 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On Sun, Apr 8, 2018 at 10:00 AM Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >
> >> On Ubuntu 14.04 this fails with:
> >>
> >> ../git/gen-des-tables.c: In function ‘write_table_u8’:
> >> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations
> are
> >> only allowed in C99 mode
> >> for (size_t i = 0; i < m; i++)
> >> ^
> >
> > You can patch this to move declaration just above loop if that helps we
> > should apply such a patch for compatibility sake but I wonder if there
> are
> > more c99 assumptions at work here
>
> It looks like the upstream intention is to be buildable with c99 + GNU
> extensions, so explicitly setting -std=gnu99 seems reasonable.
>
> https://github.com/besser82/libxcrypt#portability-notes
>
> There even seems to be a configure check for it, so not sure why
> Centos6 etc get through to a build failure?
>
> https://github.com/besser82/libxcrypt/blob/develop/configure.ac#L33
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-09 22:31 ` Khem Raj
@ 2018-04-09 22:45 ` Andre McCurdy
2018-04-09 23:08 ` Khem Raj
0 siblings, 1 reply; 11+ messages in thread
From: Andre McCurdy @ 2018-04-09 22:45 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-commits, openembedded-devel
On Mon, Apr 9, 2018 at 3:31 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On 4/9/18 3:23 PM, Andre McCurdy wrote:
>> On Sun, Apr 8, 2018 at 5:52 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>> On Sun, Apr 8, 2018 at 10:00 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>>>
>>>> On Ubuntu 14.04 this fails with:
>>>>
>>>> ../git/gen-des-tables.c: In function ‘write_table_u8’:
>>>> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations are
>>>> only allowed in C99 mode
>>>> for (size_t i = 0; i < m; i++)
>>>> ^
>>>
>>> You can patch this to move declaration just above loop if that helps we
>>> should apply such a patch for compatibility sake but I wonder if there are
>>> more c99 assumptions at work here
>>
>> It looks like the upstream intention is to be buildable with c99 + GNU
>> extensions, so explicitly setting -std=gnu99 seems reasonable.
>
> see this statement worries me from same document you quote below.
>
> A few C2011 features are used; the intention is not to use any of them
> without a fallback, but we do not currently test this.
If you don't trust the untested fallbacks, then how about explicitly
setting -std=gnu11 ?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead
2018-04-09 22:45 ` Andre McCurdy
@ 2018-04-09 23:08 ` Khem Raj
0 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2018-04-09 23:08 UTC (permalink / raw)
To: Andre McCurdy; +Cc: openembedded-devel, openembedded-commits
On Mon, Apr 9, 2018 at 3:45 PM Andre McCurdy <armccurdy@gmail.com> wrote:
> On Mon, Apr 9, 2018 at 3:31 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On 4/9/18 3:23 PM, Andre McCurdy wrote:
> >> On Sun, Apr 8, 2018 at 5:52 PM, Khem Raj <raj.khem@gmail.com> wrote:
> >>> On Sun, Apr 8, 2018 at 10:00 AM Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >>>
> >>>> On Ubuntu 14.04 this fails with:
> >>>>
> >>>> ../git/gen-des-tables.c: In function ‘write_table_u8’:
> >>>> ../git/gen-des-tables.c:307:3: error: ‘for’ loop initial declarations
> are
> >>>> only allowed in C99 mode
> >>>> for (size_t i = 0; i < m; i++)
> >>>> ^
> >>>
> >>> You can patch this to move declaration just above loop if that helps we
> >>> should apply such a patch for compatibility sake but I wonder if there
> are
> >>> more c99 assumptions at work here
> >>
> >> It looks like the upstream intention is to be buildable with c99 + GNU
> >> extensions, so explicitly setting -std=gnu99 seems reasonable.
> >
> > see this statement worries me from same document you quote below.
> >
> > A few C2011 features are used; the intention is not to use any of them
> > without a fallback, but we do not currently test this.
>
> If you don't trust the untested fallbacks, then how about explicitly
> setting -std=gnu11 ?
That’s probably better
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-04-09 23:08 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <152313690992.11940.6799878390820377002@git.openembedded.org>
[not found] ` <20180407213510.474412329D5@git.openembedded.org>
2018-04-08 17:00 ` [oe-commits] [openembedded-core] 02/02: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead Martin Jansa
2018-04-08 22:06 ` Richard Purdie
2018-04-09 0:52 ` Khem Raj
2018-04-09 22:23 ` Andre McCurdy
2018-04-09 22:31 ` Khem Raj
2018-04-09 22:45 ` Andre McCurdy
2018-04-09 23:08 ` Khem Raj
2018-04-09 22:40 ` Martin Jansa
2018-04-09 7:51 ` [PATCH] libxcrypt: add -std=gnu99 to BUILD_CPPFLAGS Martin Jansa
2018-04-09 21:59 ` Khem Raj
2018-04-09 22:03 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.