--- a/components/git/Makefile	Thu Jul 31 01:53:13 2014 -0700
+++ b/components/git/Makefile	Mon May 04 19:10:05 2015 -0700
@@ -57,10 +57,19 @@
 CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON.$(PYTHON_VERSION))
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
+# Build fails if environment variable PROFILE is set.
+COMPONENT_BUILD_ENV+=	PROFILE=
+COMPONENT_INSTALL_ENV+=	PROFILE=
+COMPONENT_TEST_ENV+=	PROFILE=
+
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
 COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell $(PERL) -MConfig -e 'print "$$Config{installvendorarch}"')
 COMPONENT_INSTALL_ARGS+=	INSTALL="$(INSTALL)"
 
+# get rid of terminal escape codes in test output
+COMPONENT_TEST_ENV = TERM=dumb
+# many failures; keep going; later versions of git are much cleaner
+COMPONENT_TEST_ARGS += -k -i
 COMPONENT_TEST_TARGETS = test
 
 # This runs configure but configure doesn't generate a Makefile.
@@ -71,6 +80,8 @@
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32) $(BUILD_DIR)/.manpages