Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22750920 re-enable Python's use of {open,fork}pty functions once they work
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 25 Apr 2016 13:27:50 -0700
changeset 5846 8ea1051b8f11
parent 5845 0bcfb6ef31cb
child 5847 230bb7c2a9fb
22750920 re-enable Python's use of {open,fork}pty functions once they work
components/python/python27/Makefile file | annotate | diff | comparison | revisions
components/python/python34/Makefile file | annotate | diff | comparison | revisions
components/python/python35/Makefile file | annotate | diff | comparison | revisions
make-rules/setup.py.mk file | annotate | diff | comparison | revisions 
--- a/components/python/python27/Makefile	Mon Apr 25 14:38:19 2016 -0700
+++ b/components/python/python27/Makefile	Mon Apr 25 13:27:50 2016 -0700
@@ -101,8 +101,6 @@
 CONFIGURE_OPTIONS  +=		--with-system-ffi
 CONFIGURE_OPTIONS  +=		--without-gcc
 CONFIGURE_OPTIONS  +=		--enable-ipv6
-CONFIGURE_OPTIONS  +=		"ac_cv_func_forkpty=no"
-CONFIGURE_OPTIONS  +=		"ac_cv_func_openpty=no"
 CONFIGURE_OPTIONS  +=		CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
--- a/components/python/python34/Makefile	Mon Apr 25 14:38:19 2016 -0700
+++ b/components/python/python34/Makefile	Mon Apr 25 13:27:50 2016 -0700
@@ -113,8 +113,6 @@
 CONFIGURE_OPTIONS  +=		--without-ensurepip
 CONFIGURE_OPTIONS  +=		--enable-ipv6
 CONFIGURE_OPTIONS  +=		--bindir=/usr/bin
-CONFIGURE_OPTIONS  +=		"ac_cv_func_forkpty=no"
-CONFIGURE_OPTIONS  +=		"ac_cv_func_openpty=no"
 CONFIGURE_OPTIONS  +=		CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
--- a/components/python/python35/Makefile	Mon Apr 25 14:38:19 2016 -0700
+++ b/components/python/python35/Makefile	Mon Apr 25 13:27:50 2016 -0700
@@ -114,8 +114,6 @@
 CONFIGURE_OPTIONS  +=		--enable-ipv6
 CONFIGURE_OPTIONS  +=		--bindir=/usr/bin
 CONFIGURE_OPTIONS  +=		"ac_cv_func_getentropy=no"
-CONFIGURE_OPTIONS  +=		"ac_cv_func_forkpty=no"
-CONFIGURE_OPTIONS  +=		"ac_cv_func_openpty=no"
 CONFIGURE_OPTIONS  +=		CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
--- a/make-rules/setup.py.mk	Mon Apr 25 14:38:19 2016 -0700
+++ b/make-rules/setup.py.mk	Mon Apr 25 13:27:50 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # $ (foreach suffix,$(VERSIONS),$(eval include $(WS_MAKE_RULES)/python-$(suffix).mk))
@@ -99,7 +99,7 @@
 $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.4/.installed
 endif
 ifneq ($(findstring 3.5,$(PYTHON_VERSIONS)),)
-5(BUILD_DIR)/%-2.7/.built:     $(BUILD_DIR)/%-3.5/.built
+$(BUILD_DIR)/%-2.7/.built:     $(BUILD_DIR)/%-3.5/.built
 $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.5/.installed
 endif
upstream/oracle/userland-gate