CONTRIB.build/ = $(BUILD/)contrib/
-CONTRIB.download/ = $(PROJECT/)download/
+CONTRIB.download/ = $(SRC/)download/
CONTRIB.host = $(if $(filter 1,$(BUILD.cross)),$(BUILD.spec))
###############################################################################
##
## common values useful across targets
##
- $(1).src/ = $$(PROJECT/)contrib/$($(1).name)/
+ $(1).src/ = $$(SRC/)contrib/$($(1).name)/
$(1).build/ = $$(CONTRIB.build/)$($(1).name)/
$(1).deps = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target))
##
## target: extract
##
- $(1).EXTRACT.tarbase = $$(patsubst %.tar.gz,%,$$(notdir $$($(1).FETCH.url)))
+ $(1).EXTRACT.tarbase = $$(strip $$(foreach x,tar.bz2 tar.gz,$$(patsubst %.$$(x),%,$$(filter %.$$(x),$$(notdir $$($(1).FETCH.url))))))
$(1).EXTRACT.dir/ = $$($(1).build/)$$($(1).EXTRACT.tarbase)/
$(1).EXTRACT.target = $$($(1).build/).stamp.extract
define $(1).EXTRACT
# extra line feed is required
define $(1).PATCH.item
- $$(PATCH.exe) -t -p1 -d $$(1) < $$(2)
+ $$(PATCH.exe) -t -N -p1 -d $$(1) < $$(2)
endef
$(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @prefix !deps !shared !static !extra
$(1).CONFIGURE.env.CC = CC=$$($(1).GCC.gcc)
- $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
+ $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
$(1).CONFIGURE.env.CXX = CXX=$$($(1).GCC.gxx)
- $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
- $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
- $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
+ $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
+ $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
+ $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver)"
$(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS
$(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args))
$(1).INSTALL.ntargets =
$(1).INSTALL.args = !make @dir !extra !ntargets
- $(1).INSTALL.args.dir = -C $$(1) install
+ $(1).INSTALL.args.dir = -j 1 -C $$(1) install
+ $(1).INSTALL.mkdirs = $$(CONTRIB.build/)lib/ $$(CONTRIB.build/)include/
$(1).INSTALL.target = $$($(1).build/).stamp.install
define $(1).INSTALL
$$(call fn.ARGS,$(1).INSTALL,$$($(1).INSTALL.args))
$(1).out += $$($(1).PATCH.target)
$(1).out += $$($(1).CONFIGURE.target)
$(1).out += $$($(1).BUILD.target)
+ $(1).out += $$($(1).INSTALL.mkdirs)
$(1).out += $$($(1).INSTALL.target)
BUILD.out += $$($(1).out)
$($(1).name).extract: $$($(1).EXTRACT.target)
$$($(1).EXTRACT.target): | $$(dir $$($(1).EXTRACT.target))
-$$($(1).EXTRACT.target): $$($(1).deps)
$$($(1).EXTRACT.target): $$($(1).FETCH.target)
$$($(1).EXTRACT)
$$(TOUCH.exe) $$($(1).EXTRACT.target)
$($(1).name).extract.untouch:
- $$(RM.exe) $$($(1).EXTRACT.target)
+ $$(RM.exe) -f $$($(1).EXTRACT.target)
##
## target: patch
$$(TOUCH.exe) $$($(1).PATCH.target)
$($(1).name).patch.untouch:
- $$(RM.exe) $$($(1).PATCH.target)
+ $$(RM.exe) -f $$($(1).PATCH.target)
##
## target: configure
$($(1).name).configure: $$($(1).CONFIGURE.target)
$$($(1).CONFIGURE.target): | $$(dir $$($(1).CONFIGURE.target))
+$$($(1).CONFIGURE.target): $$($(1).deps)
$$($(1).CONFIGURE.target): $$($(1).PATCH.target)
$$($(1).CONFIGURE)
$$(TOUCH.exe) $$($(1).CONFIGURE.target)
$($(1).name).configure.untouch:
- $$(RM.exe) $$($(1).CONFIGURE.target)
+ $$(RM.exe) -f $$($(1).CONFIGURE.target)
##
## target: build
$$(TOUCH.exe) $$($(1).BUILD.target)
$($(1).name).build.untouch:
- $$(RM.exe) $$($(1).BUILD.target)
+ $$(RM.exe) -f $$($(1).BUILD.target)
##
## target: install
##
$($(1).name).install: $$($(1).INSTALL.target)
-$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target))
+$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target)) $$($(1).INSTALL.mkdirs)
$$($(1).INSTALL.target): $$($(1).BUILD.target)
$$($(1).INSTALL)
$$(TOUCH.exe) $$($(1).INSTALL.target)
$($(1).name).install.untouch:
- $$(RM.exe) $$($(1).INSTALL.target)
+ $$(RM.exe) -f $$($(1).INSTALL.target)
##
## target: uninstall