diff options
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | external/python3/python-3.3.0-i42553.patch.2 | 18 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 4 |
3 files changed, 3 insertions, 20 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index f84b98299b8c..915416f2c952 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -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 \ diff --git a/external/python3/python-3.3.0-i42553.patch.2 b/external/python3/python-3.3.0-i42553.patch.2 deleted file mode 100644 index 21145227cc1e..000000000000 --- a/external/python3/python-3.3.0-i42553.patch.2 +++ /dev/null @@ -1,18 +0,0 @@ -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); diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index de98363a92ff..f20ebb9a3db7 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -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 \ |