Kaydet (Commit) 12b865c0 authored tarafından Michael Stahl's avatar Michael Stahl

gbuild, python3: stop defining SOLARIS, and remove SOLARIS patch

It's faster to change our code not to rely on -DSOLARIS than to
wait for python developers to remove such nonsense from their public
headers.

Change-Id: I3ab05d41bbb51b91a2add599339ce334b5099330
üst 2e0e05aa
......@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
......
definition of gethostbyname conflicts with system /usr/include/unistd.h,
available since at least Solaris 2.6 according to python-Bugs-837046
Author: taniguchi@openoffice.org
--- misc/Python-2.6.1/Include/pyport.h 2008-06-11 09:41:16.000000000 +0200
+++ misc/build/Python-2.6.1/Include/pyport.h 2011-06-06 17:31:17.000000000 +0200
@@ -449,11 +449,6 @@
in platform-specific #ifdefs.
**************************************************************************/
-#ifdef SOLARIS
-/* Unchecked */
-extern int gethostname(char *, int);
-#endif
-
#ifdef HAVE__GETPTY
#include <sys/types.h> /* we need to import mode_t */
extern char * _getpty(int *, int, mode_t, int);
......@@ -25,8 +25,10 @@ ifneq ($(origin AR),default)
gb_AR := $(AR)
endif
# do not define SOLARIS - use #ifdef __sun instead
# -D$(OS) \
gb_OSDEFS := \
-D$(OS) \
-DSYSV \
-DSUN \
-DSUN4 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment