diff options
| -rw-r--r-- | dev-python/cx_Freeze/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild | 9 | ||||
| -rw-r--r-- | dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild | 9 | ||||
| -rw-r--r-- | dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch | 31 |
4 files changed, 44 insertions, 11 deletions
diff --git a/dev-python/cx_Freeze/ChangeLog b/dev-python/cx_Freeze/ChangeLog index 1a4207ef31d7..1ad76a8dd18b 100644 --- a/dev-python/cx_Freeze/ChangeLog +++ b/dev-python/cx_Freeze/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/cx_Freeze # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/ChangeLog,v 1.8 2013/11/18 13:48:45 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/ChangeLog,v 1.9 2013/11/19 12:26:09 pinkbyte Exp $ + + 19 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> cx_Freeze-4.3.1-r2.ebuild, + cx_Freeze-4.3.2.ebuild, +files/cx_Freeze-4.3.2-buildsystem.patch: + Proper fix for respecting LDFLAGS by Julian Ospald, bug #491602 *cx_Freeze-4.3.2 (18 Nov 2013) diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild index 879ecc824bf1..29c3ec57a886 100644 --- a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild +++ b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild,v 1.2 2013/11/18 13:43:42 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild,v 1.3 2013/11/19 12:26:09 pinkbyte Exp $ EAPI="5" @@ -17,7 +17,6 @@ KEYWORDS="amd64 x86" DOCS=( README.txt ) -python_prepare() { - # do not strip binaries, respect LDFLAGS - sed -i -e '/extraArgs.append("-s")/s/extraArgs.append("-s")/extraArgs.extend(vars["LDFLAGS"].split())/' setup.py || die 'sed on setup.py failed' -} +PATCHES=( + "${FILESDIR}/${P}-buildsystem.patch" # bug #491602 +) diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild index 02e8df26d192..07b045d18775 100644 --- a/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild +++ b/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild,v 1.1 2013/11/18 13:48:45 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild,v 1.2 2013/11/19 12:26:09 pinkbyte Exp $ EAPI="5" @@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~x86" DOCS=( README.txt ) -python_prepare() { - # do not strip binaries, respect LDFLAGS - sed -i -e '/extraArgs.append("-s")/s/extraArgs.append("-s")/extraArgs.extend(vars["LDFLAGS"].split())/' setup.py || die 'sed on setup.py failed' -} +PATCHES=( + "${FILESDIR}/${P}-buildsystem.patch" # bug #491602 +) diff --git a/dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch new file mode 100644 index 000000000000..288443bba495 --- /dev/null +++ b/dev-python/cx_Freeze/files/cx_Freeze-4.3.2-buildsystem.patch @@ -0,0 +1,31 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Nov 19 11:20:21 UTC 2013 + +Respect LDFLAGS, remove stripping. +Fixes Gentoo bug #491602 + +--- a/cx_Freeze-4.3.2/setup.py ++++ b/cx_Freeze-4.3.2/setup.py +@@ -78,11 +78,12 @@ + extraArgs = ext.extra_link_args or [] + if sys.platform != "win32": + vars = distutils.sysconfig.get_config_vars() ++ if vars["LINKFORSHARED"] and sys.platform != "darwin": ++ vars["LINKFORSHARED"] = vars["LINKFORSHARED"] + " " + os.environ["LDFLAGS"] ++ extraArgs.extend(vars["LINKFORSHARED"].split()) + if not vars.get("Py_ENABLE_SHARED", 0): + libraryDirs.append(vars["LIBPL"]) + libraries.append("python%s.%s" % sys.version_info[:2]) +- if vars["LINKFORSHARED"] and sys.platform != "darwin": +- extraArgs.extend(vars["LINKFORSHARED"].split()) + if vars["LIBS"]: + extraArgs.extend(vars["LIBS"].split()) + if vars["LIBM"]: +@@ -91,7 +92,6 @@ + extraArgs.extend(vars["BASEMODLIBS"].split()) + if vars["LOCALMODLIBS"]: + extraArgs.extend(vars["LOCALMODLIBS"].split()) +- extraArgs.append("-s") + elif ext.name.find("Win32GUI") > 0 \ + and self.compiler.compiler_type == "mingw32": + extraArgs.append("-mwindows") |