diff options
20 files changed, 74 insertions, 12199 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 59b7cf6d8..b672df7f0 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -7,6 +7,11 @@ host-configure: ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} @mkdir -p ${WRKBUILD} @$(CMD_TRACE) "host configuring... " +ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) + cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE) + @rm -rf ${WRKSRC}/autom4te.cache + @touch ${WRKDIR}/.autoreconf_done +endif @cd ${WRKBUILD}; \ for i in $$(find . -name config.sub);do \ if [ -f $$i ]; then \ diff --git a/mk/host.mk b/mk/host.mk index 2c07f9665..1f5f4c48a 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -3,8 +3,8 @@ HOST_CONFIGURE_ENV+= AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ CONFIG_SHELL='$(strip ${SHELL})' \ - PATH='${TARGET_PATH}' \ - PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' + PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \ + PATH='${HOST_PATH}' \ CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \ @@ -21,8 +21,8 @@ HOST_FAKE_FLAGS?= HOST_ALL_TARGET?= all HOST_INSTALL_TARGET?= install -HOST_MAKE_ENV+= PATH='${TARGET_PATH}' \ - PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' +HOST_MAKE_ENV+= PATH='${HOST_PATH}' \ + PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \ CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \ diff --git a/mk/vars.mk b/mk/vars.mk index 9cc789004..50e02a204 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -43,7 +43,8 @@ BIN_DIR_PFX:= $(BASE_DIR)/bin PACKAGE_DIR:= $(BIN_DIR)/packages TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} TARGET_DIR_PFX:= $(BASE_DIR)/root_* -TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} +TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} +HOST_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} AUTOTOOL_PATH= ${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 446f465ab..10482b799 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -10,7 +10,8 @@ PKG_MD5SUM:= df801a975045150790e10e2ccf32193f PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat -PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm +PKG_DEPENDS+= libxml2 libxml2-python +PKG_BUILDDEP:= python2 libxml2 libXdamage libXfixes libXxf86vm libdrm PKG_BUILDDEP+= dri2proto glproto expat libXext PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ @@ -26,6 +27,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +include $(TOPDIR)/mk/python.mk + ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 endif @@ -36,7 +39,8 @@ CONFIGURE_ARGS+= --disable-static \ --disable-gles1 \ --disable-gles2 \ --with-dri-drivers=${DRI_DRIVERS},swrast -CONFIGURE_ENV+= PYTHON2=/usr/bin/python MISSING="echo" +CONFIGURE_ENV+= MISSING="echo" \ + PYTHON2=$(PYTHON) XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} ifeq ($(ADK_NATIVE),y) diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 99c130e1d..00795d0b6 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 9f7e707d4fb7a5a76f0f9b73ff70623d PKG_DESCR:= fast light toolkit PKG_SECTION:= libs +PKG_DEPENDS:= mesalib libx11 libxi freeglut libfreetype PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://openadk.org/distfiles/ @@ -18,7 +19,6 @@ PKG_LIBNAME:= libfltk PKG_OPTS:= dev PKG_ARCH_DEPENDS:= x86 x86_64 mips arm -PKG_HOST_DEPENDS:= !darwin DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index b54f62793..9ef7660d7 100644 --- a/package/libdrm/Makefile +++ b/package/libdrm/Makefile @@ -20,6 +20,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-manpages + libdrm-install: $(INSTALL_DIR) $(IDIR_LIBDRM)/usr/lib $(CP) $(WRKINST)/usr/lib/libdrm*.so* \ diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 301c6662d..624ffdb26 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380 PKG_DESCR:= XML C parser and toolkit PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP:= autotool libxml2-host zlib +PKG_BUILDDEP:= autotool gettext-tiny libxml2-host zlib PKG_URL:= http://www.xmlsoft.org/ PKG_SITES:= http://xmlsoft.org/sources/ PKG_OPTS:= dev @@ -19,6 +19,7 @@ PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON PKGSD_LIBXML2_PYTHON:= XML python bindings PKGSC_LIBXML2_PYTHON:= libs PKGSB_LIBXML2_PYTHON:= python2 +PKGSS_LIBXML2_PYTHON:= python2 ifeq ($(ADK_STATIC),y) PKG_OPTS+= libmix @@ -34,7 +35,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE include $(TOPDIR)/mk/python.mk HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --without-python \ +HOST_CONFIGURE_ARGS+= --with-python \ --without-iconv \ --without-lzma \ --without-zlib diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_in index a8340e906..6432ced20 100644 --- a/package/libxml2/patches/patch-configure_in +++ b/package/libxml2/patches/patch-configure_in @@ -1,5 +1,5 @@ --- libxml2-2.9.1.orig/configure.in 2013-04-19 09:25:20.000000000 +0200 -+++ libxml2-2.9.1/configure.in 2013-10-31 08:37:36.000000000 +0100 ++++ libxml2-2.9.1/configure.in 2013-11-23 23:02:06.000000000 +0100 @@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES= PYTHON_TESTS= pythondir= @@ -77,11 +77,11 @@ - fi - fi - fi -+ PYTHON_INCLUDES=`$PYTHON$PYTHON_VERSION-config --includes` -+ PYTHON_LIBS=`$PYTHON$PYTHON_VERSION-config --ldflags` -+ PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages - pythondir='$(PYTHON_SITE_PACKAGES)' -- PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` +- pythondir='$(PYTHON_SITE_PACKAGES)' ++ PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes` + PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` ++ PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages ++ pythondir='$(PYTHON_SITE_PACKAGES)' else PYTHON= fi diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am new file mode 100644 index 000000000..82061eee3 --- /dev/null +++ b/package/libxml2/patches/patch-python_Makefile_am @@ -0,0 +1,17 @@ +--- libxml2-2.9.1.orig/python/Makefile.am 2013-04-19 08:56:45.000000000 +0200 ++++ libxml2-2.9.1/python/Makefile.am 2013-11-24 09:18:44.000000000 +0100 +@@ -19,12 +19,12 @@ if WITH_PYTHON + AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(PYTHON_INCLUDES) ++ $(PYTHON_INCLUDES) + + python_LTLIBRARIES = libxml2mod.la + + libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c +-libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ ++libxml2mod_la_LDFLAGS = $(LDFLAGS) $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ + $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) + + BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c diff --git a/package/libxml2/patches/patch-python_setup_py b/package/libxml2/patches/patch-python_setup_py new file mode 100644 index 000000000..13ec3493d --- /dev/null +++ b/package/libxml2/patches/patch-python_setup_py @@ -0,0 +1,11 @@ +--- libxml2-2.9.1.orig/python/setup.py 2013-04-19 09:36:20.000000000 +0200 ++++ libxml2-2.9.1/python/setup.py 2013-11-21 18:47:16.000000000 +0100 +@@ -8,7 +8,7 @@ from distutils.core import setup, Extens + # Below ROOT, we expect to find include, include/libxml2, lib and bin. + # On *nix, it is not needed (but should not harm), + # on Windows, it is set by configure.js. +-ROOT = r'/usr' ++ROOT = r'/Volumes/adk/openadk/host_i686_gnu_eglibc/usr' + + # Thread-enabled libxml2 + with_threads = 1 diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index e3b322634..8901c8a75 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9667bf6f9310b957254fdcf6596600b7 PKG_DESCR:= XSLT Library PKG_SECTION:= libs PKG_DEPENDS:= libxml2 -PKG_BUILDDEP:= python2-host libxml2-host libxslt-host libxml2 +PKG_BUILDDEP:= autotool python2-host libxml2-host libxslt-host libxml2 PKG_URL:= http://xmlsoft.org/XSLT PKG_SITES:= http://xmlsoft.org/sources/ PKG_NEED_CXX:= 1 @@ -37,6 +37,7 @@ HOST_CONFIGURE_ARGS+= --without-python \ --with-libxml-prefix="${STAGING_HOST_DIR}/usr" \ --with-libxml-include-prefix="${STAGING_HOST_DIR}/usr/include/libxml2" \ --with-libxml-libs-prefix="${STAGING_HOST_DIR}/usr/lib" +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \ --with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \ --with-libxml-libs-prefix="${STAGING_TARGET_DIR}/usr/lib" \ diff --git a/package/python2/Makefile b/package/python2/Makefile index ee4768c3d..1fa0cce94 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7.5 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang -PKG_BUILDDEP:= libffi python2-host autotool +PKG_BUILDDEP:= autotool libffi python2-host PKG_DEPENDS:= libpthread libffi libgcc PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ @@ -104,6 +104,14 @@ hostpost-install: $(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \ $(STAGING_HOST_DIR)/usr/bin/pgen +pre-configure: + (cd $(WRKBUILD) && patch -p1 < \ + $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py ) + (cd $(WRKBUILD) && patch -p1 < \ + $(TOPDIR)/package/python2/files/patch-Misc_python-config_in ) + $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ + $(WRKBUILD)/Misc/python-config.in + python2-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7 diff --git a/package/python2/files/build_scripts.py b/package/python2/files/build_scripts.py deleted file mode 100644 index fe81a5341..000000000 --- a/package/python2/files/build_scripts.py +++ /dev/null @@ -1,99 +0,0 @@ -"""distutils.command.build_scripts - -Implements the Distutils 'build_scripts' command.""" - -__revision__ = "$Id: build_scripts.py 77704 2010-01-23 09:23:15Z tarek.ziade $" - -import os, re -from stat import ST_MODE -from distutils.core import Command -from distutils.dep_util import newer -from distutils.util import convert_path -from distutils import log - -# check if Python is called on the first line with this expression -first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$') - -class build_scripts (Command): - - description = "\"build\" scripts (copy and fixup #! line)" - - user_options = [ - ('build-dir=', 'd', "directory to \"build\" (copy) to"), - ('force', 'f', "forcibly build everything (ignore file timestamps"), - ('executable=', 'e', "specify final destination interpreter path"), - ] - - boolean_options = ['force'] - - - def initialize_options (self): - self.build_dir = None - self.scripts = None - self.force = None - self.executable = None - self.outfiles = None - - def finalize_options (self): - self.set_undefined_options('build', - ('build_scripts', 'build_dir'), - ('force', 'force'), - ('executable', 'executable')) - self.scripts = self.distribution.scripts - - def get_source_files(self): - return self.scripts - - def run (self): - if not self.scripts: - return - self.copy_scripts() - - - def copy_scripts (self): - """Copy each script listed in 'self.scripts'; if it's marked as a - Python script in the Unix way (first line matches 'first_line_re', - ie. starts with "\#!" and contains "python"), then adjust the first - line to refer to the current Python interpreter as we copy. - """ - _sysconfig = __import__('sysconfig') - self.mkpath(self.build_dir) - outfiles = [] - for script in self.scripts: - adjust = 0 - script = convert_path(script) - outfile = os.path.join(self.build_dir, os.path.basename(script)) - outfiles.append(outfile) - - if not self.force and not newer(script, outfile): - log.debug("not copying %s (up-to-date)", script) - continue - - # Always open the file, but ignore failures in dry-run mode -- - # that way, we'll get accurate feedback if we can read the - # script. - try: - f = open(script, "r") - except IOError: - if not self.dry_run: - raise - f = None - if f: - f.close() - self.copy_file(script, outfile) - - if os.name == 'posix': - for file in outfiles: - if self.dry_run: - log.info("changing mode of %s", file) - else: - oldmode = os.stat(file)[ST_MODE] & 07777 - newmode = (oldmode | 0555) & 07777 - if newmode != oldmode: - log.info("changing mode of %s from %o to %o", - file, oldmode, newmode) - os.chmod(file, newmode) - - # copy_scripts () - -# class build_scripts diff --git a/package/python2/patches/patch-Lib_distutils_sysconfig_py b/package/python2/files/patch-Lib_distutils_sysconfig_py index 30aae0816..30aae0816 100644 --- a/package/python2/patches/patch-Lib_distutils_sysconfig_py +++ b/package/python2/files/patch-Lib_distutils_sysconfig_py diff --git a/package/python2/patches/patch-Misc_python-config_in b/package/python2/files/patch-Misc_python-config_in index 9734d4fbd..9734d4fbd 100644 --- a/package/python2/patches/patch-Misc_python-config_in +++ b/package/python2/files/patch-Misc_python-config_in diff --git a/package/python2/files/posixmodule.c b/package/python2/files/posixmodule.c deleted file mode 100644 index 312861b65..000000000 --- a/package/python2/files/posixmodule.c +++ /dev/null @@ -1,9365 +0,0 @@ - -/* POSIX module implementation */ - -/* This file is also used for Windows NT/MS-Win and OS/2. In that case the - module actually calls itself 'nt' or 'os2', not 'posix', and a few - functions are either unimplemented or implemented differently. The source - assumes that for Windows NT, the macro 'MS_WINDOWS' is defined independent - of the compiler used. Different compilers define their own feature - test macro, e.g. '__BORLANDC__' or '_MSC_VER'. For OS/2, the compiler - independent macro PYOS_OS2 should be defined. On OS/2 the default - compiler is assumed to be IBM's VisualAge C++ (VACPP). PYCC_GCC is used - as the compiler specific macro for the EMX port of gcc to OS/2. */ - -/* See also ../Dos/dosmodule.c */ - -#ifdef __APPLE__ - /* - * Step 1 of support for weak-linking a number of symbols existing on - * OSX 10.4 and later, see the comment in the #ifdef __APPLE__ block - * at the end of this file for more information. - */ -# pragma weak lchown -# pragma weak statvfs -# pragma weak fstatvfs - -#endif /* __APPLE__ */ - -#define PY_SSIZE_T_CLEAN - -#include "Python.h" -#include "structseq.h" - -#if defined(__VMS) -# include <unixio.h> -#endif /* defined(__VMS) */ - -#ifdef __cplusplus -extern "C" { -#endif - -PyDoc_STRVAR(posix__doc__, -"This module provides access to operating system functionality that is\n\ -standardized by the C Standard and the POSIX standard (a thinly\n\ -disguised Unix interface). Refer to the library manual and\n\ -corresponding Unix manual entries for more information on calls."); - -#ifndef Py_USING_UNICODE -/* This is used in signatures of functions. */ -#define Py_UNICODE void -#endif - -#if defined(PYOS_OS2) -#define INCL_DOS -#define INCL_DOSERRORS -#define INCL_DOSPROCESS -#define INCL_NOPMAPI -#include <os2.h> -#if defined(PYCC_GCC) -#include <ctype.h> -#include <io.h> -#include <stdio.h> -#include <process.h> -#endif -#include "osdefs.h" -#endif - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif /* HAVE_SYS_TYPES_H */ - -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif /* HAVE_SYS_STAT_H */ - -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> /* For WNOHANG */ -#endif - -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif - -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif /* HAVE_FCNTL_H */ - -#ifdef HAVE_GRP_H -#include <grp.h> -#endif - -#ifdef HAVE_SYSEXITS_H -#include <sysexits.h> -#endif /* HAVE_SYSEXITS_H */ - -#ifdef HAVE_SYS_LOADAVG_H -#include <sys/loadavg.h> -#endif - -/* Various compilers have only certain posix functions */ -/* XXX Gosh I wish these were all moved into pyconfig.h */ -#if defined(PYCC_VACPP) && defined(PYOS_OS2) -#include <process.h> -#else -#if defined(__WATCOMC__) && !defined(__QNX__) /* Watcom compiler */ -#define HAVE_GETCWD 1 -#define HAVE_OPENDIR 1 -#define HAVE_SYSTEM 1 -#if defined(__OS2__) -#define HAVE_EXECV 1 -#define HAVE_WAIT 1 -#endif -#include <process.h> -#else -#ifdef __BORLANDC__ /* Borland compiler */ -#define HAVE_EXECV 1 -#define HAVE_GETCWD 1 -#define HAVE_OPENDIR 1 -#define HAVE_PIPE 1 -#define HAVE_POPEN 1 -#define HAVE_SYSTEM 1 -#define HAVE_WAIT 1 -#else -#ifdef _MSC_VER /* Microsoft compiler */ -#define HAVE_GETCWD 1 -#define HAVE_SPAWNV 1 -#define HAVE_EXECV 1 -#define HAVE_PIPE 1 -#define HAVE_POPEN 1 -#define HAVE_SYSTEM 1 -#define HAVE_CWAIT 1 -#define HAVE_FSYNC 1 -#define fsync _commit -#else -#if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS) -/* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */ -#else /* all other compilers */ -/* Unix functions that the configure script doesn't check for */ -#define HAVE_EXECV 1 -#define HAVE_FORK 1 -#if defined(__USLC__) && defined(__SCO_VERSION__) /* SCO UDK Compiler */ -#define HAVE_FORK1 1 -#endif -#define HAVE_GETCWD 1 -#define HAVE_GETEGID 1 -#define HAVE_GETEUID 1 -#define HAVE_GETGID 1 -#define HAVE_GETPPID 1 -#define HAVE_GETUID 1 -#define HAVE_KILL 1 -#define HAVE_OPENDIR 1 -#define HAVE_PIPE 1 -#ifndef __rtems__ -#define HAVE_POPEN 1 -#endif -#define HAVE_SYSTEM 1 -#define HAVE_WAIT 1 -#define HAVE_TTYNAME 1 -#endif /* PYOS_OS2 && PYCC_GCC && __VMS */ -#endif /* _MSC_VER */ -#endif /* __BORLANDC__ */ -#endif /* ! __WATCOMC__ || __QNX__ */ -#endif /* ! __IBMC__ */ - -#ifndef _MSC_VER - -#if defined(__sgi)&&_COMPILER_VERSION>=700 -/* declare ctermid_r if compiling with MIPSPro 7.x in ANSI C mode - (default) */ -extern char *ctermid_r(char *); -#endif - -#ifndef HAVE_UNISTD_H -#if defined(PYCC_VACPP) -extern int mkdir(char *); -#else -#if ( defined(__WATCOMC__) || defined(_MSC_VER) ) && !defined(__QNX__) -extern int mkdir(const char *); -#else -extern int mkdir(const char *, mode_t); -#endif -#endif -#if defined(__IBMC__) || defined(__IBMCPP__) -extern int chdir(char *); -extern int rmdir(char *); -#else -extern int chdir(const char *); -extern int rmdir(const char *); -#endif -#ifdef __BORLANDC__ -extern int chmod(const char *, int); -#else -extern int chmod(const char *, mode_t); -#endif -/*#ifdef HAVE_FCHMOD -extern int fchmod(int, mode_t); -#endif*/ -/*#ifdef HAVE_LCHMOD -extern int lchmod(const char *, mode_t); -#endif*/ -extern int chown(const char *, uid_t, gid_t); -extern char *getcwd(char *, int); -extern char *strerror(int); -extern int link(const char *, const char *); -extern int rename(const char *, const char *); -extern int stat(const char *, struct stat *); -extern int unlink(const char *); -extern int pclose(FILE *); -#ifdef HAVE_SYMLINK -extern int symlink(const char *, const char *); -#endif /* HAVE_SYMLINK */ -#ifdef HAVE_LSTAT -extern int lstat(const char *, struct stat *); -#endif /* HAVE_LSTAT */ -#endif /* !HAVE_UNISTD_H */ - -#endif /* !_MSC_VER */ - -#ifdef HAVE_UTIME_H -#include <utime.h> -#endif /* HAVE_UTIME_H */ - -#ifdef HAVE_SYS_UTIME_H -#include <sys/utime.h> -#define HAVE_UTIME_H /* pretend we do for the rest of this file */ -#endif /* HAVE_SYS_UTIME_H */ - -#ifdef HAVE_SYS_TIMES_H -#include <sys/times.h> -#endif /* HAVE_SYS_TIMES_H */ - -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif /* HAVE_SYS_PARAM_H */ - -#ifdef HAVE_SYS_UTSNAME_H -#include <sys/utsname.h> -#endif /* HAVE_SYS_UTSNAME_H */ - -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#define NAMLEN(dirent) strlen((dirent)->d_name) -#else -#if defined(__WATCOMC__) && !defined(__QNX__) -#include <direct.h> -#define NAMLEN(dirent) strlen((dirent)->d_name) -#else -#define dirent direct -#define NAMLEN(dirent) (dirent)->d_namlen -#endif -#ifdef HAVE_SYS_NDIR_H -#include <sys/ndir.h> -#endif -#ifdef HAVE_SYS_DIR_H -#include <sys/dir.h> -#endif -#ifdef HAVE_NDIR_H -#include <ndir.h> -#endif -#endif - -#ifdef _MSC_VER -#ifdef HAVE_DIRECT_H -#include <direct.h> -#endif -#ifdef HAVE_IO_H -#include <io.h> -#endif -#ifdef HAVE_PROCESS_H -#include <process.h> -#endif -#include "osdefs.h" -#include <malloc.h> -#include <windows.h> -#include <shellapi.h> /* for ShellExecute() */ -#define popen _popen -#define pclose _pclose -#endif /* _MSC_VER */ - -#if defined(PYCC_VACPP) && defined(PYOS_OS2) -#include <io.h> -#endif /* OS2 */ - -#ifndef MAXPATHLEN -#if defined(PATH_MAX) && PATH_MAX > 1024 -#define MAXPATHLEN PATH_MAX -#else -#define MAXPATHLEN 1024 -#endif -#endif /* MAXPATHLEN */ - -#ifdef UNION_WAIT -/* Emulate some macros on systems that have a union instead of macros */ - -#ifndef WIFEXITED -#define WIFEXITED(u_wait) (!(u_wait).w_termsig && !(u_wait).w_coredump) -#endif - -#ifndef WEXITSTATUS -#define WEXITSTATUS(u_wait) (WIFEXITED(u_wait)?((u_wait).w_retcode):-1) -#endif - -#ifndef WTERMSIG -#define WTERMSIG(u_wait) ((u_wait).w_termsig) -#endif - -#define WAIT_TYPE union wait -#define WAIT_STATUS_INT(s) (s.w_status) - -#else /* !UNION_WAIT */ -#define WAIT_TYPE int -#define WAIT_STATUS_INT(s) (s) -#endif /* UNION_WAIT */ - -/* Issue #1983: pid_t can be longer than a C long on some systems */ -#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT -#define PARSE_PID "i" -#define PyLong_FromPid PyInt_FromLong -#define PyLong_AsPid PyInt_AsLong -#elif SIZEOF_PID_T == SIZEOF_LONG -#define PARSE_PID "l" -#define PyLong_FromPid PyInt_FromLong -#define PyLong_AsPid PyInt_AsLong -#elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG -#define PARSE_PID "L" -#define PyLong_FromPid PyLong_FromLongLong -#define PyLong_AsPid PyInt_AsLongLong -#else -#error "sizeof(pid_t) is neither sizeof(int), sizeof(long) or sizeof(long long)" -#endif /* SIZEOF_PID_T */ - -/* Don't use the "_r" form if we don't need it (also, won't have a - prototype for it, at least on Solaris -- maybe others as well?). */ -#if defined(HAVE_CTERMID_R) && defined(WITH_THREAD) -#define USE_CTERMID_R -#endif - -#if defined(HAVE_TMPNAM_R) && defined(WITH_THREAD) -#define USE_TMPNAM_R -#endif - -/* choose the appropriate stat and fstat functions and return structs */ -#undef STAT -#if defined(MS_WIN64) || defined(MS_WINDOWS) -# define STAT win32_stat -# define FSTAT win32_fstat -# define STRUCT_STAT struct win32_stat -#else -# define STAT stat -# define FSTAT fstat -# define STRUCT_STAT struct stat -#endif - -#if defined(MAJOR_IN_MKDEV) -#include <sys/mkdev.h> -#else -#if defined(MAJOR_IN_SYSMACROS) -#include <sys/sysmacros.h> -#endif -#if defined(HAVE_MKNOD) && defined(HAVE_SYS_MKDEV_H) -#include <sys/mkdev.h> -#endif -#endif - -#if defined _MSC_VER && _MSC_VER >= 1400 -/* Microsoft CRT in VS2005 and higher will verify that a filehandle is - * valid and throw an assertion if it isn't. - * Normally, an invalid fd is likely to be a C program error and therefore - * an assertion can be useful, but it does contradict the POSIX standard - * which for write(2) states: - * "Otherwise, -1 shall be returned and errno set to indicate the error." - * "[EBADF] The fildes argument is not a valid file descriptor open for - * writing." - * Furthermore, python allows the user to enter any old integer - * as a fd and should merely raise a python exception on error. - * The Microsoft CRT doesn't provide an official way to check for the - * validity of a file descriptor, but we can emulate its internal behaviour - * by using the exported __pinfo data member and knowledge of the - * internal structures involved. - * The structures below must be updated for each version of visual studio - * according to the file internal.h in the CRT source, until MS comes - * up with a less hacky way to do this. - * (all of this is to avoid globally modifying the CRT behaviour using - * _set_invalid_parameter_handler() and _CrtSetReportMode()) - */ -/* The actual size of the structure is determined at runtime. - * Only the first items must be present. - */ -typedef struct { - intptr_t osfhnd; - char osfile; -} my_ioinfo; - -extern __declspec(dllimport) char * __pioinfo[]; -#define IOINFO_L2E 5 -#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) -#define IOINFO_ARRAYS 64 -#define _NHANDLE_ (IOINFO_ARRAYS * IOINFO_ARRAY_ELTS) -#define FOPEN 0x01 -#define _NO_CONSOLE_FILENO (intptr_t)-2 - -/* This function emulates what the windows CRT does to validate file handles */ -int -_PyVerify_fd(int fd) -{ - const int i1 = fd >> IOINFO_L2E; - const int i2 = fd & ((1 << IOINFO_L2E) - 1); - - static int sizeof_ioinfo = 0; - - /* Determine the actual size of the ioinfo structure, - * as used by the CRT loaded in memory - */ - if (sizeof_ioinfo == 0 && __pioinfo[0] != NULL) { - sizeof_ioinfo = _msize(__pioinfo[0]) / IOINFO_ARRAY_ELTS; - } - if (sizeof_ioinfo == 0) { - /* This should not happen... */ - goto fail; - } - - /* See that it isn't a special CLEAR fileno */ - if (fd != _NO_CONSOLE_FILENO) { - /* Microsoft CRT would check that 0<=fd<_nhandle but we can't do that. Instead - * we check pointer validity and other info - */ - if (0 <= i1 && i1 < IOINFO_ARRAYS && __pioinfo[i1] != NULL) { - /* finally, check that the file is open */ - my_ioinfo* info = (my_ioinfo*)(__pioinfo[i1] + i2 * sizeof_ioinfo); - if (info->osfile & FOPEN) { - return 1; - } - } - } - fail: - errno = EBADF; - return 0; -} - -/* the special case of checking dup2. The target fd must be in a sensible range */ -static int -_PyVerify_fd_dup2(int fd1, int fd2) -{ - if (!_PyVerify_fd(fd1)) - return 0; - if (fd2 == _NO_CONSOLE_FILENO) - return 0; - if ((unsigned)fd2 < _NHANDLE_) - return 1; - else - return 0; -} -#else -/* dummy version. _PyVerify_fd() is already defined in fileobject.h */ -#define _PyVerify_fd_dup2(A, B) (1) -#endif - -/* Return a dictionary corresponding to the POSIX environment table */ -#ifdef WITH_NEXT_FRAMEWORK -/* On Darwin/MacOSX a shared library or framework has no access to -** environ directly, we must obtain it with _NSGetEnviron(). -*/ -#include <crt_externs.h> -static char **environ; -#elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) ) -extern char **environ; -#endif /* !_MSC_VER */ - -static PyObject * -convertenviron(void) -{ - PyObject *d; - char **e; -#if defined(PYOS_OS2) - APIRET rc; - char buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */ -#endif - d = PyDict_New(); - if (d == NULL) - return NULL; -#ifdef WITH_NEXT_FRAMEWORK - if (environ == NULL) - environ = *_NSGetEnviro |