From a1cb74821a3d4ccb708280ad1ed8297c67c4a54b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Mar 2014 22:16:11 +0100 Subject: fix kernel build on Darwin for x86 targets relocs tool uses some kind of regular expression, which does not work with the provided one. Use pcre in this case. Rework KERNEL_MAKE_OPTS while here. Use it in kernel-header, too. --- tools/Makefile | 3 +++ tools/pcre/Makefile | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tools/pcre/Makefile (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index cdbf2b4f1..bfed325e0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,6 +32,9 @@ endif ifeq ($(ADK_HOST_NEED_CCACHE),y) TARGETS+=ccache endif +ifeq ($(ADK_HOST_NEED_PCRE),y) +TARGETS+=pcre +endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/pcre/Makefile b/tools/pcre/Makefile new file mode 100644 index 000000000..f88fe230a --- /dev/null +++ b/tools/pcre/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcre +PKG_VERSION:= 8.34 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 006c5e27fb78cdd14a628fdfa5aa1905 +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} + +include ../rules.mk + +install: $(WRKBUILD)/.installed + +$(WRKBUILD)/.configured: ${WRKDIST}/.prepared + (cd ${WRKBUILD}; CPPFLAGS='$(CPPFLAGS_FOR_BUILD)' \ + LDFLAGS='$(LDFLAGS_FOR_BUILD)' \ + ./configure --prefix=$(STAGING_HOST_DIR)/usr) + @touch $@ + +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured + ${MAKE} -C ${WRKBUILD} + @touch $@ + +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled + ${MAKE} -C ${WRKBUILD} install + @touch $@ + +include $(TOPDIR)/mk/tools.mk -- cgit v1.2.3