From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 components/rdiff-backup/Makefile |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/components/rdiff-backup/Makefile b/components/rdiff-backup/Makefile
index 305a16f..14852d0 100644
--- a/components/rdiff-backup/Makefile
+++ b/components/rdiff-backup/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -38,16 +38,26 @@
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/setup.py.mk
 
-## just build a Python 2.6 version for now, when the 2.7 modules show up, we can
-## switch
-#PYTHON_VERSIONS = 2.6
-#PYTHON_DATA = /usr
+# Needed to get around a broken /usr/lib/python2.7/config/Makefile
+# See CR #16837431.
+LD=$(CC)
+LDSHARED=$(CC) -G $(CC_BITS)
+CFLAGS= $(CC_BITS)
+CPPFLAGS=
+LDFLAGS=
+PYTHON_ENV += CC="$(CC)"
+PYTHON_ENV += LDSHARED="$(LDSHARED)"
+PYTHON_ENV += LD="$(LD)"
+PYTHON_ENV += CFLAGS="$(CFLAGS)"
+PYTHON_ENV += CPPFLAGS="$(CPPFLAGS)"
+PYTHON_ENV += LDFLAGS="$(LDFLAGS)"
+COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
 
 # common targets
 
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 

--
Gitblit v1.9.3