diff options
| -rw-r--r-- | include/host-build.mk | 16 | ||||
| -rw-r--r-- | include/package-dumpinfo.mk | 6 | ||||
| -rw-r--r-- | include/package.mk | 2 | ||||
| -rw-r--r-- | include/quilt.mk | 2 | ||||
| -rw-r--r-- | include/subdir.mk | 5 | ||||
| -rw-r--r-- | package/lua/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/feeds | 3 | ||||
| -rwxr-xr-x | scripts/metadata.pl | 75 | ||||
| -rw-r--r-- | scripts/metadata.pm | 3 |
9 files changed, 93 insertions, 21 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index a0ffd83b6e..892cde91f5 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -12,6 +12,7 @@ include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk +BUILD_TYPES += host HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built @@ -122,7 +123,12 @@ ifndef DUMP host-install: $(HOST_STAMP_INSTALLED) endif - $(if $(STAMP_BUILT),compile: host-install) + ifndef STAMP_BUILT + prepare: host-prepare + compile: host-compile + install: host-install + clean: host-clean + endif host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED) host-compile: $(HOST_STAMP_BUILT) @@ -135,10 +141,10 @@ ifndef DUMP endef download: - prepare: host-prepare - compile: host-compile - install: host-install - clean: host-clean + prepare: + compile: + install: + clean: endif diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index f08788bbb1..db8d9c11ca 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -32,8 +32,10 @@ $(if $(MENU),Menu: $(MENU) )Version: $(VERSION) Depends: $(DEPENDS) Provides: $(PROVIDES) -Build-Depends: $(PKG_BUILD_DEPENDS) -Section: $(SECTION) +$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS) +)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS) +)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES) +)Section: $(SECTION) Category: $(CATEGORY) Title: $(TITLE) Maintainer: $(MAINTAINER) diff --git a/include/package.mk b/include/package.mk index 7e0501c554..191dec9ca7 100644 --- a/include/package.mk +++ b/include/package.mk @@ -79,7 +79,7 @@ define Build/DefaultTargets $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE) - $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED) + $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) $(Build/Configure) $(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep)) diff --git a/include/quilt.mk b/include/quilt.mk index 0d63e62fd2..fbb3e01e35 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -67,7 +67,7 @@ ifneq ($(PKG_BUILD_DIR),) endif ifneq ($(HOST_BUILD_DIR),) - HOST_QUILT?=$(if $(wildcard $(if $(PKG_BUILD_DIR),$(PKG_BUILD_DIR),$(HOST_BUILD_DIR))/.quilt_used),y) + HOST_QUILT?=$(if $(findstring command,$(origin $(QUILT))),$(QUILT),$(if $(wildcard $(HOST_BUILD_DIR)/.quilt_used),y)) ifneq ($(HOST_QUILT),) HOST_STAMP_PATCHED:=$(HOST_BUILD_DIR)/.quilt_patched HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked diff --git a/include/subdir.mk b/include/subdir.mk index 3bf1a4bb79..e6c8066187 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -27,6 +27,11 @@ define subdir $(foreach bd,$($(1)/builddirs), $(call warn,$(1),d,BD $(1)/$(bd)) $(foreach target,$(SUBTARGETS), + $(foreach btype,$(buildtypes-$(bd)), + $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(btype)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(btype)/$(target)) $(call $(1)//$(btype)/$(target),$(1)/$(bd)/$(btype)))) + +$$(SUBMAKE) -C $(1)/$(bd) $(btype)-$(target) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(btype)-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) [$(btype)] failed to build.)) + $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(btype)/$(target)) + ) $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))) +$$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) diff --git a/package/lua/Makefile b/package/lua/Makefile index 7f0874bd6d..67f3175c77 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -20,6 +20,8 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150 HOST_PATCH_DIR=./patches-host +PKG_BUILD_DEPENDS:=lua/host + include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk diff --git a/scripts/feeds b/scripts/feeds index deafaca126..e51b17c372 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -327,10 +327,11 @@ sub install_package { # install all dependencies foreach my $vpkg (@{$srcpackage{$src}}, $pkg) { - foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) { + foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) { next if $dep =~ /@/; $dep =~ s/^\+//; $dep =~ s/^.+://; + $dep =~ s/\/.+$//; next unless $dep; install_package($feed, $dep) == 0 or $ret = 1; } diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 4002559007..3d9d68a654 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -551,6 +551,20 @@ EOF } } +sub get_conditional_dep($$) { + my $condition = shift; + my $depstr = shift; + if ($condition) { + if ($condition =~ /^!(.+)/) { + return "\$(if \$(CONFIG_$1),,$depstr)"; + } else { + return "\$(if \$(CONFIG_$condition),$depstr)"; + } + } else { + return $depstr; + } +} + sub gen_package_mk() { my %conf; my %dep; @@ -582,6 +596,10 @@ sub gen_package_mk() { next if $done{$pkg->{src}}; $done{$pkg->{src}} = 1; + if (@{$pkg->{buildtypes}} > 0) { + print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n"; + } + foreach my $spkg (@{$srcpackage{$pkg->{src}}}) { foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) { $dep =~ /@/ or do { @@ -590,17 +608,60 @@ sub gen_package_mk() { }; } } + foreach my $type (@{$pkg->{buildtypes}}) { + my @extra_deps; + my %deplines; + + next unless $pkg->{"builddepends/$type"}; + foreach my $dep (@{$pkg->{"builddepends/$type"}}) { + my $suffix = ""; + my $condition; + + if ($dep =~ /^(.+):(.+)/) { + $condition = $1; + $dep = $2; + } + if ($dep =~ /^(.+)(\/.+)/) { + $dep = $1; + $suffix = $2; + } + my $pkg_dep = $package{$dep}; + next unless $pkg_dep; + + my $idx = ""; + if (defined $pkg_dep->{src}) { + $idx = $pkg_dep->{subdir}.$pkg_dep->{src}; + } elsif (defined($srcpackage{$dep})) { + $idx = $subdir{$dep}.$dep; + } + my $depstr = "\$(curdir)/$idx$suffix/compile"; + my $depline = get_conditional_dep($condition, $depstr); + if ($depline) { + $deplines{$dep} = $depline; + } + } + my $depline = join(" ", values %deplines); + if ($depline) { + $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n"; + } + } my $hasdeps = 0; my %deplines; foreach my $deps (@srcdeps) { my $idx; my $condition; + my $prefix = ""; + my $suffix = ""; if ($deps =~ /^(.+):(.+)/) { $condition = $1; $deps = $2; } + if ($deps =~ /^(.+)(\/.+)/) { + $deps = $1; + $suffix = $2; + } my $pkg_dep = $package{$deps}; my @deps; @@ -627,21 +688,13 @@ sub gen_package_mk() { my $depstr; if ($pkg_dep->{vdepends}) { - $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)"; + $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx$suffix/compile)"; $dep{$pkg->{src}."->($dep)".$idx} = 1; } else { - $depstr = "\$(curdir)/$idx/compile"; + $depstr = "\$(curdir)/$idx$suffix/compile"; $dep{$pkg->{src}."->".$idx} = 1; } - if ($condition) { - if ($condition =~ /^!(.+)/) { - $depline = "\$(if \$(CONFIG_$1),,$depstr)"; - } else { - $depline = "\$(if \$(CONFIG_$condition),$depstr)"; - } - } else { - $depline = $depstr; - } + $depline = get_conditional_dep($condition, $depstr); if ($depline) { $deplines{$idx.$dep} = $depline; } diff --git a/scripts/metadata.pm b/scripts/metadata.pm index defa7b9346..8ce4ea8b1e 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -63,6 +63,7 @@ sub parse_package_metadata($) { $pkg->{default} = "m if ALL"; $pkg->{depends} = []; $pkg->{builddepends} = []; + $pkg->{buildtypes} = []; $pkg->{subdir} = $subdir; $pkg->{tristate} = 1; $package{$1} = $pkg; @@ -91,6 +92,8 @@ sub parse_package_metadata($) { /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ]; /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1; /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ]; + /^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ]; + /^Build-Types:\s*(.+)\s*$/ and $pkg->{buildtypes} = [ split /\s+/, $1 ]; /^Category: \s*(.+)\s*$/ and do { $pkg->{category} = $1; defined $category{$1} or $category{$1} = {}; |