emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for static and pam combined - too problematic.

Browse Source
This commit is contained in:
Roy Marples 2008-01-04 15:19:04 +00:00
parent aa1129a71d
commit 3d163f4548
7 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -12,12 +12,11 @@ BIN_LDFLAGS=-static
LIB=lib64 LIB=lib64
DESTDIR=/tmp/openrc-image DESTDIR=/tmp/openrc-image
PAM=pam PAM=pam
PAM=pam-dynamic
TERMCAP=ncurses TERMCAP=ncurses
TERMCAP=termcap TERMCAP=termcap
If you want to build static binaries and use PAM and your PAM implementation We don't support building a static OpenRC with PAM.
does not have a static pam library and you should use PAM=pam-dynamic. 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 You can also brand OpenRC if you so wish like so
BRANDING=\"Gentoo/$(uname -s)\" BRANDING=\"Gentoo/$(uname -s)\"

5
src/Makefile
View File

@ -91,8 +91,8 @@ LDFLAGS += -Wl,-rpath .
TOPDIR = .. TOPDIR = ..
include $(TOPDIR)/default.mk include $(TOPDIR)/default.mk
include Makefile.$(TERMCAP) include Makefile.$(TERMCAP)
include Makefile.$(PAM)
include Makefile.$(OS) include Makefile.$(OS)
include Makefile.$(PAM)
all: .depend $(TARGET) all: .depend $(TARGET)
@ -127,8 +127,7 @@ $(LIBRCSO): rc.map $(LIBRCOBJS)
$(RCOBJS): $(RCOBJS):
$(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $< $(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $<
rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS) rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS)
$(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc \ $(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc $(RCOBJS) $(LDLIBS_RC)
$(RCOBJS) $(LDLIBS_LIBRC) $(LDLIBS_RC)
$(ALL_LINKS): rc $(ALL_LINKS): rc
ln -sf rc $@ ln -sf rc $@

1
src/Makefile.BSD
View File

@ -1 +1,2 @@
LDLIBS_LIBRC += -lkvm LDLIBS_LIBRC += -lkvm
LDLIBS_RC += -lkvm

2
src/Makefile.Linux
View File

@ -1,2 +1,2 @@
LDLIBS_RC += -ldl LDLIBS_RC += -Wl,-Bdynamic -ldl
CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=500 CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=500

6
src/Makefile.ncurses
View File

@ -1,4 +1,2 @@
LIBTERMCAP ?= -lncurses LIBTERMCAP = -lncurses
CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP include Makefile.termcap
LDLIBS_LIBEINFO += $(LIBTERMCAP)
LDLIBS_RC += $(LIBTERMCAP)

2
src/Makefile.pam-dynamic
View File

@ -1,2 +0,0 @@
CPPFLAGS_SSD = -DHAVE_PAM
LDLIBS_RC += -Wl,-Bdynamic -lpam

1
src/Makefile.termcap
View File

@ -1,3 +1,4 @@
LIBTERMCAP ?= -ltermcap LIBTERMCAP ?= -ltermcap
CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP
LDLIBS_LIBEINFO += $(LIBTERMCAP) LDLIBS_LIBEINFO += $(LIBTERMCAP)
LDLIBS_RC += $(LIBTERMCAP)