NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b7f6ad9f5b
kumquat-buildroot/package/sysvinit/0001-fix-libcrypt-test.patch

21 lines
619 B
Diff
Raw Normal View History

sysvinit: added libselinux dependency [Thomas: - remove the patch from Matthew Weber that did a lot of changes that were not needed: the CFLAGS would not get overridden by Buildroot ones if the Buildroot TARGET_CONFIGURE_OPTS is passed on the left hand-side of make, and the SULOGINLIBS hack needs to be replaced by a proper handling of the libcrypt detection. - added a patch that changes the libcrypt detection logic to accept a SYSROOT variable. Instead of search for /usr/lib/libcrypt.a, it search for $(SYSROOT)/usr/lib/libcrypt.a. This avoids the need for overriding SULOGINLIBS. - don't modify TARGET_CONFIGURE_OPTS in sysvinit.mk, this is completely forbidden and broken. - don't pass ROOT= since we don't use 'make install' anyway.] Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-14 22:20:20 +02:00
Make the libcrypt test somewhat cross-compilation compliant
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/src/Makefile
===================================================================
--- a/src/Makefile
+++ b/src/Makefile
sysvinit: arm64 build fix sysvinit was not able to be built for arm64 architectures. The package patch was changed according to the suggestion of Thomas Petazzoni. Signed-off-by: Joao Pinto <jpinto@synopsys.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-16 16:21:38 +01:00
@@ -78,8 +78,9 @@ else
sysvinit: added libselinux dependency [Thomas: - remove the patch from Matthew Weber that did a lot of changes that were not needed: the CFLAGS would not get overridden by Buildroot ones if the Buildroot TARGET_CONFIGURE_OPTS is passed on the left hand-side of make, and the SULOGINLIBS hack needs to be replaced by a proper handling of the libcrypt detection. - added a patch that changes the libcrypt detection logic to accept a SYSROOT variable. Instead of search for /usr/lib/libcrypt.a, it search for $(SYSROOT)/usr/lib/libcrypt.a. This avoids the need for overriding SULOGINLIBS. - don't modify TARGET_CONFIGURE_OPTS in sysvinit.mk, this is completely forbidden and broken. - don't pass ROOT= since we don't use 'make install' anyway.] Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-14 22:20:20 +02:00
endif
# Additional libs for GNU libc.
-ifneq ($(wildcard /usr/lib*/libcrypt.a),)
sysvinit: arm64 build fix sysvinit was not able to be built for arm64 architectures. The package patch was changed according to the suggestion of Thomas Petazzoni. Signed-off-by: Joao Pinto <jpinto@synopsys.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-16 16:21:38 +01:00
- SULOGINLIBS += -lcrypt
+HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes; rm -f $$f)
+ifeq ($(HAS_LIBCRYPT),yes)
+ SULOGINLIBS += -lcrypt
sysvinit: added libselinux dependency [Thomas: - remove the patch from Matthew Weber that did a lot of changes that were not needed: the CFLAGS would not get overridden by Buildroot ones if the Buildroot TARGET_CONFIGURE_OPTS is passed on the left hand-side of make, and the SULOGINLIBS hack needs to be replaced by a proper handling of the libcrypt detection. - added a patch that changes the libcrypt detection logic to accept a SYSROOT variable. Instead of search for /usr/lib/libcrypt.a, it search for $(SYSROOT)/usr/lib/libcrypt.a. This avoids the need for overriding SULOGINLIBS. - don't modify TARGET_CONFIGURE_OPTS in sysvinit.mk, this is completely forbidden and broken. - don't pass ROOT= since we don't use 'make install' anyway.] Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-14 22:20:20 +02:00
endif
sysvinit: arm64 build fix sysvinit was not able to be built for arm64 architectures. The package patch was changed according to the suggestion of Thomas Petazzoni. Signed-off-by: Joao Pinto <jpinto@synopsys.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-16 16:21:38 +01:00
all: $(BIN) $(SBIN) $(USRBIN)
Reference in New Issue Copy Permalink