fix building against musl and uClibc libc libraries.
PATCH v2 1/1 fix building against musl and uClibc libc libraries.
From: Adam Duskett <[email protected]>
Currently, the src/Makefile provides the FTS_LDLIBS when building against musl or uClibc. However, this is missing from utils/Makefile, which causes linking to fail.
Add the FTS_LDLIBS variable to the LDLIBS variable in utils/Makefile to fix compiling against uClibc and musl.
---
Changes v1 -> v2:
- Updated the patch series to the latest master.
libselinux/utils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/utils/Makefile +1 -1
@@ -45,7 +45,7 @@ endif override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) override LDFLAGS += -L../src -override LDLIBS += -lselinux +override LDLIBS += -lselinux $(FTS_LDLIBS) PCRE_LDLIBS ?= -lpcre ifeq ($(ANDROID_HOST),y)
Signature · 1 line
2.25.2
Quoted 32 lines · On Tue, Apr 7, 2020 at 4:02 PM <[email protected]> wrote:
From: Adam Duskett <[email protected]>
Currently, the src/Makefile provides the
FTS_LDLIBSwhen building against musl or uClibc. However, this is missing from utils/Makefile, which causes linking to fail.Add the
FTS_LDLIBSvariable to the LDLIBS variable in utils/Makefile to fix compiling against uClibc and musl.Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Updated the patch series to the latest master.libselinux/utils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)libselinux/utils/Makefile +1
-2@@ -45,7 +45,7 @@ endif override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) override LDFLAGS += -L../src -override LDLIBS += -lselinux +override LDLIBS += -lselinux $(FTS_LDLIBS) PCRE_LDLIBS ?= -lpcre ifeq ($(ANDROID_HOST),y) --
Quoted 2 lines
2.25.2
I appreciate your thoroughness, but you don't really need to resend a patch rebased on top of master unless
their are merge conflicts.