summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/geos/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-libs/geos/files')
-rw-r--r--sci-libs/geos/files/3.2.0-darwin.patch13
-rw-r--r--sci-libs/geos/files/3.2.0-python.patch40
-rw-r--r--sci-libs/geos/files/3.3.2-solaris-isnan.patch13
-rw-r--r--sci-libs/geos/files/3.4.1-solaris-isnan.patch14
-rw-r--r--sci-libs/geos/files/3.4.2-ruby_so_name.patch12
-rw-r--r--sci-libs/geos/files/3.4.2-solaris-isnan.patch14
6 files changed, 106 insertions, 0 deletions
diff --git a/sci-libs/geos/files/3.2.0-darwin.patch b/sci-libs/geos/files/3.2.0-darwin.patch
new file mode 100644
index 000000000000..2701b5906a7b
--- /dev/null
+++ b/sci-libs/geos/files/3.2.0-darwin.patch
@@ -0,0 +1,13 @@
+Also check for dylib before giving up, bug #335811
+
+--- macros/ac_python_devel.m4
++++ macros/ac_python_devel.m4
+@@ -42,7 +42,7 @@
+ # Check for Python library path
+ AC_MSG_CHECKING([for Python library path])
+ python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
+- if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
++ if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so && test ! -f "${python_path}"/libpython$PYTHON_VERSION.dylib ; then
+ python_path=""
+ fi
+ AC_MSG_RESULT([$python_path])
diff --git a/sci-libs/geos/files/3.2.0-python.patch b/sci-libs/geos/files/3.2.0-python.patch
new file mode 100644
index 000000000000..b4a85c0410ad
--- /dev/null
+++ b/sci-libs/geos/files/3.2.0-python.patch
@@ -0,0 +1,40 @@
+diff --git a/macros/ac_python_devel.m4 b/macros/ac_python_devel.m4
+index d67842b..f3a3a3b 100644
+--- a/macros/ac_python_devel.m4
++++ b/macros/ac_python_devel.m4
+@@ -29,13 +29,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+
+ # Check for Python include path
+ AC_MSG_CHECKING([for Python include path])
+- for i in "$base_python_path/include/python$PYTHON_VERSION/" "$base_python_path/include/python/" "$base_python_path/include/" "$base_python_path/" ; do
+- python_path=`find $i -type f -name Python.h -print 2> /dev/null | sed "1q"`
+- if test -n "$python_path" ; then
+- break
+- fi
+- done
+- python_path=`echo $python_path | sed "s,/Python.h$,,"`
++ python_path="${base_python_path}/include/python$PYTHON_VERSION/"
++ if test ! -f "${python_path}"/Python.h ; then
++ python_path=""
++ fi
+ AC_MSG_RESULT([$python_path])
+ if test -z "$python_path" ; then
+ AC_MSG_ERROR([cannot find Python include path])
+@@ -44,13 +41,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+
+ # Check for Python library path
+ AC_MSG_CHECKING([for Python library path])
+- for i in "$base_python_path/lib/python$PYTHON_VERSION/config/" "$base_python_path/lib/python$PYTHON_VERSION/" "$base_python_path/lib/python/config/" "$base_python_path/lib/python/" "$base_python_path/" "$base_python_path/libs/" ; do
+- python_path=`find $i -name libpython$PYTHON_VERSION.* -print 2> /dev/null | sed "1q"`
+- if test -n "$python_path" ; then
+- break
+- fi
+- done
+- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
++ python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
++ if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
++ python_path=""
++ fi
+ AC_MSG_RESULT([$python_path])
+ if test -z "$python_path" ; then
+ AC_MSG_ERROR([cannot find Python library path])
diff --git a/sci-libs/geos/files/3.3.2-solaris-isnan.patch b/sci-libs/geos/files/3.3.2-solaris-isnan.patch
new file mode 100644
index 000000000000..04dc131e7df3
--- /dev/null
+++ b/sci-libs/geos/files/3.3.2-solaris-isnan.patch
@@ -0,0 +1,13 @@
+--- include/geos/platform.h.in
++++ include/geos/platform.h.in
+@@ -97,8 +97,9 @@
+ // It does leave a version in std.
+ # define ISNAN(x) (std::isnan(x))
+ # elif defined(__sun) || defined(__sun__)
++# define _XOPEN_SOURCE 600 // force iso/math_c99
+ # include <math.h>
+-# define ISNAN(x) (::isnan(x))
++# define ISNAN(x) (std::isnan(x))
+ # endif
+ #endif
+
diff --git a/sci-libs/geos/files/3.4.1-solaris-isnan.patch b/sci-libs/geos/files/3.4.1-solaris-isnan.patch
new file mode 100644
index 000000000000..f4cb2aee9ad0
--- /dev/null
+++ b/sci-libs/geos/files/3.4.1-solaris-isnan.patch
@@ -0,0 +1,14 @@
+diff -Naruw geos-3.4.1.orig/include/geos/platform.h.in geos-3.4.1/include/geos/platform.h.in
+--- geos-3.4.1.orig/include/geos/platform.h.in 2013-08-17 14:08:04.000000000 +0000
++++ geos-3.4.1/include/geos/platform.h.in 2013-08-18 22:00:59.412676805 +0000
+@@ -96,8 +96,9 @@
+ // It does leave a version in std.
+ # define ISNAN(x) (std::isnan(x))
+ # elif defined(__sun) || defined(__sun__)
++# define _XOPEN_SOURCE 600 // force iso/math_c99
+ # include <math.h>
+-# define ISNAN(x) (::isnan(x))
++# define ISNAN(x) (std::isnan(x))
+ # endif
+ #endif
+
diff --git a/sci-libs/geos/files/3.4.2-ruby_so_name.patch b/sci-libs/geos/files/3.4.2-ruby_so_name.patch
new file mode 100644
index 000000000000..4168e5c0263f
--- /dev/null
+++ b/sci-libs/geos/files/3.4.2-ruby_so_name.patch
@@ -0,0 +1,12 @@
+diff -Naur geos-3.4.2.orig/macros/ruby.m4 geos-3.4.2/macros/ruby.m4
+--- a/macros/ruby.m4 2013-08-25 11:10:32.000000000 -0400
++++ b/macros/ruby.m4 2014-11-05 06:35:39.347830878 -0500
+@@ -38,7 +38,7 @@
+ RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'`
+
+ dnl Get Ruby shared library name, this does not include the lib prefix or extension name
+- RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
++ RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
+
+ dnl Get Ruby shared libary name
+ RUBY_SHARED_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY"]] || Config::CONFIG[["LIBRUBY"]]'`
diff --git a/sci-libs/geos/files/3.4.2-solaris-isnan.patch b/sci-libs/geos/files/3.4.2-solaris-isnan.patch
new file mode 100644
index 000000000000..a66d36f6587d
--- /dev/null
+++ b/sci-libs/geos/files/3.4.2-solaris-isnan.patch
@@ -0,0 +1,14 @@
+diff -Naruw geos-3.4.2.orig/include/geos/platform.h.in geos-3.4.2/include/geos/platform.h.in
+--- geos-3.4.2.orig/include/geos/platform.h.in 2013-08-25 15:10:32.000000000 +0000
++++ geos-3.4.2/include/geos/platform.h.in 2013-10-20 23:45:29.891690795 +0000
+@@ -98,8 +98,9 @@
+ // It does leave a version in std.
+ # define ISNAN(x) (std::isnan(x))
+ # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
++# define _XOPEN_SOURCE 600 //force iso/math_c99
+ # include <math.h>
+-# define ISNAN(x) (::isnan(x))
++# define ISNAN(x) (std::isnan(x))
+ # endif
+ #endif
+