Skip to contentSkip to conversation

fix building against musl and uClibc libc libraries.

PATCH Superseded [email protected] 3 participants 6 messages Apr 7, 2020 – Apr 10, 2020 SELinux security module

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 libselinux/utils/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/utils/Makefile +1 -1
index 36150638..a5632b7c 100644
@@ -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.1
Acked-by on v1 1/1
#1 lore raw
Quoted 32 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: Tuesday, April 7, 2020 1:43 PM
To: [email protected]
Cc: Adam Duskett <[email protected]>
Subject: [PATCH 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.

---
 libselinux/utils/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/utils/Makefile index renamed from libselinux/utils/Makefile +0 -0

36150638..a5632b7c 100644

libselinux/utils/Makefile +0 -0
@@ -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

Quoted 3 lines

ifeq ($(ANDROID_HOST),y)
--
2.25.1

If you want me to use the PR you have open, force push your branch to update the commit message. Else I'll have to create a new-pr and close your old one.

Your open PR is here:
https://github.com/SELinuxProject/selinux/pull/193

Something like:
git pull --rebase origin master
git push aduskett HEAD:fix-musl-and-uclibc-builds

would be ideal.

#2 lore raw

I did that just now!

Quoted 50 lines · William C
Quoted 33 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: Tuesday, April 7, 2020 1:43 PM
To: [email protected]
Cc: Adam Duskett <[email protected]>
Subject: [PATCH 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.

---
 libselinux/utils/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/utils/Makefile index renamed from libselinux/utils/Makefile +0 -0

36150638..a5632b7c 100644

libselinux/utils/Makefile +0 -0
@@ -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

Quoted 3 lines

ifeq ($(ANDROID_HOST),y)
--
2.25.1

If you want me to use the PR you have open, force push your branch to update the commit message. Else I'll have to create a new-pr and close your old one.

Your open PR is here:
https://github.com/SELinuxProject/selinux/pull/193

Something like:
git pull --rebase origin master
git push aduskett HEAD:fix-musl-and-uclibc-builds

would be ideal.

#3 lore raw

I just ended up making a new branch that has the latest updated commits and a new PR with an SOB line.

https://github.com/SELinuxProject/selinux/pull/218

Quoted 55 lines · Adam Duskett

I did that just now!

Quoted 50 lines · William C
Quoted 33 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: Tuesday, April 7, 2020 1:43 PM
To: [email protected]
Cc: Adam Duskett <[email protected]>
Subject: [PATCH 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.

---
 libselinux/utils/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/utils/Makefile index renamed from libselinux/utils/Makefile +0 -0

36150638..a5632b7c 100644

libselinux/utils/Makefile +0 -0
@@ -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

Quoted 3 lines

ifeq ($(ANDROID_HOST),y)
--
2.25.1

If you want me to use the PR you have open, force push your branch to update the commit message. Else I'll have to create a new-pr and close your old one.

Your open PR is here:
https://github.com/SELinuxProject/selinux/pull/193

Something like:
git pull --rebase origin master
git push aduskett HEAD:fix-musl-and-uclibc-builds

would be ideal.

#4 lore raw
Quoted 5 lines · Adam Duskett

I just ended up making a new branch that has the latest updated commits and a new PR with an SOB line.

https://github.com/SELinuxProject/selinux/pull/218

Top posting on this list is frowned upon, I will merge this after the obligatory waiting period to allow others to comment.
I think its 48 hours... I could be wrong. If we documented that, I didn't find it.

Thanks for playing along and resubmitting. Now you get all the accolades and glory that come along with contributing to SE Linux.

Don't be surprised if people come up to you while you're eating dinner asking for autographs :-P.

Quoted 57 lines · Adam Duskett
Quoted 55 lines

I did that just now!

Quoted 50 lines · William C
Quoted 33 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: Tuesday, April 7, 2020 1:43 PM
To: [email protected]
Cc: Adam Duskett <[email protected]>
Subject: [PATCH 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.

---
 libselinux/utils/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/utils/Makefile index renamed from libselinux/utils/Makefile +0 -0

36150638..a5632b7c 100644

libselinux/utils/Makefile +0 -0
@@ -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

Quoted 3 lines

ifeq ($(ANDROID_HOST),y)
--
2.25.1

If you want me to use the PR you have open, force push your branch to update the commit message. Else I'll have to create a new-pr and close your old one.

Your open PR is here:
https://github.com/SELinuxProject/selinux/pull/193

Something like:
git pull --rebase origin master
git push aduskett HEAD:fix-musl-and-uclibc-builds

would be ideal.