| Submitter | Gustavo Zacarias |
|---|---|
| Date | Oct. 29, 2012, 12:34 a.m. |
| Message ID | <1351470854-15435-1-git-send-email-gustavo@zacarias.com.ar> |
| Download | mbox | patch |
| Permalink | /patch/194766/ |
| State | Superseded |
| Headers | show |
Comments
On 10/29/12 01:34, Gustavo Zacarias wrote: > +# progs use fork() > define LIBCAP_BUILD_CMDS > + $(SED) '/-C progs/d' $(@D)/Makefile > $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ Could you do this in a post-patch hook instead? It's more verbose, but more appropriate I think. Regards, Arnout
Patch
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index b922e5a..ac73dcf 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -12,7 +12,9 @@ LIBCAP_SOURCE = libcap2_$(LIBCAP_VERSION).orig.tar.gz LIBCAP_DEPENDENCIES = host-libcap LIBCAP_INSTALL_STAGING = YES +# progs use fork() define LIBCAP_BUILD_CMDS + $(SED) '/-C progs/d' $(@D)/Makefile $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ LIBATTR=no BUILD_CC="$(HOSTCC)" BUILD_CFLAGS="$(HOST_CFLAGS)" endef @@ -25,7 +27,6 @@ endef define LIBCAP_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \ prefix=/usr lib=lib install - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps) endef define HOST_LIBCAP_BUILD_CMDS
Disable progs in the Makefile directly instead of building and then removing them. This is because they use fork() and can cause build failures on nommu. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/libcap/libcap.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)