Remove support for static and pam combined - too problematic.
This commit is contained in:
parent
aa1129a71d
commit
3d163f4548
5
README
5
README
@ -12,12 +12,11 @@ BIN_LDFLAGS=-static
|
||||
LIB=lib64
|
||||
DESTDIR=/tmp/openrc-image
|
||||
PAM=pam
|
||||
PAM=pam-dynamic
|
||||
TERMCAP=ncurses
|
||||
TERMCAP=termcap
|
||||
|
||||
If you want to build static binaries and use PAM and your PAM implementation
|
||||
does not have a static pam library and you should use PAM=pam-dynamic.
|
||||
We don't support building a static OpenRC with PAM.
|
||||
You may need to use BIN_LDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
|
||||
|
||||
You can also brand OpenRC if you so wish like so
|
||||
BRANDING=\"Gentoo/$(uname -s)\"
|
||||
|
@ -91,8 +91,8 @@ LDFLAGS += -Wl,-rpath .
|
||||
TOPDIR = ..
|
||||
include $(TOPDIR)/default.mk
|
||||
include Makefile.$(TERMCAP)
|
||||
include Makefile.$(PAM)
|
||||
include Makefile.$(OS)
|
||||
include Makefile.$(PAM)
|
||||
|
||||
all: .depend $(TARGET)
|
||||
|
||||
@ -127,8 +127,7 @@ $(LIBRCSO): rc.map $(LIBRCOBJS)
|
||||
$(RCOBJS):
|
||||
$(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $<
|
||||
rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS)
|
||||
$(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc \
|
||||
$(RCOBJS) $(LDLIBS_LIBRC) $(LDLIBS_RC)
|
||||
$(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc $(RCOBJS) $(LDLIBS_RC)
|
||||
|
||||
$(ALL_LINKS): rc
|
||||
ln -sf rc $@
|
||||
|
@ -1 +1,2 @@
|
||||
LDLIBS_LIBRC += -lkvm
|
||||
LDLIBS_RC += -lkvm
|
||||
|
@ -1,2 +1,2 @@
|
||||
LDLIBS_RC += -ldl
|
||||
LDLIBS_RC += -Wl,-Bdynamic -ldl
|
||||
CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=500
|
||||
|
@ -1,4 +1,2 @@
|
||||
LIBTERMCAP ?= -lncurses
|
||||
CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP
|
||||
LDLIBS_LIBEINFO += $(LIBTERMCAP)
|
||||
LDLIBS_RC += $(LIBTERMCAP)
|
||||
LIBTERMCAP = -lncurses
|
||||
include Makefile.termcap
|
||||
|
@ -1,2 +0,0 @@
|
||||
CPPFLAGS_SSD = -DHAVE_PAM
|
||||
LDLIBS_RC += -Wl,-Bdynamic -lpam
|
@ -1,3 +1,4 @@
|
||||
LIBTERMCAP ?= -ltermcap
|
||||
CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP
|
||||
LDLIBS_LIBEINFO += $(LIBTERMCAP)
|
||||
LDLIBS_RC += $(LIBTERMCAP)
|
||||
|
Loading…
Reference in New Issue
Block a user