Project "Tuxbox-GIT: cdk":
The branch, master has been updated
via 956158ac5c9eae9f086f39611679d9b3b2a48772 (commit)
from 8ef7a7f5f5df5f77197ad279e24b0dc454b8210b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 956158ac5c9eae9f086f39611679d9b3b2a48772
Author: Stefan Seyfried <se...@tu...>
Date: Sat Jan 26 14:30:23 2013 +0100
fix procps build with current make
diff --git a/make/rootutils.mk b/make/rootutils.mk
index 8ff3595..cb476bb 100644
--- a/make/rootutils.mk
+++ b/make/rootutils.mk
@@ -58,9 +58,11 @@ $(flashprefix)/root/sbin/portmap: bootstrap @DEPENDS_portmap@ | $(flashprefix)/r
$(DEPDIR)/procps: bootstrap libncurses @DEPENDS_procps@
@PREPARE_procps@
- cd @DIR_procps@ && \
+ set -e; cd @DIR_procps@; \
$(BUILDENV) \
- $(MAKE) CPPFLAGS="$(CXXFLAGS) -I$(targetprefix)/include/ncurses -D__GNU_LIBRARY__" top ps/ps && \
+ $(MAKE) CPPFLAGS="$(CXXFLAGS) -I$(targetprefix)/include/ncurses -D__GNU_LIBRARY__" proc/libproc-3.2.8.so; \
+ $(BUILDENV) \
+ $(MAKE) CPPFLAGS="$(CXXFLAGS) -I$(targetprefix)/include/ncurses -D__GNU_LIBRARY__" LDFLAGS="proc/libproc-3.2.8.so" top ps/ps; \
@INSTALL_procps@
@CLEANUP_procps@
touch $@
-----------------------------------------------------------------------
Summary of changes:
make/rootutils.mk | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
--
Tuxbox-GIT: cdk
|
