swig: Update to 3.0.6

This commit is contained in:
Alexpux
2015-07-07 12:02:40 +03:00
parent 6b75dfa14c
commit d2c2db332a
2 changed files with 28 additions and 9 deletions

View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=swig
pkgver=3.0.5
pkgver=3.0.6
pkgrel=1
pkgdesc="Generate scripting interfaces to C/C++ code"
arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ depends=('zlib' 'libpcre')
makedepends=('zlib-devel' 'pcre-devel')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
swig-2.0.10-msys2.patch)
sha1sums=('271813b317e4836853d2249fc8ce2df34c2a062a'
'd4149ffc5e4111439fa1aa530cd4be11fd80ea28')
sha1sums=('901dd1888581289b5fdc6c0f4452109652bcf244'
'33f14f23175ca2844795a30f867e821896e2f59b')
prepare() {
cd ${pkgname}-${pkgver}

View File

@@ -46,6 +46,15 @@ diff -Naur swig-2.0.10-orig/configure.ac swig-2.0.10/configure.ac
PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK"
DEFS="-DUSE_DL_IMPORT $DEFS"
;;
@@ -880,7 +880,7 @@
# Cygwin (Windows) needs the library for dynamic linking
case $host in
- *-*-cygwin* | *-*-mingw*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw*)
PYTHON3DYNAMICLINKING="-L$PY3LIB $PY3LINK"
DEFS="-DUSE_DL_IMPORT $DEFS"
;;
@@ -907,7 +907,7 @@
# Cygwin (Windows) needs the library for dynamic linking
@@ -59,8 +68,8 @@ diff -Naur swig-2.0.10-orig/configure.ac swig-2.0.10/configure.ac
# Add in default installation directory on Windows for Cygwin
case $host in
- *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files/Java/jdk*/include d:/Program*Files/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
+ *-*-cygwin* | *-*-msys* | *-*-mingw*) JAVAINCDIR="c:/Program*Files/Java/jdk*/include d:/Program*Files/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
- *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files*/Java/jdk*/include d:/Program*Files*/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
+ *-*-cygwin* | *-*-msys* | *-*-mingw*) JAVAINCDIR="c:/Program*Files*/Java/jdk*/include d:/Program*Files*/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
*-*-darwin*) JAVAINCDIR="/System/Library/Frameworks/JavaVM.framework/Headers $JAVAINCDIR";;
*);;
esac
@@ -127,15 +136,25 @@ diff -Naur swig-2.0.10-orig/configure.ac swig-2.0.10/configure.ac
*)DLIBPREFIX="lib";;
esac
@@ -2373,7 +2373,7 @@
# Translate path for native Windows compilers for use with 'make check'
@@ -2373,16 +2373,16 @@
# Root directory
ROOT_DIR=`pwd`
case $host in
-*-*-cygwin* | *-*-mingw*)
+*-*-cygwin* | *-*-msys* | *-*-mingw*)
-*-*-cygwin*)
+*-*-cygwin* | *-*-msys*)
# Translate path for native Windows compilers for use with 'make check'
if (cygpath --mixed $ROOT_DIR) >/dev/null 2>/dev/null; then
ROOT_DIR=`cygpath --mixed $ROOT_DIR`
fi
;;
esac
case $host in
-*-*-cygwin* | *-*-mingw*)
+*-*-cygwin* | *-*-msys* | *-*-mingw*)
# Extra files generated by some Windows compilers
EXTRA_CLEAN="*.stackdump *.exp *.lib *.pdb *.ilk"
;;
@@ -2396,7 +2396,7 @@
case $build in
# Windows does not understand unix directories. Convert into a windows directory with drive letter.