Skip to content

Commit aa1e81b

Browse files
python_modules-71
Imported from python_modules-71.tar.gz
1 parent a3f41f4 commit aa1e81b

30 files changed

+137
-43
lines changed

2.7.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ MODULES = \
2020
asn1crypto-0.24.0 \
2121
enum34-1.1.6 \
2222
ipaddress-1.0.22 \
23-
cryptography-2.6.1 \
23+
cryptography-2.9.2 \
2424
pyOpenSSL-19.0.0 \
2525
wheel-0.33.1 \
2626
recertifi-0.11.0

GNUmakefile

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,25 @@ TMPPREFIX = $(OBJROOT)/Root
2525

2626
include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make
2727

28+
ifneq ($(SDKROOT),)
29+
# libpython.tbd exists in /usr/local/lib if python is installed to AppleInternal builds. Otherwise, it's in /usr/lib.
30+
# Try the internal location first, and then fall back to the standard install.
31+
# We can follow its symlink to find sys.prefix for the SDK.
32+
_LIBPYTHONTBD := $(or $(wildcard $(SDKROOT)/usr/local/lib/libpython.tbd),$(SDKROOT)/usr/lib/libpython.tbd)
33+
LIBPYTHONTBD := $(shell python -c "from os.path import realpath; print(realpath('$(_LIBPYTHONTBD)').replace('$(SDKROOT)', ''))")
34+
export PYPREFIX := $(shell dirname $(LIBPYTHONTBD))
35+
else
36+
export PYPREFIX := $(shell python -c "import sys; print(sys.prefix)")
37+
endif
38+
39+
export TOPDIR = $(shell echo $(PYPREFIX) | cut -d '/' -f2)
40+
ifeq ($(TOPDIR),AppleInternal)
41+
export INSTALLPREFIX = /usr/local
42+
else
43+
export INSTALLPREFIX = /usr
44+
endif
45+
export BINDIR = $(INSTALLPREFIX)/bin
46+
2847
installsrc: afterinstallsrc
2948

3049
afterinstallsrc:
@@ -83,13 +102,13 @@ build::
83102
echo '</array>' && \
84103
echo '</plist>') > $(DSTROOT)/usr/local/$(OSV)/$(Project).plist
85104

86-
#merge: mergebegin mergedefault mergeversions mergebin mergeman
87-
merge: mergebegin mergeversions mergebin mergeman
105+
#merge: mergebegin mergedefault mergeversions mergebin
106+
merge: mergebegin mergeversions mergebin
88107

89108
mergebegin:
90109
@echo ####### Merging #######
91110

92-
MERGEBIN = /usr/bin
111+
MERGEBIN = $(BINDIR)
93112

94113
# This causes us to replace the versioner stub with the default version of perl.
95114
# Since we are now only shipping one version (5.18) and one slice (x86_64), there
@@ -107,7 +126,7 @@ mergebin:
107126
ln $(DSTROOT)$(MERGEBIN)/$$fv $(DSTROOT)$(MERGEBIN)/$$f; \
108127
fi || exit 1; \
109128
done && \
110-
cd $(DSTROOT)/System/Library/Frameworks/Python.framework/Versions/$(DEFAULT)/Extras/bin && \
129+
cd $(DSTROOT)$(PYPREFIX)/../$(DEFAULT)/Extras/bin && \
111130
for f in *; do \
112131
sed -e '/^1a/,/^\./d' -e "s/@VERSION@/$(DEFAULT)/g" $(FIX)/scriptvers.ed | ed - $$f || exit 1; \
113132
done
@@ -127,23 +146,19 @@ mergebin:
127146
ln -f $(DSTROOT)$(MERGEBIN)/$(DUMMY) $(DSTROOT)$(MERGEBIN)/$$f; \
128147
fi || exit 1; \
129148
done && \
130-
cd $(DSTROOT)/System/Library/Frameworks/Python.framework/Versions/$$vers/Extras/bin && \
149+
cd $(DSTROOT)$(PYPREFIX)/../$$vers/Extras/bin && \
131150
for f in *; do \
132151
sed -e '/^1a/,/^\./d' -e "s/@VERSION@/$$vers/g" $(FIX)/scriptvers.ed | ed - $$f || exit 1; \
133152
done || exit 1; \
134153
done
135154
rm -f $(DSTROOT)$(MERGEBIN)/$(DUMMY)
136155
endif
137156

138-
157+
MERGEVERSIONS = $(TOPDIR)
139158
mergeversions:
140159
@set -x && \
141160
for vers in $(VERSIONS); do \
142161
cd $(OBJROOT)/$$vers/DSTROOT && \
143-
rsync -Ra System $(DSTROOT) || exit 1; \
162+
rsync -Ra $(MERGEVERSIONS) $(DSTROOT) || exit 1; \
144163
rsync -Ra AppleInternal/Library/Python $(DSTROOT) || exit 1; \
145164
done
146-
147-
MERGEMAN = usr/share/man
148-
mergeman:
149-
cd $(OBJROOT)/$(DEFAULT)/DSTROOT && rsync -Ra $(MERGEMAN) $(DSTROOT)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
include $(VERSIONER_PYTHON_VERSION).inc
44

5-
EXTRAS = $(shell python -c "import sys, os;print(os.path.join(sys.prefix, 'Extras'))")
5+
EXTRAS = $(PYPREFIX)/Extras
66
EXTRASPYTHON = $(EXTRAS)/lib/python
77

88
make := $(SRCROOT)/make.pl

Modules/Makefile.inc

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ NAMEVERSION := $(NAME)-$(VERSION)
88
TARBALL := $(NAMEVERSION).tar.gz
99
DIR := $(OBJROOT)/$(NAMEVERSION)
1010

11+
INCLUDEPYTHONVERS = $(PYPREFIX)/Headers
12+
export PYFRAMEWORKNAME = $(shell echo $(PYPREFIX) | cut -d '/' -f5)
13+
export PYAPPNAME = $(shell echo '$(PYFRAMEWORKNAME)' | sed 's,\.framework,,')
14+
export PYEXECUTABLE = $(PYPREFIX)/Resources/Python.app/Contents/MacOS/$(PYAPPNAME)
15+
16+
ifeq ($(TOPDIR),AppleInternal)
17+
export LIBRARYPREFIX = /AppleInternal/Library
18+
export __INTERNALSDKBUILD__ = YES
19+
else
20+
export LIBRARYPREFIX = /Library
21+
endif
22+
1123
$(DIR):
1224
gnutar xozf $(TARBALL) -C $(OBJROOT)
1325

@@ -16,14 +28,18 @@ afterinstallsrc::
1628

1729
install: realinstall postinstall
1830

19-
realinstall: $(DIR) custompatching
31+
realinstall: $(DIR) patchall custompatching
2032
cd $(DIR) && \
2133
ARCHFLAGS="$(RC_CFLAGS) -iwithsysroot /usr/local/libressl/include -L$(SDKROOT)/usr/local/libressl/lib" \
2234
python setup.py install --home="$(EXTRAS)" --root="$(DSTROOT)" $(SETUPARGS)
2335

2436
# allow custom patching before running setup.py
2537
custompatching:
2638

39+
# install custom patch on all modules before running setup.py
40+
patchall:
41+
sed -e 's,@SDKROOT@,$(SDKROOT),g' -e 's,@INCLUDEPYTHONVERS@,$(INCLUDEPYTHONVERS),g' $(SRCROOT)/Modules/setup.cfg.patch >> $(DIR)/setup.cfg
42+
2743
# allow post install customization
2844
postinstall:
2945

Binary file not shown.

Modules/cryptography-2.6.1/Makefile renamed to Modules/cryptography-2.9.2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = cryptography
2-
VERSION = 2.6.1
2+
VERSION = 2.9.2
33

44
include ../Makefile.inc
55

Binary file not shown.

Modules/cryptography-2.6.1/cryptography.partial renamed to Modules/cryptography-2.9.2/cryptography.partial

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<plist version="1.0">
22
<dict>
33
<key>OpenSourceImportDate</key>
4-
<string>2019-04-04</string>
4+
<string>2021-05-19</string>
55
<key>OpenSourceLicense</key>
66
<string>Apache 2.0</string>
77
<key>OpenSourceLicenseFile</key>
88
<string>python_modules.txt</string>
99
<key>OpenSourceSHA256</key>
10-
<string>26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6</string>
10+
<string>a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229</string>
1111
<key>OpenSourceProject</key>
12-
<string>pyOpenSSL</string>
12+
<string>cryptography</string>
1313
<key>OpenSourceURL</key>
14-
<string>https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449/cryptography-2.6.1.tar.gz</string>
14+
<string>https://files.pythonhosted.org/packages/56/3b/78c6816918fdf2405d62c98e48589112669f36711e50158a0c15d804c30d/cryptography-2.9.2.tar.gz</string>
1515
<key>OpenSourceVersion</key>
16-
<string>2.6.1</string>
16+
<string>2.9.2</string>
1717
<key>OpenSourceWebsiteURL</key>
1818
<string>https://cryptography.io</string>
1919
</dict>

Modules/matplotlib-1.3.1/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ VERSION = 1.3.1
88
include ../Makefile.inc
99

1010
custompatching:
11-
cp -f $(DIR)/setup.cfg.template $(DIR)/setup.cfg
11+
cat $(DIR)/setup.cfg.template >> $(DIR)/setup.cfg
1212
ed - $(DIR)/setup.py < setup.py.ed
13-
ed - $(DIR)/setupext.py < setupext.py.ed
13+
sed -e 's/@TOPDIR@/$(TOPDIR)/g' setupext.py.ed | ed - $(DIR)/setupext.py
1414
sed 's,XXXXX,$(TMPPREFIX),' setup.cfg.ed | ed - $(DIR)/setup.cfg
1515
ed - $(DIR)/lib/matplotlib/animation.py < lib_matplotlib_animation.py.ed
1616
ed - $(DIR)/src/ft2font.cpp < error.ed

Modules/matplotlib-1.3.1/setupext.py.ed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
if sdkroot is None:
66
sdkroot = '/'
77
.
8-
/'\/System\/Library\/Frameworks\/'/s||join(sdkroot, 'System/Library/Frameworks')|
8+
/'\/System\/Library\/Frameworks\/'/s||join(sdkroot, '@TOPDIR@/Library/Frameworks')|
99
/ext\.extra_compile_args\.extend(frameworks)/s/^/#/
1010
w

Modules/numpy-1.8.0rc1/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ include ../Makefile.inc
99
# The bug has been fixed in https://github.com/numpy/numpy/pull/3902
1010
# so this will be unnecessary for releases after 1.8.0rc1
1111
custompatching:
12+
sed -e 's,@PYEXECUTABLE@,$(PYEXECUTABLE),g' setup.py.f2py.patch | patch $(DIR)/numpy/f2py/setup.py
1213
ed - $(DIR)/numpy/linalg/setup.py < 3901.ed
13-
ed - $(DIR)/numpy/distutils/system_info.py < system_info.py.ed
14+
sed -e 's/@TOPDIR@/$(TOPDIR)/g' system_info.py.ed | ed - $(DIR)/numpy/distutils/system_info.py
15+
sed -e 's,@SDKROOT@,$(SDKROOT),g' -e 's,@INCLUDEPYTHONVERS@,$(INCLUDEPYTHONVERS),g' $(SRCROOT)/Modules/setup.py-config.ed | ed - $(DIR)/setup.py
1416
( cd $(DIR) ; patch -p1 ) < arm64.diff
1517

1618
postinstall:

Modules/numpy-1.8.0rc1/numpy.partial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<key>OpenSourceWebsiteURL</key>
77
<string>http://numpy.scipy.org/</string>
88
<key>OpenSourceURL</key>
9-
<string>http://downloads.sourceforge.net/project/numpy/NumPy/1.8.0rc1/numpy-1.8.0rc1.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fnumpy%2Ffiles%2FNumPy%2F1.8.0rc1%2F&ts=1381429695&use_mirror=hivelocity</string>
9+
<string>http://downloads.sourceforge.net/project/numpy/NumPy/1.8.0rc1/numpy-1.8.0rc1.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fnumpy%2Ffiles%2FNumPy%2F1.8.0rc1%2F&amp;ts=1381429695&amp;use_mirror=hivelocity</string>
1010
<key>OpenSourceImportDate</key>
1111
<string>2013-10-10</string>
1212
<key>OpenSourceLicense</key>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- numpy-1.8.0rc1.orig/numpy/f2py/setup.py 2021-01-27 08:44:07.000000000 -0800
2+
+++ numpy-1.8.0rc1/numpy/f2py/setup.py 2021-01-27 08:44:58.000000000 -0800
3+
@@ -51,6 +51,10 @@
4+
target = os.path.join(build_dir, f2py_exe)
5+
if newer(__file__, target):
6+
log.info('Creating %s', target)
7+
+ if os.environ.get('__INTERNALSDKBUILD__'):
8+
+ pyexecutable = '@PYEXECUTABLE@'
9+
+ else:
10+
+ pyexecutable = sys.executable
11+
f = open(target, 'w')
12+
f.write('''\
13+
#!%s
14+
@@ -77,7 +81,7 @@
15+
sys.stderr.write("Unknown mode: " + repr(mode) + "\\n")
16+
sys.exit(1)
17+
main()
18+
-'''%(sys.executable))
19+
+'''%(pyexecutable))
20+
f.close()
21+
return target
22+

Modules/numpy-1.8.0rc1/system_info.py.ed

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
if sdkroot is None:
66
sdkroot = '/'
77
.
8-
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '\1'/
8+
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '@TOPDIR@\/Library\/Frameworks'/
99
.+1s,/'),')),
10-
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '\1'/
10+
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '@TOPDIR@\/Library\/Frameworks'/
1111
.+1s,/'),')),
1212
/^class blas_opt_info(/a
1313
.
@@ -16,10 +16,10 @@
1616
if sdkroot is None:
1717
sdkroot = '/'
1818
.
19-
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '\1'/
19+
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '@TOPDIR@\/Library\/Frameworks'/
2020
.+1s,/'),')),
21-
/'-I\/\(System\/Library\/Frameworks\/vecLib\.framework\/Headers\)'/s//'-I' + os.path.join(sdkroot, '\1')/
22-
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '\1'/
21+
/'-I\/\(System\/Library\/Frameworks\/vecLib\.framework\/Headers\)'/s//'-I' + os.path.join(sdkroot, '@TOPDIR@\/Library\/Frameworks\/vecLib\.framework\/Headers')/
22+
/'\/\(System\/Library\/Frameworks\)'/s//os.path.join(sdkroot, '@TOPDIR@\/Library\/Frameworks'/
2323
.+1s,/'),')),
24-
/'-I\/\(System\/Library\/Frameworks\/vecLib\.framework\/Headers\)'/s//'-I' + os.path.join(sdkroot, '\1')/
24+
/'-I\/\(System\/Library\/Frameworks\/vecLib\.framework\/Headers\)'/s//'-I' + os.path.join(sdkroot, '@TOPDIR@\/Library\/Frameworks\/vecLib\.framework\/Headers')/
2525
w

Modules/py2app-0.7.3/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ afterinstallsrc::
1717
rm -rf $(NAME)-$(VERSION)
1818

1919
custompatching:
20-
ed - $(DIR)/py2app/bootstrap/site_packages.py < site_packages.py.ed
20+
sed -e 's,@LIBRARYPREFIX@,$(LIBRARYPREFIX),g' site_packages.py.ed | ed - $(DIR)/py2app/bootstrap/site_packages.py
2121
ed - $(DIR)/py2app/apptemplate/setup.py < template_setup.py.ed
2222
cd $(DIR)/py2app/apptemplate && ARCHFLAGS='$(RC_CFLAGS)' python setup.py
2323
ed - $(DIR)/py2app/bundletemplate/setup.py < template_setup.py.ed
2424
cd $(DIR)/py2app/bundletemplate && ARCHFLAGS='$(RC_CFLAGS)' python setup.py
25-
ed - $(DIR)/py2app/build_app.py < build_app.py.ed
25+
sed -e 's/@TOPDIR@/$(TOPDIR)/g' -e 's/@PYFRAMEWORKNAME@/$(PYFRAMEWORKNAME)/g' build_app.py.ed | ed - $(DIR)/py2app/build_app.py
26+
sed -e 's/@TOPDIR@/$(TOPDIR)/g' -e 's/@PYFRAMEWORKNAME@/$(PYFRAMEWORKNAME)/g' system_path_extras.py.ed | ed - $(DIR)/py2app/bootstrap/system_path_extras.py
27+
sed -e 's/@TOPDIR@/$(TOPDIR)/g' -e 's/@PYAPPNAME@/$(PYAPPNAME)/g' plist_template.py.ed | ed - $(DIR)/py2app/apptemplate/plist_template.py
28+
sed -e 's/@TOPDIR@/$(TOPDIR)/g' -e 's/@PYAPPNAME@/$(PYAPPNAME)/g' plist_template.py.ed | ed - $(DIR)/py2app/bundletemplate/plist_template.py
2629
ed - $(DIR)/setup.py < setup.py.ed
2730

2831
postinstall:

Modules/py2app-0.7.3/build_app.py.ed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/self.semi_standalone = is_system()/s/is_system()/False/
22
/mm\.mm\.run_file(runtime)/a
33
# always copy the system runtime
4-
if runtime.startswith('/System/Library/Frameworks/Python.framework'):
4+
if runtime.startswith('/@TOPDIR@/Library/Frameworks/@PYFRAMEWORKNAME@'):
55
print("*** copying runtime %s ***" % runtime)
66
self.copy_python_framework(macholib.dyld.framework_info(runtime), os.path.join(dst, "Contents/Frameworks"))
77
.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
,s/\/System\/Library\/Frameworks\/Python/\/@TOPDIR@\/Library\/Frameworks\/Python/
2+
,s/Python\.framework/@PYAPPNAME@.framework/g
3+
,s,Versions\/\%s\/Python,Versions/%s/@PYAPPNAME@,g
4+
w
Binary file not shown.

Modules/py2app-0.7.3/site_packages.py.ed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.
33
.,.+1c
44
if prefix == sys.prefix:
5-
paths.append(os.path.join("/Library/Python", sys.version[:3], "site-packages"))
5+
paths.append(os.path.join("@LIBRARYPREFIX@/Python", sys.version[:3], "site-packages"))
66
paths.append(os.path.join(sys.prefix, "Extras", "lib", "python"))
77
else:
88
paths.append(os.path.join(prefix, 'lib', 'python' + sys.version[:3],
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/site.addsitedir/s,System,@TOPDIR@,
2+
,s/Python\.framework/@PYFRAMEWORKNAME@/g
3+
w

Modules/scipy-0.13.0b1/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ custompatching:
3232
ed - $(DIR)/scipy/sparse/linalg/isolve/iterative/FWRAPPERS/wrap_veclib_c.c < veclib_cabi_c.c.ed
3333
ed - $(DIR)/scipy/stats/mvn.pyf < scipy_stats_mvn.pyf.ed
3434
ed - $(DIR)/scipy/stats/mvndst.f < scipy_stats_mvndst.f.ed
35-
sed 's,XXXXX,$(TMPPREFIX),' setup.cfg > $(DIR)/setup.cfg
35+
sed -e 's,@SDKROOT@,$(SDKROOT),g' -e 's,@INCLUDEPYTHONVERS@,$(INCLUDEPYTHONVERS),g' $(SRCROOT)/Modules/setup.py-config.ed | ed - $(DIR)/setup.py
36+
sed 's,XXXXX,$(TMPPREFIX),' setup.cfg >> $(DIR)/setup.cfg
3637
mkdir -p $(TMPPYTHON)
3738
ditto $(PP)/numpy $(NUMPY)
3839
cp f2c.py $(FCOMPILER)

Modules/scipy-0.13.0b1/setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
[build_ext]
21
define=UNDERSCORE_G77
32
libraries=f2c
43
library_dirs=XXXXX/lib

Modules/setup.cfg.patch

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
[build_ext]
3+
include-dirs = @SDKROOT@@INCLUDEPYTHONVERS@
4+

Modules/setup.py-config.ed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/config.add_subpackage/i
2+
config.include_dirs = ['@SDKROOT@@INCLUDEPYTHONVERS@'] + config.include_dirs
3+
.
4+
w

Modules/setuptools-41.0.1/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
NAME = setuptools
22
VERSION = 41.0.1
33

4-
SETUPARGS = --install-scripts=/usr/bin
4+
SETUPARGS = --install-scripts=$(BINDIR)
55

66
include ../Makefile.inc
77

8+
custompatching:
9+
sed -e 's,@PYEXECUTABLE@,$(PYEXECUTABLE),g' easy_install.py.patch | patch $(DIR)/setuptools/command/easy_install.py
10+
sed -e 's/@PYFRAMEWORKNAME@/$(PYFRAMEWORKNAME)/g' easy_install.py.ed | ed - $(DIR)/setuptools/command/easy_install.py
11+
812
postinstall:
913
chmod -x $(DSTROOT)$(EXTRASPYTHON)/setuptools-$(subst -,_,$(VERSION))*.egg-info/entry_points.txt
1014
cp -f PSFL.txt $(OSL)/$(NAME)-$(VERSION).txt
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
,s/Python\.framework/@PYFRAMEWORKNAME@/g
2+
w
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
--- setuptools-41.0.1.orig/setuptools/command/easy_install.py 2021-01-27 08:47:25.000000000 -0800
2+
+++ setuptools-41.0.1/setuptools/command/easy_install.py 2021-01-27 08:49:27.000000000 -0800
3+
@@ -2042,8 +2042,11 @@
4+
5+
@staticmethod
6+
def _render(items):
7+
- cmdline = subprocess.list2cmdline(
8+
- CommandSpec._strip_quotes(item.strip()) for item in items)
9+
+ if os.environ.get('__INTERNALSDKBUILD__'):
10+
+ cmdline = '@PYEXECUTABLE@'
11+
+ else:
12+
+ cmdline = subprocess.list2cmdline(
13+
+ CommandSpec._strip_quotes(item.strip()) for item in items)
14+
return '#!' + cmdline + '\n'
15+
16+

Modules/xattr-0.6.4/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ VERSION = 0.6.4
33

44

55
PYTHON3 := $(shell python -c 'import sys;print("YES" if sys.version_info[0] > 2 else "NO")')
6-
SETUPARGS = --install-scripts=/usr/bin
6+
SETUPARGS = --install-scripts=$(BINDIR)
77

88
include ../Makefile.inc
99

@@ -21,7 +21,7 @@ else
2121
endif
2222

2323
postinstall:
24+
####### rdar://76017541 (Remove /usr/bin/xattr from python_modules)
25+
rm -f $(DSTROOT)/usr/bin/xattr
2426
cp -f $(DIR)/LICENSE.txt $(OSL)/$(NAME)-$(VERSION).txt
2527
cp -f $(NAME).partial $(OSV)/$(NAME)-$(VERSION).partial
26-
mkdir -p $(DSTROOT)/usr/share/man/man1
27-
cp -f $(NAME).1 $(DSTROOT)/usr/share/man/man1

tmpprefix/f2c/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ buildsrc:
6060
make
6161

6262
afterinstallsrc:
63-
# 30524873
64-
PERL5LIB=/System/Library/Perl/5.18:$$PERL5LIB perl $(SRCROOT)/tar-remove.pl '^f2c/(?:msdos|mswin)/' $(F2CSRC)/$(F2CNAME)$(TARSUFFIX) $(F2CNAME)-mod$(TARSUFFIX)
63+
perl $(SRCROOT)/tar-remove.pl '^f2c/(?:msdos|mswin)/' $(F2CSRC)/$(F2CNAME)$(TARSUFFIX) $(F2CNAME)-mod$(TARSUFFIX)
6564
rm -f $(F2CSRC)/$(F2CNAME)$(TARSUFFIX)
-3 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)