[Buildroot] [PATCH 03/10] sysvinit: add patch for libcrypt
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Sun Sep 8 16:31:07 UTC 2013
Dear Ryan Barnett,
On Thu, 5 Sep 2013 20:04:17 -0500, Ryan Barnett wrote:
> Adding a patch to sysvinit to correcctly add libcrypt as a build
> dependancy of sysvinit.
I believe this commit log should carry a bit more details as to what it
is fixing compared to what commit
f5e3178197ff17b9f4a4c2ecb6d32b72a38a1246 did.
>
> Signed-off-by: Ryan Barnett <rjbarnet at rockwellcollins.com>
> ---
> .../sysvinit-0001-libcrypt_check_fix.patch | 13 +++++++++++++
> package/sysvinit/sysvinit.mk | 2 +-
> 2 files changed, 14 insertions(+), 1 deletions(-)
> create mode 100644 package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch
>
> diff --git a/package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch b/package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch
> new file mode 100644
> index 0000000..f6f54e5
> --- /dev/null
> +++ b/package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch
All patches should have a description + Signed-off-by. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.
> @@ -0,0 +1,13 @@
> +--- a/src/Makefile 2010-04-11 04:30:27.000000000 -0500
> ++++ b/src/Makefile 2012-09-05 12:44:45.000000000 -0500
> +@@ -78,8 +78,8 @@
> + endif
> +
> + # Additional libs for GNU libc.
> +-ifneq ($(wildcard /usr/lib*/libcrypt.a),)
> +- SULOGINLIBS += -lcrypt
> ++ifneq ($(LCRYPT),)
> ++ SULOGINLIBS += $(LCRYPT)
> + endif
> +
> + all: $(BIN) $(SBIN) $(USRBIN)
> diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
> index c6b75a0..7678bce 100644
> --- a/package/sysvinit/sysvinit.mk
> +++ b/package/sysvinit/sysvinit.mk
> @@ -31,7 +31,7 @@ SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES
> define SYSVINIT_BUILD_CMDS
> # Force sysvinit to link against libcrypt as it otherwise
> # use an incorrect test to see if it's available
> - $(MAKE) $(TARGET_CONFIGURE_OPTS) SULOGINLIBS="-lcrypt" -C $(@D)/src
> + $(MAKE) $(TARGET_CONFIGURE_OPTS) LCRYPT="-lcrypt" -C $(@D)/src
> endef
>
> define SYSVINIT_INSTALL_TARGET_CMDS
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
More information about the buildroot
mailing list