Date: Sun, 7 Dec 2014 16:01:21 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374215 - in head/math/sage: . files Message-ID: <201412071601.sB7G1LFx073166@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Sun Dec 7 16:01:20 2014 New Revision: 374215 URL: https://svnweb.freebsd.org/changeset/ports/374215 QAT: https://qat.redports.org/buildarchive/r374215/ Log: - Update to 6.4. Added: head/math/sage/files/patch-build_pkgs_gd_spkg-install (contents, props changed) head/math/sage/files/patch-build_pkgs_iml_spkg-install (contents, props changed) head/math/sage/files/patch-build_pkgs_m4rie_spkg-install (contents, props changed) head/math/sage/files/patch-build_pkgs_maxima_spkg-install (contents, props changed) head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib_distutils_command_build_scripts.py (contents, props changed) head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_issue21166 (contents, props changed) head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_pr192365 (contents, props changed) head/math/sage/files/patch-build_pkgs_zlib_spkg-install (contents, props changed) Deleted: head/math/sage/files/patch-build_pkgs_libm4ri_spkg-install head/math/sage/files/patch-build_pkgs_python head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_CVE-2014-1912 head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_issue20374 head/math/sage/files/patch-build_pkgs_readline_fbsd-patch-src_support_shlib-install head/math/sage/files/patch-build_pkgs_readline_patches_shobj-conf.patch Modified: head/math/sage/Makefile head/math/sage/distinfo head/math/sage/files/patch-build_pkgs_cephes_spkg-install head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Doc-library-fcntl.rst head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib__distutils__unixccompiler.py head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Makefile.pre.in head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-_ctypes-libffi-configure head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-fcntlmodule.c head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_setup.py Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/Makefile Sun Dec 7 16:01:20 2014 (r374215) @@ -2,16 +2,13 @@ # $FreeBSD$ PORTNAME= sage -PORTVERSION= 6.2 -PORTREVISION= 4 +PORTVERSION= 6.4 CATEGORIES= math MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \ http://mirrors.xmission.com/sage/src/ \ http://www-ftp.lip6.fr/pub/math/sagemath/src/ \ http://www.sagemath.org/src-old/ PKGNAMESUFFIX= -math -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PYTHON_SOURCE} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= stephen@FreeBSD.org COMMENT= Open source Mathematics software @@ -29,16 +26,6 @@ LIB_DEPENDS= libatlas.so:${PORTSDIR}/mat libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -PYTHON_SOURCE= python/Python-2.7.6.tar.xz - -# 387 option: this only makes a difference for the amd64 architecture. Causes -# the internal floating point calculations to be performed with extended -# precision. -OPTIONS_DEFINE_amd64= 387 -387_DESC= Use 387 instead of SSE FPU - -.include <bsd.port.options.mk> - pre-extract: @${ECHO_MSG} @${ECHO_MSG} Instead of installing the port, which will take a considerable amount of @@ -48,24 +35,15 @@ pre-extract: @sleep 10 PLIST_FILES= bin/sage -USE_GCC= yes USE_TEX= latex:build -USES= fortran gmake iconv tk +USES= gmake iconv tk MAKE_JOBS_SAFE= yes -LDFLAGS:= -Wl,-rpath=${WRKSRC}/local/lib ${LDFLAGS} -FFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG} -CFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG} -CXXFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG} -# Note that the above addition to LDFLAGS, as a side effect, provides a -# work-around for the make(1) idiosyncracy mentioned in PR 164361 (which -# otherwise breaks the build of the maxima sub-package). # Optimization flags will be defined by the source CFLAGS:= ${CFLAGS:C/^-O.*$//} FFLAGS:= ${CFLAGS:C/^-O.*$//} MAKE_ENV+= SAGE_PORT=yes \ - SAGE_INSTALL_GCC=no \ SAGE_ATLAS_LIB=${LOCALBASE}/lib \ DOT_SAGE=${WRKSRC}/tmp/.sage \ SAGE_FAT_BINARY=yes @@ -76,27 +54,11 @@ LATEST_LINK= sage-math # Conflicts with MAKE_ARGS+= ARCH="${AR}" post-patch: - ${CP} ${DISTDIR}/${PYTHON_SOURCE} ${WRKSRC}/upstream/. - ${REINPLACE_CMD} 's/$$MAKE $$gettext/$$MAKE PTHREAD_LIBS=${PTHREAD_LIBS} $$gettext/' ${WRKSRC}/build/pkgs/git/spkg-install -# Create the wrappers for the compiler invocations. +# Create wrapper for invocation of make. @${MKDIR} ${WRKSRC}/local/bin @${LN} -s -f ${LOCALBASE}/bin/gmake ${WRKSRC}/local/bin/make - @${SED} -e "s#%%CC%%#`which ${CC}`#" \ - -e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \ - ${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/cc - @${CHMOD} +x ${WRKSRC}/local/bin/cc - @${LN} -s -f cc ${WRKSRC}/local/bin/gcc - @${SED} -e "s#%%CC%%#`which ${CXX}`#" \ - -e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \ - ${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/c++ - @${CHMOD} +x ${WRKSRC}/local/bin/c++ - @${LN} -s -f c++ ${WRKSRC}/local/bin/g++ - @${SED} -e "s#%%CC%%#`which ${FC}`#" \ - -e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \ - ${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/gfortran - @${CHMOD} +x ${WRKSRC}/local/bin/gfortran post-build: ${RM} -rf ${WRKSRC}/tmp/.sage @@ -135,12 +97,6 @@ post-install: BROKEN= POSIX semaphores are required, and the support only works in FreeBSD 7-STABLE and later .endif -.if ${PORT_OPTIONS:M387} -FPM_FLAG= -mfpmath=387 -.else -FPM_FLAG= -.endif - MAKE_ENV+= MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}" .ifdef MAINTAINER_MODE @@ -152,9 +108,13 @@ test-fbsd-patches: patch b=$${d##*/}-`${CAT} $$d/package-version.txt | ${SED} 's/\.p.*//'`; \ c=${WRKSRC}/upstream/$$b.tar.bz2 ; \ if [ ! -e $$c ]; then \ - ${ECHO_MSG} Couldn\'t find $$c; \ - exit 1; \ + c=${WRKSRC}/upstream/$$b.tar.gz ; \ + if [ ! -e $$c ]; then \ + ${ECHO_MSG} Couldn\'t find $$c; \ + exit 1; \ + fi; \ fi; \ + b=`echo $$b | sed 's/python/Python/'` ; \ if ! (cd $$d && tar xf $$c && ${MV} $$b src); then \ ${ECHO_MSG} Unable to unarchive $$c; \ exit 1; \ Modified: head/math/sage/distinfo ============================================================================== --- head/math/sage/distinfo Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/distinfo Sun Dec 7 16:01:20 2014 (r374215) @@ -1,4 +1,4 @@ -SHA256 (sage-6.2.tar.gz) = ca9759fd1d38f51f5187907782c73682cba7dec04d1f6aba6e502084ab4035bb -SIZE (sage-6.2.tar.gz) = 424950536 +SHA256 (sage-6.4.tar.gz) = d37143a1eb9af6c6b46d95e421bbe077c608f5ae96d68697aba5f1a05b344449 +SIZE (sage-6.4.tar.gz) = 578695789 SHA256 (python/Python-2.7.6.tar.xz) = 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 SIZE (python/Python-2.7.6.tar.xz) = 10431288 Modified: head/math/sage/files/patch-build_pkgs_cephes_spkg-install ============================================================================== --- head/math/sage/files/patch-build_pkgs_cephes_spkg-install Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_cephes_spkg-install Sun Dec 7 16:01:20 2014 (r374215) @@ -1,6 +1,16 @@ ---- build/pkgs/cephes/spkg-install-orig 2013-03-30 20:48:35.000000000 +0000 -+++ build/pkgs/cephes/spkg-install 2013-03-30 20:48:57.000000000 +0000 -@@ -24,6 +24,8 @@ +--- build/pkgs/cephes/spkg-install.orig 2014-11-14 12:09:55.000000000 +0000 ++++ build/pkgs/cephes/spkg-install 2014-12-06 23:43:50.000000000 +0000 +@@ -11,6 +11,9 @@ + exit 0 + fi + ++# Not working properly with FreeBSD right now. ++exit 0 ++ + CUR=`pwd` + cd src + +@@ -24,6 +27,8 @@ fi done Added: head/math/sage/files/patch-build_pkgs_gd_spkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_gd_spkg-install Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,12 @@ +--- build/pkgs/gd/spkg-install-orig 2014-12-06 21:44:37.000000000 +0000 ++++ build/pkgs/gd/spkg-install 2014-12-06 21:47:08.000000000 +0000 +@@ -24,7 +24,8 @@ + + # Needed to correctly pickup libiconv on FreeBSD + if [ `uname` = "FreeBSD" ] ; then +- LDFLAGS="-L/usr/local/lib"; export LDFLAGS ++ LDFLAGS="-L${LOCALBASE}/lib"; export LDFLAGS ++ CFLAGS="-I${LOCALBASE}/include"; export CFLAGS + fi + + # needed to pick up zlib.h Added: head/math/sage/files/patch-build_pkgs_iml_spkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_iml_spkg-install Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,20 @@ +--- build/pkgs/iml/spkg-install-orig 2014-12-06 21:45:54.000000000 +0000 ++++ build/pkgs/iml/spkg-install 2014-12-06 21:50:08.000000000 +0000 +@@ -18,6 +18,7 @@ + fi + done + ++export CFLAGS="-I${LOCALBASE}/include $CFLAGS" + + if [ "$SAGE_DEBUG" = "yes" ]; then + echo "Building a debug version of IML." +@@ -38,6 +39,9 @@ + EXTRA_BLAS="--with-cblas=-lcblas" + fi + ++aclocal ++automake --add-missing ++autoconf + ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \ + --enable-shared --with-default="$SAGE_LOCAL" "$EXTRA_BLAS" + if [ $? -ne 0 ]; then Added: head/math/sage/files/patch-build_pkgs_m4rie_spkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_m4rie_spkg-install Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,12 @@ +--- build/pkgs/m4rie/spkg-install-orig 2014-12-06 21:51:23.000000000 +0000 ++++ build/pkgs/m4rie/spkg-install 2014-12-06 21:51:46.000000000 +0000 +@@ -51,6 +51,9 @@ + # build M4RIE + + cd $ROOT_DIR/src/ ++aclocal ++automake --add-missing ++autoconf + ./configure \ + --prefix="$SAGE_LOCAL" \ + --libdir="$SAGE_LOCAL/lib" \ Added: head/math/sage/files/patch-build_pkgs_maxima_spkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_maxima_spkg-install Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,11 @@ +--- build/pkgs/maxima/spkg-install-orig 2014-12-06 21:53:38.000000000 +0000 ++++ build/pkgs/maxima/spkg-install 2014-12-06 21:54:40.000000000 +0000 +@@ -51,6 +51,8 @@ + ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" --enable-ecl git_found=false + check_error "Failed to configure Maxima." + ++# Remove extraneous spaces created in some of the flags passed to cc ++sed -i.bak 's/" /"/' src/autoconf-variables.lisp + + # Touching html and info files to avoid to regenerate them. + # This must be done after configuration since the timestamps need Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Doc-library-fcntl.rst ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Doc-library-fcntl.rst Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Doc-library-fcntl.rst Sun Dec 7 16:01:20 2014 (r374215) @@ -1,14 +1,13 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_Doc-library-fcntl.rst 2014-05-31 00:35:21.000000000 +0000 -@@ -0,0 +1,11 @@ -+--- src/Doc/library/fcntl.rst.orig 2010-08-14 16:19:09.194215129 +0800 -++++ src/Doc/library/fcntl.rst 2010-08-14 16:19:36.999453016 +0800 -+@@ -50,8 +50,6 @@ +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Doc__library__fcntl.rst 2014-11-18 03:37:12.000000000 +0000 +@@ -0,0 +1,10 @@ ++--- src/./Doc/library/fcntl.rst.orig 2014-07-03 21:53:41.473098625 +1000 +++++ src/./Doc/library/fcntl.rst 2014-07-03 21:54:04.342833056 +1000 ++@@ -50,7 +50,6 @@ + operations are typically defined in the library module :mod:`termios` and the + argument handling is even more complicated. + +- The op parameter is limited to values that can fit in 32-bits. -+- -+ The parameter *arg* can be one of an integer, absent (treated identically to the -+ integer ``0``), an object supporting the read-only buffer interface (most likely -+ a plain Python string) or an object supporting the read-write buffer interface. ++ Additional constants of interest for use as the *op* argument can be ++ found in the :mod:`termios` module, under the same names as used in ++ the relevant C header files. Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib__distutils__unixccompiler.py ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib__distutils__unixccompiler.py Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib__distutils__unixccompiler.py Sun Dec 7 16:01:20 2014 (r374215) @@ -1,5 +1,5 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_Lib__distutils__unixccompiler.py 2014-05-31 00:35:21.000000000 +0000 +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Lib__distutils__unixccompiler.py 2014-11-18 03:37:12.000000000 +0000 @@ -0,0 +1,15 @@ +# Description: Some python extensions can't be compiled with clang 3.4 +# Issue ID: http://bugs.python.org/issue20767 Added: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib_distutils_command_build_scripts.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib_distutils_command_build_scripts.py Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,20 @@ +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Lib_distutils_command_build_scripts.py 2014-11-18 03:37:12.000000000 +0000 +@@ -0,0 +1,17 @@ ++# Description: A non-invasive partial backport of the Python3 distutils behaviour. ++# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on ++# installation. ++# Submitted by: mva ++ ++--- src/Lib/distutils/command/build_scripts.py.orig 2014-07-26 11:52:20.000000000 +0200 +++++ src/Lib/distutils/command/build_scripts.py 2014-07-26 11:52:56.000000000 +0200 ++@@ -126,6 +126,9 @@ ++ file, oldmode, newmode) ++ os.chmod(file, newmode) ++ +++ # XXX should we modify self.outfiles? +++ return outfiles +++ ++ # copy_scripts () ++ ++ # class build_scripts Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Makefile.pre.in ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Makefile.pre.in Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Makefile.pre.in Sun Dec 7 16:01:20 2014 (r374215) @@ -1,54 +1,21 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_Makefile.pre.in 2014-05-31 00:35:21.000000000 +0000 -@@ -0,0 +1,51 @@ -+# Description: Fix out-of-tree build as a result of upstream #15819 -+# Submitted by: rm (r318353) -+# Issue ID: http://bugs.python.org/issue15819#msg203348 +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Makefile.pre.in 2014-11-18 03:37:12.000000000 +0000 +@@ -0,0 +1,18 @@ ++# Description: Link scripts in the same way Python3 does ++# Submitted by: mva + -+# Description: Run pycompile only once -+# Submitted by: antoine (r350207) -+# TODO: ? -+ -+# Description: Run ranlib before installing the library read-only -+# Submitted by: antoine@ (r350207) -+# TODO: Upstream -+ -+--- src/./Makefile.pre.in.orig 2013-11-10 07:36:41.000000000 +0000 -++++ src/./Makefile.pre.in 2014-04-04 09:16:00.000000000 +0000 -+@@ -285,9 +285,9 @@ -+ -+ ########################################################################## -+ # AST -+-AST_H_DIR= Include -++AST_H_DIR= $(srcdir)/Include -+ AST_H= $(AST_H_DIR)/Python-ast.h -+-AST_C_DIR= Python -++AST_C_DIR= $(srcdir)/Python -+ AST_C= $(AST_C_DIR)/Python-ast.c -+ AST_ASDL= $(srcdir)/Parser/Python.asdl ++--- src/Makefile.pre.in.orig 2014-06-30 04:05:39.000000000 +0200 +++++ src/Makefile.pre.in 2014-07-26 11:09:46.000000000 +0200 ++@@ -868,6 +868,12 @@ ++ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) ++ -rm -f $(DESTDIR)$(LIBPC)/python.pc ++ (cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc) +++ -rm -f $(DESTDIR)$(BINDIR)/idle +++ (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2) +++ -rm -f $(DESTDIR)$(BINDIR)/pydoc +++ (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc2) +++ -rm -f $(DESTDIR)$(BINDIR)/2to3 +++ (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) + -+@@ -1006,12 +1006,12 @@ -+ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ -+ fi -+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -++ $(PYTHON_FOR_BUILD) -B -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ -d $(LIBDEST) -f \ -+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ -+ $(DESTDIR)$(LIBDEST) -+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -++ $(PYTHON_FOR_BUILD) -B -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ -d $(LIBDEST) -f \ -+ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ -+ $(DESTDIR)$(LIBDEST) -+@@ -1089,8 +1089,8 @@ -+ if test "$(SO)" = .dll; then \ -+ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ -+ else \ -++ $(RANLIB) $(LIBRARY) ; \ -+ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -+- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -+ fi; \ -+ else \ -+ echo Skip install of $(LIBRARY) - use make frameworkinstall; \ ++ # Install the interpreter with $(VERSION) affixed ++ # This goes into $(exec_prefix) Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-_ctypes-libffi-configure ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-_ctypes-libffi-configure Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-_ctypes-libffi-configure Sun Dec 7 16:01:20 2014 (r374215) @@ -1,5 +1,5 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_Modules-_ctypes-libffi-configure 2014-05-31 00:35:21.000000000 +0000 +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Modules-_ctypes-libffi-configure 2014-11-18 03:37:12.000000000 +0000 @@ -0,0 +1,22 @@ +--- src/Modules/_ctypes/libffi/configure.orig 2010-03-19 19:59:20.000000000 +0100 ++++ src/Modules/_ctypes/libffi/configure 2011-03-06 09:20:16.000000000 +0100 Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-fcntlmodule.c ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-fcntlmodule.c Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-fcntlmodule.c Sun Dec 7 16:01:20 2014 (r374215) @@ -1,9 +1,9 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_Modules-fcntlmodule.c 2014-05-31 00:35:21.000000000 +0000 +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Modules__fcntlmodule.c 2014-11-18 03:37:12.000000000 +0000 @@ -0,0 +1,53 @@ -+--- src/Modules/fcntlmodule.c.orig 2010-08-14 16:36:54.991363730 +0800 -++++ src/Modules/fcntlmodule.c 2010-08-14 16:41:05.555822031 +0800 -+@@ -97,20 +97,15 @@ ++--- src/./Modules/fcntlmodule.c.orig 2014-07-03 21:57:10.429953240 +1000 +++++ src/./Modules/fcntlmodule.c 2014-07-03 21:59:36.517210444 +1000 ++@@ -98,20 +98,15 @@ + { + #define IOCTL_BUFSZ 1024 + int fd; @@ -15,7 +15,7 @@ + whereas the system expects it to be a 32bit bit field value + regardless of it being passed as an int or unsigned long on +- various platforms. See the termios.TIOCSWINSZ constant across -+- platforms for an example of thise. ++- platforms for an example of this. +- +- If any of the 64bit platforms ever decide to use more than 32bits +- in their unsigned long ioctl codes this will break and need @@ -27,7 +27,7 @@ + int arg; + int ret; + char *str; -+@@ -118,7 +113,7 @@ ++@@ -119,7 +114,7 @@ + int mutate_arg = 1; + char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ + @@ -36,7 +36,7 @@ + conv_descriptor, &fd, &code, + &str, &len, &mutate_arg)) { + char *arg; -+@@ -169,7 +164,7 @@ ++@@ -170,7 +165,7 @@ + } + + PyErr_Clear(); @@ -45,7 +45,7 @@ + conv_descriptor, &fd, &code, &str, &len)) { + if (len > IOCTL_BUFSZ) { + PyErr_SetString(PyExc_ValueError, -+@@ -191,7 +186,7 @@ ++@@ -192,7 +187,7 @@ + PyErr_Clear(); + arg = 0; + if (!PyArg_ParseTuple(args, Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c Sun Dec 7 16:01:20 2014 (r374215) @@ -1,5 +1,5 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c 2014-05-31 00:35:21.000000000 +0000 +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c 2014-11-18 03:37:12.000000000 +0000 @@ -0,0 +1,36 @@ +# Description: Fix _ctypes abort on import for FreeBSD/ARM. This is an issue +# for anything !apple that is using the libcompiler_rt provided by clang on arm Added: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_issue21166 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_issue21166 Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,77 @@ +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_issue21166 2014-11-18 03:37:12.000000000 +0000 +@@ -0,0 +1,74 @@ ++# HG changeset patch ++# User Ned Deily <nad@acm.org> ++# Date 1408739459 25200 ++# Node ID edb6b282469ea0e8f819d0310afb2937b59dd6b9 ++# Parent 727fd4ead3fd854e900ed89362714ad1f7434e5a ++Issue #21166: Prevent possible segfaults and other random failures of ++python --generate-posix-vars in pybuilddir.txt build target by ensuring ++that pybuilddir.txt is always regenerated when configure is run and ++that the newly built skeleton python does not inadvertently import ++modules from previously installed instances. ++ ++diff --git a/Makefile.pre.in b/Makefile.pre.in ++--- src/Makefile.pre.in +++++ src/Makefile.pre.in ++@@ -447,8 +447,18 @@ platform: $(BUILDPYTHON) pybuilddir.txt ++ # Create build directory and generate the sysconfig build-time data there. ++ # pybuilddir.txt contains the name of the build dir and is used for ++ # sys.path fixup -- see Modules/getpath.c. +++# Since this step runs before shared modules are built, try to avoid bootstrap +++# problems by creating a dummy pybuildstr.txt just to allow interpreter +++# initialization to succeed. It will be overwritten by generate-posix-vars +++# or removed in case of failure. ++ pybuilddir.txt: $(BUILDPYTHON) ++- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars +++ @echo "none" > ./pybuilddir.txt +++ $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ +++ if test $$? -ne 0 ; then \ +++ echo "generate-posix-vars failed" ; \ +++ rm -f ./pybuilddir.txt ; \ +++ exit 1 ; \ +++ fi ++ ++ # Build the shared modules ++ # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for ++diff --git a/Misc/NEWS b/Misc/NEWS ++--- src/Misc/NEWS +++++ src/Misc/NEWS ++@@ -120,6 +120,9 @@ Build ++ - Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/ ++ now display special message when and only when there are failures. ++ +++- Issue #21166: Prevent possible segfaults and other random failures of +++ python --generate-posix-vars in pybuilddir.txt build target. +++ ++ Windows ++ ------- ++ ++diff --git a/configure b/configure ++--- src/configure +++++ src/configure ++@@ -2857,6 +2857,9 @@ case $host_os in *\ *) host_os=`echo "$h ++ ++ ++ +++# pybuilddir.txt will be created by --generate-posix-vars in the Makefile +++rm -f pybuilddir.txt +++ ++ if test "$cross_compiling" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5 ++ $as_echo_n "checking for python interpreter for cross build... " >&6; } ++diff --git a/configure.ac b/configure.ac ++--- src/configure.ac +++++ src/configure.ac ++@@ -16,6 +16,9 @@ AC_CANONICAL_HOST ++ AC_SUBST(build) ++ AC_SUBST(host) ++ +++# pybuilddir.txt will be created by --generate-posix-vars in the Makefile +++rm -f pybuilddir.txt +++ ++ if test "$cross_compiling" = yes; then ++ AC_MSG_CHECKING([for python interpreter for cross build]) ++ if test -z "$PYTHON_FOR_BUILD"; then ++ Added: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_pr192365 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_pr192365 Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,61 @@ +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_pr192365 2014-11-18 03:37:12.000000000 +0000 +@@ -0,0 +1,58 @@ ++# Description: do not define __BSD_VISIBLE/_XOPEN_SOURCE/_POSIX_C_SOURCE ++# in include/python2.7/pyconfig.h ++# Submitted by: antoine ++ ++--- src/configure.orig 2014-09-06 14:42:50 UTC +++++ src/configure ++@@ -2919,13 +2919,6 @@ ++ ++ ++ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables ++-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable ++-# them. ++- ++-$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h ++- ++- ++-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables ++ # u_int on Irix 5.3. Defining _BSD_TYPES brings it back. ++ ++ $as_echo "#define _BSD_TYPES 1" >>confdefs.h ++@@ -3293,9 +3286,8 @@ ++ # but used in struct sockaddr.sa_family. Reported by Tim Rice. ++ SCO_SV/3.2) ++ define_xopen_source=no;; ++- # On FreeBSD 4, the math functions C89 does not cover are never defined ++- # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them. ++- FreeBSD/4.*) +++ # On FreeBSD, defining _XOPEN_SOURCE to 600 requests a strict environment. +++ FreeBSD/*) ++ define_xopen_source=no;; ++ # On MacOS X 10.2, a bug in ncurses.h means that it craps out if ++ # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which ++--- src/configure.ac.orig 2014-09-06 14:42:50 UTC +++++ src/configure.ac ++@@ -88,11 +88,6 @@ ++ AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features]) ++ ++ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables ++-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable ++-# them. ++-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features]) ++- ++-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables ++ # u_int on Irix 5.3. Defining _BSD_TYPES brings it back. ++ AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int]) ++ ++@@ -426,9 +421,8 @@ ++ # but used in struct sockaddr.sa_family. Reported by Tim Rice. ++ SCO_SV/3.2) ++ define_xopen_source=no;; ++- # On FreeBSD 4, the math functions C89 does not cover are never defined ++- # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them. ++- FreeBSD/4.*) +++ # On FreeBSD, defining _XOPEN_SOURCE to 600 requests a strict environment. +++ FreeBSD/*) ++ define_xopen_source=no;; ++ # On MacOS X 10.2, a bug in ncurses.h means that it craps out if ++ # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which Modified: head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_setup.py ============================================================================== --- head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_setup.py Sun Dec 7 16:01:11 2014 (r374214) +++ head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_setup.py Sun Dec 7 16:01:20 2014 (r374215) @@ -1,60 +1,16 @@ ---- /dev/null 2014-05-31 00:44:00.000000000 +0000 -+++ build/pkgs/python/fbsd-patch-src_setup.py 2014-05-31 00:38:21.000000000 +0000 -@@ -0,0 +1,74 @@ -+--- src/setup.py.orig 2013-04-06 18:02:41.000000000 +0400 -++++ src/setup.py 2013-04-07 10:52:47.000000000 +0400 -+@@ -755,7 +755,7 @@ -+ elif curses_library: -+ readline_libs.append(curses_library) -+ elif self.compiler.find_library_file(lib_dirs + -+- ['/usr/lib/termcap'], -++ ['/usr/lib', '/usr/lib/termcap'], -+ 'termcap'): -+ readline_libs.append('termcap') -+ exts.append( Extension('readline', ['readline.c'], -+@@ -862,6 +862,8 @@ -+ # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash -+ exts.append( Extension('_sha256', ['sha256module.c']) ) -+ exts.append( Extension('_sha512', ['sha512module.c']) ) -++ else: -++ open('.without_own_sha', 'w') -+ -+ # Modules that provide persistent dictionary-like semantics. You will -+ # probably want to arrange for at least one of them to be available on -+@@ -1208,7 +1210,7 @@ -+ sysroot = macosx_sdk_root() -+ f = os.path.join(sysroot, f[1:]) -+ -+- if os.path.exists(f) and not db_incs: -++ if os.path.exists(f): -+ data = open(f).read() -+ m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) -+ if m is not None: -+@@ -1540,7 +1544,7 @@ -+ macros = dict() -+ libraries = [] -+ -+- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): -++ elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'): -+ # FreeBSD's P1003.1b semaphore support is very experimental -+ # and has many known problems. (as of June 2008) -+ macros = dict() -+@@ -1592,7 +1596,7 @@ -+ missing.append('linuxaudiodev') -+ -+ if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', -+- 'freebsd7', 'freebsd8') -++ 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11') -+ or host_platform.startswith("gnukfreebsd")): -+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) -+ else: +--- /dev/null 2014-11-18 03:33:07.000000000 +0000 ++++ build/pkgs/python/fbsd-patch-src_setup.py 2014-11-18 03:37:12.000000000 +0000 +@@ -0,0 +1,30 @@ ++# Description: SEM option patch. If SEM is enabled, enable the build properly ++# Not upstreamed ++ +--- src/setup.py.orig 2013-04-07 11:07:43.000000000 +0400 ++++ src/setup.py 2013-04-07 11:16:36.000000000 +0400 -+@@ -1544,10 +1544,22 @@ ++@@ -1551,10 +1551,22 @@ + macros = dict() + libraries = [] + -+- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'): ++- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): ++ elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6'): + # FreeBSD's P1003.1b semaphore support is very experimental + # and has many known problems. (as of June 2008) Added: head/math/sage/files/patch-build_pkgs_zlib_spkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-build_pkgs_zlib_spkg-install Sun Dec 7 16:01:20 2014 (r374215) @@ -0,0 +1,12 @@ +--- build/pkgs/zlib/spkg-install-orig 2014-12-06 21:41:30.000000000 +0000 ++++ build/pkgs/zlib/spkg-install 2014-12-06 21:42:12.000000000 +0000 +@@ -1,5 +1,9 @@ + #!/usr/bin/env bash + ++# Use system zlibc because on FreeBSD the following doesn't build relocatable ++# libraries. ++exit 0 ++ + if [ -z "$SAGE_LOCAL" ]; then + echo >&2 "Error: SAGE_LOCAL undefined - exiting..." + echo >&2 "Maybe run 'sage -sh'?"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412071601.sB7G1LFx073166>