mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
- Fix build with distribute -> setuptools change
Approved by: portmgr (bapt, implicit)
This commit is contained in:
parent
9649baf9ec
commit
9d88e78533
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=335046
@ -1,13 +1,30 @@
|
||||
--- setup.py.orig 2012-12-17 14:04:38.000000000 +0000
|
||||
+++ setup.py 2013-05-16 15:35:53.000000000 +0000
|
||||
@@ -362,8 +362,8 @@
|
||||
--- ./setup.py.orig 2013-06-28 18:07:26.000000000 -0300
|
||||
+++ ./setup.py 2013-11-27 17:04:07.589319517 -0200
|
||||
@@ -27,7 +27,6 @@
|
||||
from distutils.unixccompiler import UnixCCompiler
|
||||
from setuptools import find_packages, setup
|
||||
from setuptools.extension import Extension
|
||||
-import distribute_setup
|
||||
import glob
|
||||
import os
|
||||
import platform
|
||||
@@ -370,8 +369,8 @@
|
||||
# otherwise we just use the original compile method
|
||||
UnixCCompiler.linker_so = None
|
||||
return self._original_compile(obj, src, *args, **kwargs)
|
||||
- UnixCCompiler.linker_so = ["gfortran"]
|
||||
- self.compiler_so = ["gfortran"]
|
||||
+ UnixCCompiler.linker_so = ["FC"]
|
||||
+ self.compiler_so = ["FC"]
|
||||
+ UnixCCompiler.linker_so = ["gfortran46"]
|
||||
+ self.compiler_so = ["gfortran46"]
|
||||
cc_args = ['-c', '-fno-underscoring']
|
||||
if sys.platform == 'darwin':
|
||||
self.compiler_so = _darwin_compiler_fixup(self.compiler_so,
|
||||
cc_args.append('-fPIC')
|
||||
try:
|
||||
@@ -629,8 +628,6 @@
|
||||
|
||||
|
||||
def setupPackage(gfortran=True, ccompiler=True):
|
||||
- # automatically install distribute if the user does not have it installed
|
||||
- distribute_setup.use_setuptools()
|
||||
# use lib2to3 for Python 3.x
|
||||
if sys.version_info[0] == 3:
|
||||
convert2to3()
|
||||
|
10
sysutils/py-filelike/files/patch-setup.py
Normal file
10
sysutils/py-filelike/files/patch-setup.py
Normal file
@ -0,0 +1,10 @@
|
||||
--- ./setup.py.orig 2013-11-27 16:56:21.489321513 -0200
|
||||
+++ ./setup.py 2013-11-27 16:57:06.823319522 -0200
|
||||
@@ -1,7 +1,5 @@
|
||||
|
||||
import sys
|
||||
-import distribute_setup
|
||||
-distribute_setup.use_setuptools()
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
|
14
www/py-amf/files/patch-setup.py
Normal file
14
www/py-amf/files/patch-setup.py
Normal file
@ -0,0 +1,14 @@
|
||||
--- ./setup.py.orig 2013-11-27 16:59:40.606322333 -0200
|
||||
+++ ./setup.py 2013-11-27 17:00:06.922319988 -0200
|
||||
@@ -3,11 +3,6 @@
|
||||
# Copyright (c) The PyAMF Project.
|
||||
# See LICENSE.txt for details.
|
||||
|
||||
-from distribute_setup import use_setuptools
|
||||
-
|
||||
-# 15 seconds is far too long ....
|
||||
-use_setuptools(download_delay=3)
|
||||
-
|
||||
# import ordering is important
|
||||
import setupinfo
|
||||
from setuptools import setup, find_packages
|
10
www/py-cssmin/files/patch-setup.py
Normal file
10
www/py-cssmin/files/patch-setup.py
Normal file
@ -0,0 +1,10 @@
|
||||
--- ./setup.py.orig 2013-11-27 16:51:22.144320041 -0200
|
||||
+++ ./setup.py 2013-11-27 16:51:29.013319136 -0200
|
||||
@@ -4,7 +4,6 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
-from distribute_setup import use_setuptools; use_setuptools()
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user