svn commit: r341797 - in head/math/sage: . files
Stephen Montgomery-Smith
stephen at FreeBSD.org
Thu Jan 30 01:00:14 UTC 2014
Author: stephen
Date: Thu Jan 30 01:00:13 2014
New Revision: 341797
URL: http://svnweb.freebsd.org/changeset/ports/341797
QAT: https://qat.redports.org/buildarchive/r341797/
Log:
- Update to 6.0. This was quite an overhaul since the directory structure
greatly changed.
- Provide support for FreeBSD-10.
Added:
head/math/sage/files/patch-build_pkgs_cephes_spkg-install (contents, props changed)
head/math/sage/files/patch-build_pkgs_eclib_fbsd-patch-src_libsrc_eclib_interface.h (contents, props changed)
head/math/sage/files/patch-build_pkgs_maxima_fbsd-patch-src_interfaces_xmaxima_Makefile.in (contents, props changed)
head/math/sage/files/patch-build_pkgs_mpir_patches_configure.patch (contents, props changed)
head/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure (contents, props changed)
head/math/sage/files/patch-build_pkgs_numpy_fbsd-patch-src_numpy_distutils_system_info.py (contents, props changed)
head/math/sage/files/patch-build_pkgs_ppl_fbsd-patch-src_demos_ppl_lpsol_ppl_lpsol.c (contents, props changed)
head/math/sage/files/patch-build_pkgs_pycrypto_fbsd-patch-src.libtom.tomcrypt_pk.h (contents, props changed)
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Doc_library_fcntl.rst (contents, props changed)
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules__ctypes_libffi_configure (contents, props changed)
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules_fcntlmodule.c (contents, props changed)
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Python_thread_pthread.h (contents, props changed)
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_setup.py (contents, props changed)
head/math/sage/files/patch-build_pkgs_sympow_fbsd-patch-src_disk.c (contents, props changed)
head/math/sage/files/patch-src_bin_sage-spkg (contents, props changed)
head/math/sage/files/patch-src_doc_common_builder.py (contents, props changed)
Deleted:
head/math/sage/files/spkg-patch-cephes_-_spkg-install
head/math/sage/files/spkg-patch-eclib_-_src_libsrc_eclib_interface.h
head/math/sage/files/spkg-patch-maxima_-_src_interfaces_xmaxima_Makefile.in
head/math/sage/files/spkg-patch-ncurses_-_src_configure
head/math/sage/files/spkg-patch-numpy_-_src_numpy_distutils_system_info.py
head/math/sage/files/spkg-patch-ppl_-_src_demos_ppl_lpsol_ppl_lpsol.c
head/math/sage/files/spkg-patch-pycrypto_-_patches_src.libtom.tomcrypt_pk.h
head/math/sage/files/spkg-patch-pycrypto_-_spkg-install
head/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
head/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
head/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
head/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
head/math/sage/files/spkg-patch-python_-_src_setup.py
head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py
head/math/sage/files/spkg-patch-sympow_-_src_disk.c
Modified:
head/math/sage/Makefile
head/math/sage/distinfo
head/math/sage/pkg-descr
Modified: head/math/sage/Makefile
==============================================================================
--- head/math/sage/Makefile Thu Jan 30 00:41:27 2014 (r341796)
+++ head/math/sage/Makefile Thu Jan 30 01:00:13 2014 (r341797)
@@ -2,19 +2,20 @@
# $FreeBSD$
PORTNAME= sage
-PORTVERSION= 5.13
+PORTVERSION= 6.0
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
EXTRACT_SUFX= .tar
MAINTAINER= stephen at FreeBSD.org
COMMENT= Open source Mathematics software
-BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
+ convert:${PORTSDIR}/graphics/ImageMagick \
+ ffmpeg:${PORTSDIR}/multimedia/ffmpeg
LIB_DEPENDS= atlas:${PORTSDIR}/math/atlas \
lapack:${PORTSDIR}/math/lapack \
jpeg:${PORTSDIR}/graphics/jpeg
@@ -26,7 +27,9 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bas
OPTIONS_DEFINE_amd64= 387
387_DESC= Use 387 instead of SSE FPU
+# Keep NO_SAGE set, since otherwise the resulting package is huge.
NO_STAGE= yes
+
.include <bsd.port.options.mk>
PLIST_FILES= bin/sage
@@ -36,6 +39,7 @@ USE_TK= yes
USE_GMAKE= yes
USE_TEX= latex:build
USES= iconv
+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}
@@ -66,6 +70,8 @@ LATEST_LINK= sage-math # Conflicts with
MAKE_ARGS+= ARCH="${AR}"
post-patch:
+ ${REINPLACE_CMD} 's/$$MAKE $$gettext/$$MAKE PTHREAD_LIBS=${PTHREAD_LIBS} $$gettext/' ${WRKSRC}/build/pkgs/git/spkg-install
+
# Create the wrappers for the compiler invocations.
@${MKDIR} ${WRKSRC}/local/bin
@${LN} -s -f ${LOCALBASE}/bin/gmake ${WRKSRC}/local/bin/make
@@ -84,44 +90,6 @@ post-patch:
${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/gfortran
@${CHMOD} +x ${WRKSRC}/local/bin/gfortran
-# Apply the patches to the appropriate xz'ed tarballs contained in
-# ${WRKSRC}/spkg/standard. The names of the patches are
-# spkg-${GENERIC_NAME_OF_TARBALL}_-_${NAME_OF_PATCH}.
-# The actual name of the tarball will be deduced from the second line of the
-# patch.
-
- @${MKDIR} ${WRKSRC}/tmp
- @${RM} -rf ${WRKSRC}/tmp/*
- @for p in ${FILESDIR}/spkg-patch-*; do \
- q=$${p#*/spkg-patch-}; \
- original_name=$${q%_-_*}; \
- actual_name=`cat $$p | ${HEAD} -2 | ${TAIL} -1 | ${SED} -e 's/+++ //' -e 's|/.*||'`; \
- if ! [ -e ${WRKSRC}/spkg/standard/$$actual_name.spkg ]; then \
- ${ECHO_MSG} "$$actual_name not found."; \
- exit 1; \
- fi; \
- tarballs="$$tarballs $$original_name|$$actual_name"; \
- done ;\
- tarballs=`${PRINTF} "%s\n" $$tarballs | ${SORT} -u`; \
- \
- cd ${WRKSRC}/tmp || exit 1; \
- for t in $$tarballs; do \
- original_name=$${t%|*}; actual_name=$${t#*|}; \
- f=${WRKSRC}/spkg/standard/$$actual_name.spkg; \
- if [ -e $$f-orig ]; then \
- ${MV} $$f-orig $$f; \
- fi; \
- ${TAR} -xf $$f; \
- ${ECHO_MSG} "Patching $$actual_name:"; \
- for p in ${FILESDIR}/spkg-patch-$${original_name}_-_*; do \
- ${ECHO_MSG} " applying $${p#*_-_}" ; \
- ${PATCH} < $$p 2>/dev/null || exit 1; \
- done; \
- ${MV} $$f $$f-orig; \
- ${TAR} -cyf $$f $$actual_name; \
- ${RM} -rf $$actual_name; \
- done
-
post-build:
${RM} -rf ${WRKSRC}/tmp/.sage
${CHMOD} -R a+rX ${WRKSRC}
@@ -130,18 +98,31 @@ check regression-test test: build
@${ECHO_MSG} This test can also be performed after installation by typing \"sage -testall\".
@${ECHO_MSG}
cd ${WRKSRC} && ${SETENV} DOT_SAGE=${WRKSRC}/tmp/.sage ./sage -testall
- ${RM} -f ${WRKSRC}/python.core
+ ${RM} -f ${WRKSRC}/python*.core
INSTALL_SAGE_DIR= ${PREFIX}/${PORTNAME}-${PORTVERSION}
+pre-install:
+ @${ECHO_MSG}
+ @${ECHO_MSG} \# Instead of doing \"make install\", you can simply perform the commands:
+ @${ECHO_MSG}
+ @${ECHO_MSG} ${MV} ${WRKSRC} ${PREFIX}/.
+ @${ECHO_MSG}
+ @${ECHO_MSG} \# The next four lines are only needed if you want sage in ${PREFIX}/bin.
+ @${ECHO_MSG}
+ @${ECHO_MSG} "${SED} -e \"s+#SAGE_ROOT.*+SAGE_ROOT=${INSTALL_SAGE_DIR}+\" \\"
+ @${ECHO_MSG} " ${INSTALL_SAGE_DIR}/sage > ${PREFIX}/bin/sage"
+ @${ECHO_MSG} ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/sage
+ @${ECHO_MSG} ${CHMOD} ${BINMODE} ${PREFIX}/bin/sage
+ @${ECHO_MSG}
+ @${ECHO_MSG} \# The next line will provide write protection for sage.
+ @${ECHO_MSG} ${CHOWN} -hR ${BINOWN}:${BINGRP} ${INSTALL_SAGE_DIR}
+ @${ECHO_MSG}
+ @sleep 60
+
do-install:
cd ${WRKDIR} && ${FIND} -s ${WRKSRC} | \
- ${GREP} -v '^${WRKSRC}/spkg/standard/' | \
- ${GREP} -v '^${WRKSRC}/spkg/optional/' | \
- ${GREP} -v '^${WRKSRC}/spkg/logs/' | \
- ${GREP} -v '^${WRKSRC}/spkg/build/' | \
+ ${GREP} -v '^${WRKSRC}/upstream/' | \
${GREP} -v '^${WRKSRC}/tmp' | \
- ${GREP} -v -E '^${WRKSRC}/[^\/]+\.log$$' | \
- ${GREP} -v '^${WRKSRC}/Makefile' | \
${SED} -e 's#${WRKDIR}/##' | \
${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${PREFIX}
${ECHO_CMD} | ${SETENV} DOT_SAGE=${INSTALL_SAGE_DIR}/tmp/.sage ${INSTALL_SAGE_DIR}/sage
Modified: head/math/sage/distinfo
==============================================================================
--- head/math/sage/distinfo Thu Jan 30 00:41:27 2014 (r341796)
+++ head/math/sage/distinfo Thu Jan 30 01:00:13 2014 (r341797)
@@ -1,2 +1,2 @@
-SHA256 (sage-5.13.tar) = 6e62495954bdc1c397fa1b7658b2825b4e6d1c26ac12b842a15eab61a5dabc97
-SIZE (sage-5.13.tar) = 361799680
+SHA256 (sage-6.0.tar) = 40a76473efa1c725ccfb3955bf5b95ea4578cc654f079b0f92fad4f4243302df
+SIZE (sage-6.0.tar) = 404654517
Added: head/math/sage/files/patch-build_pkgs_cephes_spkg-install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_cephes_spkg-install Thu Jan 30 01:00:13 2014 (r341797)
@@ -0,0 +1,11 @@
+--- 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 @@
+ fi
+ done
+
++sed -i .orig 's|.*printf|//&1|' */mtherr.c
++
+ echo "Building Cephes..."
+ $MAKE
+ if [ $? -ne 0 ]; then
Added: head/math/sage/files/patch-build_pkgs_eclib_fbsd-patch-src_libsrc_eclib_interface.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_eclib_fbsd-patch-src_libsrc_eclib_interface.h Thu Jan 30 01:00:13 2014 (r341797)
@@ -0,0 +1,13 @@
+--- /dev/null 2014-01-29 03:00:00.000000000 +0000
++++ build/pkgs/eclib/fbsd-patch-src_libsrc_eclib_interface.h 2014-01-29 03:01:19.000000000 +0000
+@@ -0,0 +1,10 @@
++--- src/libsrc/eclib/interface.h-orig 2013-04-26 23:46:24.000000000 +0000
+++++ src/libsrc/eclib/interface.h 2013-04-26 23:47:09.000000000 +0000
++@@ -48,6 +48,7 @@
++ #include <iterator>
++ using namespace std;
++ #include "templates.h"
+++#include <stdint.h>
++
++ #ifndef MININT
++ #define MININT numeric_limits<int>::min()
Added: head/math/sage/files/patch-build_pkgs_maxima_fbsd-patch-src_interfaces_xmaxima_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_maxima_fbsd-patch-src_interfaces_xmaxima_Makefile.in Thu Jan 30 01:00:13 2014 (r341797)
@@ -0,0 +1,23 @@
+--- /dev/null 2014-01-29 03:00:00.000000000 +0000
++++ build/pkgs/maxima/fbsd-patch-src_interfaces_xmaxima_Makefile.in 2014-01-29 03:01:19.000000000 +0000
+@@ -0,0 +1,20 @@
++--- src/interfaces/xmaxima/Makefile.in-orig 2013-05-09 02:26:31.000000000 +0000
+++++ src/interfaces/xmaxima/Makefile.in 2013-05-09 02:30:12.000000000 +0000
++@@ -624,14 +624,10 @@
++ tclIndex:: $(TKSOURCES)
++ echo "source ../ObjTcl/Object.tcl; auto_mkindex . $(TKSOURCES)" | $(TCLSH)
++
++-# Create Tkmaxima/tclIndex if tclsh is available. Otherwise, create empty file
++-# to satisfy make.
+++# Create empty Tkmaxima/tclIndex, because attempting to create it using tclsh
+++# seems to soak up huge amounts of resources.
++ Tkmaxima/tclIndex: $(TKSOURCES)
++- $(TCLSH) < /dev/null > /dev/null 2>&1 && \
++- (cd Tkmaxima ; \
++- echo "source ../ObjTcl/Object.tcl; auto_mkindex . $(ALLFILES)" | \
++- $(TCLSH)) || \
++- touch Tkmaxima/tclIndex
+++ touch Tkmaxima/tclIndex
++
++ FORCE:
++ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Added: head/math/sage/files/patch-build_pkgs_mpir_patches_configure.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_mpir_patches_configure.patch Thu Jan 30 01:00:13 2014 (r341797)
@@ -0,0 +1,1187 @@
+--- build/pkgs/mpir/patches/configure.patch-orig 2014-01-29 21:20:07.000000000 +0000
++++ build/pkgs/mpir/patches/configure.patch 2014-01-29 21:21:10.000000000 +0000
+@@ -1,6 +1,6 @@
+-diff -dru src/acinclude.m4 b/acinclude.m4
+---- src/acinclude.m4 2011-07-27 00:59:54.000000000 -0700
+-+++ b/acinclude.m4 2012-06-19 12:53:56.000000000 -0700
++diff -ur src/acinclude.m4 b/acinclude.m4
++--- src/acinclude.m4 2014-01-29 21:06:09.000000000 +0000
+++++ b/acinclude.m4 2014-01-29 21:06:23.000000000 +0000
+ @@ -519,31 +519,45 @@
+ int cmov () { return (n >= 0 ? n : 0); }
+ ])
+@@ -57,52 +57,49 @@
+ ])
+
+ # __builtin_alloca is not available everywhere, check it exists before
+-diff -dru src/configure.in b/configure.in
+---- src/configure.in 2012-03-08 23:21:29.000000000 -0800
+-+++ b/configure.in 2012-06-19 12:53:56.000000000 -0700
+-@@ -1918,16 +1918,6 @@
++Only in b: acinclude.m4.orig
++diff -ur src/aclocal.m4 b/aclocal.m4
++--- src/aclocal.m4 2014-01-29 21:06:09.000000000 +0000
+++++ b/aclocal.m4 2012-10-03 20:07:32.000000000 +0000
++@@ -2421,7 +2421,7 @@
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++-freebsd1.*)
+++freebsd1*)
++ dynamic_linker=no
++ ;;
++
++@@ -2432,7 +2432,7 @@
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++- freebsd[[123]].*) objformat=aout ;;
+++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
+ fi
+- fi
+-
+--# The dead hand of AC_REQUIRE makes AC_PROG_LIBTOOL expand and execute
+--# AC_PROG_F77, even when F77 is not in the selected with_tags. This is
+--# probably harmless, but it's unsightly and bloats our configure, so pretend
+--# AC_PROG_F77 has been expanded already.
+--#
+--# FIXME: Rumour has it libtool will one day provide a way for a configure.in
+--# to say what it wants from among supported languages etc.
+--#
+--AC_PROVIDE([AC_PROG_F77])
+--
+- AC_PROG_LIBTOOL
+-
+- # Generate an error here if attempting to build both shared and static when
+-diff -dru src/yasm/Makefile.in b/yasm/Makefile.in
+---- src/yasm/Makefile.in 2012-03-10 23:16:35.000000000 -0800
+-+++ b/yasm/Makefile.in 2012-06-19 12:53:56.000000000 -0700
+-@@ -3747,7 +3747,8 @@
+- check-am: all-am
+- $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+--check:
+-+check: $(BUILT_SOURCES)
+-+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
+- all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h \
+- all-local
+- installdirs: installdirs-recursive
+-@@ -3755,7 +3756,8 @@
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(modincludedir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+- done
+--install:
+-+install: $(BUILT_SOURCES)
+-+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+- install-exec: install-exec-recursive
+- install-data: install-data-recursive
+- uninstall: uninstall-recursive
+-diff -dru src/configure b/configure
+---- src/configure 2012-06-19 12:53:56.000000000 -0700
+-+++ b/configure 2012-03-10 01:07:26.000000000 -0800
++@@ -5129,7 +5129,7 @@
++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++ ;;
++
++- freebsd1.*)
+++ freebsd1*)
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ ;;
++
++@@ -6152,7 +6152,7 @@
++ esac
++ ;;
++
++- freebsd[[12]].*)
+++ freebsd[[12]]*)
++ # C++ shared libraries reported to be fairly broken before
++ # switch to ELF
++ _LT_TAGVAR(ld_shlibs, $1)=no
++diff -ur src/configure b/configure
++--- src/configure 2014-01-29 21:06:09.000000000 +0000
+++++ b/configure 2014-01-29 21:06:23.000000000 +0000
+ @@ -2069,52 +2069,6 @@
+
+ } # ac_fn_cxx_try_link
+@@ -156,7 +153,7 @@
+ # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+ # ---------------------------------------------
+ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+-@@ -5311,11 +5265,13 @@
++@@ -5313,11 +5267,13 @@
+ on AIX 4.3 under "-maix64 -mpowerpc64 -mcpu=630". The -mcpu=630
+ option causes gcc to incorrectly select the 32-bit libgcc.a, not
+ the 64-bit one, and consequently it misses out on the __fixunsdfdi
+@@ -174,7 +171,7 @@
+ EOF
+ echo "Test compile: double -> ulong conversion" >&5
+ gmp_compile="$cc $cflags $cppflags conftest.c >&5"
+-@@ -5359,7 +5315,6 @@
++@@ -5361,7 +5317,6 @@
+
+
+
+@@ -182,7 +179,7 @@
+ if test "$gmp_prog_cc_works" = yes; then
+ # remove anything that might look like compiler output to our "||" expression
+ rm -f conftest* a.out b.out a.exe a_out.exe
+-@@ -5367,10 +5322,10 @@
++@@ -5369,10 +5324,10 @@
+ /* The following provokes an error from hppa gcc 2.95 under -mpa-risc-2-0 if
+ the assembler doesn't know hppa 2.0 instructions. fneg is a 2.0
+ instruction, and a negation like this comes out using it. */
+@@ -196,7 +193,7 @@
+ EOF
+ echo "Test compile: double negation" >&5
+ gmp_compile="$cc $cflags $cppflags conftest.c >&5"
+-@@ -5414,7 +5369,6 @@
++@@ -5416,7 +5371,6 @@
+
+
+
+@@ -204,7 +201,7 @@
+ if test "$gmp_prog_cc_works" = yes; then
+ # remove anything that might look like compiler output to our "||" expression
+ rm -f conftest* a.out b.out a.exe a_out.exe
+-@@ -5423,10 +5377,10 @@
++@@ -5425,10 +5379,10 @@
+ (cvtsd2ss) which will provoke an error if the assembler doesn't recognise
+ those instructions. Not sure how much of the gmp code will come out
+ wanting sse2, but it's easiest to reject an option we know is bad. */
+@@ -218,7 +215,7 @@
+ EOF
+ echo "Test compile: double -> float conversion" >&5
+ gmp_compile="$cc $cflags $cppflags conftest.c >&5"
+-@@ -5470,6 +5424,59 @@
++@@ -5472,6 +5426,59 @@
+
+
+
+@@ -278,7 +275,7 @@
+
+ # __builtin_alloca is not available everywhere, check it exists before
+ # seeing that it works
+-@@ -6572,11 +6579,13 @@
++@@ -6574,11 +6581,13 @@
+ on AIX 4.3 under "-maix64 -mpowerpc64 -mcpu=630". The -mcpu=630
+ option causes gcc to incorrectly select the 32-bit libgcc.a, not
+ the 64-bit one, and consequently it misses out on the __fixunsdfdi
+@@ -296,7 +293,7 @@
+ EOF
+ echo "Test compile: double -> ulong conversion" >&5
+ gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
+-@@ -6620,7 +6629,6 @@
++@@ -6622,7 +6631,6 @@
+
+
+
+@@ -304,7 +301,7 @@
+ if test "$gmp_prog_cc_works" = yes; then
+ # remove anything that might look like compiler output to our "||" expression
+ rm -f conftest* a.out b.out a.exe a_out.exe
+-@@ -6628,10 +6636,10 @@
++@@ -6630,10 +6638,10 @@
+ /* The following provokes an error from hppa gcc 2.95 under -mpa-risc-2-0 if
+ the assembler doesn't know hppa 2.0 instructions. fneg is a 2.0
+ instruction, and a negation like this comes out using it. */
+@@ -318,7 +315,7 @@
+ EOF
+ echo "Test compile: double negation" >&5
+ gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
+-@@ -6675,7 +6683,6 @@
++@@ -6677,7 +6685,6 @@
+
+
+
+@@ -326,7 +323,7 @@
+ if test "$gmp_prog_cc_works" = yes; then
+ # remove anything that might look like compiler output to our "||" expression
+ rm -f conftest* a.out b.out a.exe a_out.exe
+-@@ -6684,10 +6691,10 @@
++@@ -6686,10 +6693,10 @@
+ (cvtsd2ss) which will provoke an error if the assembler doesn't recognise
+ those instructions. Not sure how much of the gmp code will come out
+ wanting sse2, but it's easiest to reject an option we know is bad. */
+@@ -340,7 +337,7 @@
+ EOF
+ echo "Test compile: double -> float conversion" >&5
+ gmp_compile="$cc $cflags $cppflags $flag conftest.c >&5"
+-@@ -6731,6 +6738,59 @@
++@@ -6733,6 +6740,59 @@
+
+
+
+@@ -400,7 +397,7 @@
+
+ # __builtin_alloca is not available everywhere, check it exists before
+ # seeing that it works
+-@@ -11689,16 +11749,6 @@
++@@ -11691,16 +11751,6 @@
+ fi
+ fi
+
+@@ -417,7 +414,7 @@
+ case `pwd` in
+ *\ * | *\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+-@@ -14582,7 +14632,6 @@
++@@ -14584,7 +14634,6 @@
+
+
+
+@@ -425,7 +422,61 @@
+ # Set options
+
+
+-@@ -21736,2721 +21785,6 @@
++@@ -16358,7 +16407,7 @@
++ hardcode_shlibpath_var=no
++ ;;
++
++- freebsd1.*)
+++ freebsd1*)
++ ld_shlibs=no
++ ;;
++
++@@ -17352,7 +17401,7 @@
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++-freebsd1.*)
+++freebsd1*)
++ dynamic_linker=no
++ ;;
++
++@@ -17363,7 +17412,7 @@
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++- freebsd[123].*) objformat=aout ;;
+++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
++@@ -19325,7 +19374,7 @@
++ esac
++ ;;
++
++- freebsd[12].*)
+++ freebsd[12]*)
++ # C++ shared libraries reported to be fairly broken before
++ # switch to ELF
++ ld_shlibs_CXX=no
++@@ -21189,7 +21238,7 @@
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++-freebsd1.*)
+++freebsd1*)
++ dynamic_linker=no
++ ;;
++
++@@ -21200,7 +21249,7 @@
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++- freebsd[123].*) objformat=aout ;;
+++ freebsd[123]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
++@@ -21738,2919 +21787,204 @@
+
+
+
+@@ -463,11 +514,11 @@
+ -
+ -# Source file extension for f77 test sources.
+ -ac_ext=f
+--
++
+ -# Object file extension for compiled f77 test sources.
+ -objext=o
+ -objext_F77=$objext
+--
++
+ -# No sense in running all these tests if we already determined that
+ -# the F77 compiler isn't working. Some variables (like enable_shared)
+ -# are currently assumed to apply to all compilers on this platform,
+@@ -479,44 +530,46 @@
+ - return
+ - end
+ -"
+--
++
+ - # Code to be used in simple link tests
+ - lt_simple_link_test_code="\
+ - program t
+ - end
+ -"
+--
++
+ - # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+--
+--
+--
+--
+--
+--
++
++
++
++
++
++
+ -# If no C compiler was specified, use CC.
+ -LTCC=${LTCC-"$CC"}
+--
+++ ac_config_commands="$ac_config_commands libtool"
++
+ -# If no C compiler flags were specified, use CFLAGS.
+ -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+--
++
+ -# Allow CC to be a program name with arguments.
+ -compiler=$CC
+--
+--
++
++
+ - # save warnings/boilerplate of simple test code
+ - ac_outfile=conftest.$ac_objext
+ -echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ -_lt_compiler_boilerplate=`cat conftest.err`
+ -$RM conftest*
+--
+++# Only expand once:
++
+ - ac_outfile=conftest.$ac_objext
+ -echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ -_lt_linker_boilerplate=`cat conftest.err`
+ -$RM -r conftest*
+--
+--
++
++
+ - # Allow CC to be a program name with arguments.
+ - lt_save_CC="$CC"
+ - lt_save_GCC=$GCC
+@@ -531,7 +584,16 @@
+ - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ - \-*) ;;
+ - *) break;;
+-- esac
+++# Generate an error here if attempting to build both shared and static when
+++# $libname.a is in $library_names_spec (as mentioned above), rather than
+++# wait for ar or ld to fail.
+++#
+++if test "$enable_shared" = yes && test "$enable_static" = yes; then
+++ case $library_names_spec in
+++ *libname.a*)
+++ as_fn_error $? "cannot create both shared and static libraries on this system, --disable one of the two" "$LINENO" 5
+++ ;;
++ esac
+ -done
+ -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ -
+@@ -582,12 +644,27 @@
+ - lt_prog_compiler_wl_F77=
+ -lt_prog_compiler_pic_F77=
+ -lt_prog_compiler_static_F77=
+--
+--
+++fi
++
+++ if test "$enable_static" = yes; then
+++ ENABLE_STATIC_TRUE=
+++ ENABLE_STATIC_FALSE='#'
+++else
+++ ENABLE_STATIC_TRUE='#'
+++ ENABLE_STATIC_FALSE=
+++fi
++
+ - if test "$GCC" = yes; then
+ - lt_prog_compiler_wl_F77='-Wl,'
+ - lt_prog_compiler_static_F77='-static'
+--
+++ if test "$enable_shared" = yes; then
+++ ENABLE_SHARED_TRUE=
+++ ENABLE_SHARED_FALSE='#'
+++else
+++ ENABLE_SHARED_TRUE='#'
+++ ENABLE_SHARED_FALSE=
+++fi
++
+ - case $host_os in
+ - aix*)
+ - # All AIX code is PIC.
+@@ -596,7 +673,7 @@
+ - lt_prog_compiler_static_F77='-Bstatic'
+ - fi
+ - ;;
+--
++
+ - amigaos*)
+ - case $host_cpu in
+ - powerpc)
+@@ -611,11 +688,13 @@
+ - ;;
+ - esac
+ - ;;
+--
++
+ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ - # PIC is the default for these OSes.
+ - ;;
+--
+++# Many of these library and header checks are for the benefit of
+++# supplementary programs. libmpir doesn't use anything too weird.
++
+ - mingw* | cygwin* | pw32* | os2* | cegcc*)
+ - # This hack is so that the source file can tell whether it is being
+ - # built for inclusion in a dll (and should export symbols for example).
+@@ -623,19 +702,43 @@
+ - # (--disable-auto-import) libraries
+ - lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+ - ;;
+--
+++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+++$as_echo_n "checking for ANSI C header files... " >&6; }
+++if ${ac_cv_header_stdc+:} false; then :
+++ $as_echo_n "(cached) " >&6
+++else
+++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++/* end confdefs.h. */
+++#include <stdlib.h>
+++#include <stdarg.h>
+++#include <string.h>
+++#include <float.h>
++
+ - darwin* | rhapsody*)
+ - # PIC is the default on this platform
+ - # Common symbols not allowed in MH_DYLIB files
+ - lt_prog_compiler_pic_F77='-fno-common'
+ - ;;
+--
+++int
+++main ()
+++{
++
+ - haiku*)
+ - # PIC is the default for Haiku.
+ - # The "-static" flag exists, but is broken.
+ - lt_prog_compiler_static_F77=
+ - ;;
+--
+++ ;
+++ return 0;
+++}
+++_ACEOF
+++if ac_fn_c_try_compile "$LINENO"; then :
+++ ac_cv_header_stdc=yes
+++else
+++ ac_cv_header_stdc=no
+++fi
+++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ - hpux*)
+ - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+@@ -649,36 +752,57 @@
+ - ;;
+ - esac
+ - ;;
+--
+++if test $ac_cv_header_stdc = yes; then
+++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++/* end confdefs.h. */
+++#include <string.h>
++
+ - interix[3-9]*)
+ - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ - # Instead, we relocate shared libraries at runtime.
+ - ;;
+--
+++_ACEOF
+++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+++ $EGREP "memchr" >/dev/null 2>&1; then :
++
+ - msdosdjgpp*)
+ - # Just because we use GCC doesn't mean we suddenly get shared libraries
+ - # on systems that don't support them.
+ - lt_prog_compiler_can_build_shared_F77=no
+ - enable_shared=no
+ - ;;
+--
+++else
+++ ac_cv_header_stdc=no
+++fi
+++rm -f conftest*
++
+ - *nto* | *qnx*)
+ - # QNX uses GNU C++, but need to define -shared option too, otherwise
+ - # it will coredump.
+ - lt_prog_compiler_pic_F77='-fPIC -shared'
+ - ;;
+--
+++fi
++
+ - sysv4*MP*)
+ - if test -d /usr/nec; then
+ - lt_prog_compiler_pic_F77=-Kconform_pic
+ - fi
+ - ;;
+--
+++if test $ac_cv_header_stdc = yes; then
+++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++/* end confdefs.h. */
+++#include <stdlib.h>
++
+ - *)
+ - lt_prog_compiler_pic_F77='-fPIC'
+ - ;;
+ - esac
+--
+++_ACEOF
+++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+++ $EGREP "free" >/dev/null 2>&1; then :
++
+ - case $cc_basename in
+ - nvcc*) # Cuda Compiler Driver 2.2
+ - lt_prog_compiler_wl_F77='-Xlinker '
+@@ -697,13 +821,18 @@
+ - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+ - fi
+ - ;;
+--
+++else
+++ ac_cv_header_stdc=no
+++fi
+++rm -f conftest*
++
+ - mingw* | cygwin* | pw32* | os2* | cegcc*)
+ - # This hack is so that the source file can tell whether it is being
+ - # built for inclusion in a dll (and should export symbols for example).
+ - lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+ - ;;
+--
+++fi
++
+ - hpux9* | hpux10* | hpux11*)
+ - lt_prog_compiler_wl_F77='-Wl,'
+ - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+@@ -719,13 +848,45 @@
+ - # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ - lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
+ - ;;
+--
+++if test $ac_cv_header_stdc = yes; then
+++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+++ if test "$cross_compiling" = yes; then :
+++ :
+++else
+++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++/* end confdefs.h. */
+++#include <ctype.h>
+++#include <stdlib.h>
+++#if ((' ' & 0x0FF) == 0x020)
+++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+++#else
+++# define ISLOWER(c) \
+++ (('a' <= (c) && (c) <= 'i') \
+++ || ('j' <= (c) && (c) <= 'r') \
+++ || ('s' <= (c) && (c) <= 'z'))
+++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+++#endif
++
+ - irix5* | irix6* | nonstopux*)
+ - lt_prog_compiler_wl_F77='-Wl,'
+ - # PIC (with -KPIC) is the default.
+ - lt_prog_compiler_static_F77='-non_shared'
+ - ;;
+--
+++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+++int
+++main ()
+++{
+++ int i;
+++ for (i = 0; i < 256; i++)
+++ if (XOR (islower (i), ISLOWER (i))
+++ || toupper (i) != TOUPPER (i))
+++ return 2;
+++ return 0;
+++}
+++_ACEOF
+++if ac_fn_c_try_run "$LINENO"; then :
++
+ - linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ - case $cc_basename in
+ - # old Intel for x86_64 which still supported -KPIC.
+@@ -789,28 +950,51 @@
+ - ;;
+ - esac
+ - ;;
+--
+++else
+++ ac_cv_header_stdc=no
+++fi
+++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+++fi
++
+ - newsos6)
+ - lt_prog_compiler_pic_F77='-KPIC'
+ - lt_prog_compiler_static_F77='-Bstatic'
+ - ;;
+--
+++fi
+++fi
+++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+++$as_echo "$ac_cv_header_stdc" >&6; }
+++if test $ac_cv_header_stdc = yes; then
++
+ - *nto* | *qnx*)
+ - # QNX uses GNU C++, but need to define -shared option too, otherwise
+ - # it will coredump.
+ - lt_prog_compiler_pic_F77='-fPIC -shared'
+ - ;;
+--
+++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
+ - osf3* | osf4* | osf5*)
+ - lt_prog_compiler_wl_F77='-Wl,'
+ - # All OSF/1 code is PIC.
+ - lt_prog_compiler_static_F77='-non_shared'
+ - ;;
+--
+++fi
++
+ - rdos*)
+ - lt_prog_compiler_static_F77='-non_shared'
+ - ;;
+--
+++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+++if ${ac_cv_header_time+:} false; then :
+++ $as_echo_n "(cached) " >&6
+++else
+++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++/* end confdefs.h. */
+++#include <sys/types.h>
+++#include <sys/time.h>
+++#include <time.h>
++
+ - solaris*)
+ - lt_prog_compiler_pic_F77='-KPIC'
+ - lt_prog_compiler_static_F77='-Bstatic'
+@@ -821,13 +1005,33 @@
+ - lt_prog_compiler_wl_F77='-Wl,';;
+ - esac
+ - ;;
+--
+++int
+++main ()
+++{
+++if ((struct tm *) 0)
+++return 0;
+++ ;
+++ return 0;
+++}
+++_ACEOF
+++if ac_fn_c_try_compile "$LINENO"; then :
+++ ac_cv_header_time=yes
+++else
+++ ac_cv_header_time=no
+++fi
+++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+++fi
+++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+++$as_echo "$ac_cv_header_time" >&6; }
+++if test $ac_cv_header_time = yes; then
++
+ - sunos4*)
+ - lt_prog_compiler_wl_F77='-Qoption ld '
+ - lt_prog_compiler_pic_F77='-PIC'
+ - lt_prog_compiler_static_F77='-Bstatic'
+ - ;;
+--
+++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
++
+ - sysv4 | sysv4.2uw2* | sysv4.3*)
+ - lt_prog_compiler_wl_F77='-Wl,'
+ - lt_prog_compiler_pic_F77='-KPIC'
+@@ -1822,7 +2026,7 @@
+ - hardcode_shlibpath_var_F77=no
+ - ;;
+ -
+-- freebsd1*)
++- freebsd1.*)
+ - ld_shlibs_F77=no
+ - ;;
+ -
+@@ -2610,7 +2814,7 @@
+ - shlibpath_var=LD_LIBRARY_PATH
+ - ;;
+ -
+--freebsd1*)
++-freebsd1.*)
+ - dynamic_linker=no
+ - ;;
+ -
+@@ -2621,7 +2825,7 @@
+ - objformat=`/usr/bin/objformat`
+ - else
+ - case $host_os in
+-- freebsd[123]*) objformat=aout ;;
++- freebsd[123].*) objformat=aout ;;
+ - *) objformat=elf ;;
+ - esac
+ - fi
+@@ -3144,10 +3348,209 @@
+ -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ -ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ -
++-
++-
++-
++-
++-
++-
++-
++-
++-
++-
++- ac_config_commands="$ac_config_commands libtool"
++-
++-
++-
++-
++-# Only expand once:
++-
++-
++-
++-# Generate an error here if attempting to build both shared and static when
++-# $libname.a is in $library_names_spec (as mentioned above), rather than
++-# wait for ar or ld to fail.
++-#
++-if test "$enable_shared" = yes && test "$enable_static" = yes; then
++- case $library_names_spec in
++- *libname.a*)
++- as_fn_error $? "cannot create both shared and static libraries on this system, --disable one of the two" "$LINENO" 5
++- ;;
++- esac
++-fi
++-
++- if test "$enable_static" = yes; then
++- ENABLE_STATIC_TRUE=
++- ENABLE_STATIC_FALSE='#'
++-else
++- ENABLE_STATIC_TRUE='#'
++- ENABLE_STATIC_FALSE=
++-fi
++-
++- if test "$enable_shared" = yes; then
++- ENABLE_SHARED_TRUE=
++- ENABLE_SHARED_FALSE='#'
++-else
++- ENABLE_SHARED_TRUE='#'
++- ENABLE_SHARED_FALSE=
++-fi
++-
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list