turn off new SE Linux code for now
This commit is contained in:
parent
f505219ae1
commit
3ced977cf2
11
Makefile
11
Makefile
@ -69,6 +69,17 @@ _TARFILES := Makefile
|
||||
|
||||
CURSES := -lncurses
|
||||
|
||||
# This seems about right for the dynamic library stuff.
|
||||
# Something like this is probably needed to make the SE Linux
|
||||
# library loading not conflict with embedded systems stuff.
|
||||
#
|
||||
#ifeq ($(SHARED),1)
|
||||
#ldl := -ldl
|
||||
#LIBTYPE := -DSHAREDLIB
|
||||
#else
|
||||
#LIBTYPE := -DSTATICLIB
|
||||
#endif
|
||||
|
||||
# Preprocessor flags.
|
||||
PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
|
||||
CPPFLAGS := -I/usr/include/ncurses
|
||||
|
@ -20,11 +20,11 @@ PS_X := COPYING HACKING TRANSLATION common.h module.mk it p ps.1 regression
|
||||
TARFILES += $(PSSRC) $(addprefix ps/,$(PS_X))
|
||||
|
||||
ps/ps: $(PSOBJ) $(LIBPROC)
|
||||
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -ldl
|
||||
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ $(ldl)
|
||||
|
||||
# This just adds the stacktrace code
|
||||
ps/debug: $(PSOBJ) stacktrace.o $(LIBPROC)
|
||||
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lefence
|
||||
$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lefence $(ldl)
|
||||
|
||||
$(PSOBJ): %.o: %.c ps/common.h $(LIBPROC)
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@
|
||||
|
@ -1122,8 +1122,11 @@ fail:
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
// move the bulk of this to libproc sometime
|
||||
#if 0
|
||||
// This needs more study, considering:
|
||||
// 1. the static linking option (maybe disable this in that case)
|
||||
// 2. the -z and -Z option issue
|
||||
// 3. width of output
|
||||
static int pr_context(char *restrict const outbuf, const proc_t *restrict const pp){
|
||||
static int (*ps_getpidcon)(pid_t pid, char **context) = 0;
|
||||
static int tried_load = 0;
|
||||
@ -1154,7 +1157,7 @@ static int pr_context(char *restrict const outbuf, const proc_t *restrict const
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
////////////////////////////// Test code /////////////////////////////////
|
||||
|
Loading…
Reference in New Issue
Block a user