--- a/components/apache2-modules/mod_wsgi/Makefile	Mon Apr 04 16:56:33 2016 -0700
+++ b/components/apache2-modules/mod_wsgi/Makefile	Fri Apr 01 22:32:57 2016 -0700
@@ -38,9 +38,6 @@
 VARIANTS_64 = $(BUILD_DIR)/apache24-python27 $(BUILD_DIR)/apache24-python34
 include ../modules.mk
 
-# Fix 64-bit linking via compiler.
-LDFLAGS += $(CC_BITS)
-
 $(BUILD_DIR)/apache24-%/$(MACH64)/.configured: APXS=$(APACHE_24_USR_PREFIX)/bin/apxs BITS=64
 $(BUILD_DIR)/apache24-%/$(MACH64)/.built: BITS=64
 $(BUILD_DIR)/apache24-%/$(MACH64)/.tested: BITS=64

--- a/components/apache24/Makefile	Mon Apr 04 16:56:33 2016 -0700
+++ b/components/apache24/Makefile	Fri Apr 01 22:32:57 2016 -0700
@@ -40,6 +40,10 @@
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
+# This is baked into the Apache module build configuration and is used by apxs
+# to build modules.
+LDFLAGS += $(CC_BITS)
+
 PATCH_LEVEL=0
 
 # We will build two separate mod_ssl versions.

--- a/components/apr-1_5/Makefile	Mon Apr 04 16:56:33 2016 -0700
+++ b/components/apr-1_5/Makefile	Fri Apr 01 22:32:57 2016 -0700
@@ -59,8 +59,9 @@
 
 COMPONENT_TEST_TARGETS=	test
 
-# Some patches need configure script recreation.
-COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fi);
+# Some patches need configure script recreation; autoreconf is not used here as
+# it will overwrite the patch to the libtool scripts.
+COMPONENT_PREP_ACTION += (cd $(@D); autoconf);
 
 # 32 and 64 bits apr.h headers need to be merged to the final one.
 APRH=include/apr.h