Skip to content

Commit 772c3cc

Browse files
committed
Preserve CRLFs in patch files
1 parent 1ab5ecd commit 772c3cc

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

server/pypi/packages/.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Preserve CRLFs in patch files, otherwise they won't apply. For example, see jpegio.
2+
*/patches/** -text
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
--- src-original/setup.py 2021-10-15 14:26:07.000000000 +0000
22
+++ src/setup.py 2023-01-30 15:30:10.166631599 +0000
33
@@ -11,6 +11,10 @@
4-
import platform
5-
import glob
6-
7-
+# Chaquopy
8-
+import builtins
9-
+builtins.__NUMPY_SETUP__ = True # Prevent the compiled parts from being imported.
10-
+
11-
import numpy
12-
13-
incs = ["."]
4+
import platform
5+
import glob
6+
7+
+# Chaquopy
8+
+import builtins
9+
+builtins.__NUMPY_SETUP__ = True # Prevent the compiled parts from being imported.
10+
+
11+
import numpy
12+
13+
incs = ["."]
1414
@@ -40,7 +44,7 @@
15-
largs.append('-stdlib=libc++')
16-
largs.append('-mmacosx-version-min=10.9')
17-
18-
-if arch == 'x64':
19-
+if False and arch == 'x64': # Chaquopy: let the compiler use its default number of bits.
20-
cargs.append('-m64')
21-
22-
DIR_LIBJPEG_HEADER = pjoin(DIR_ROOT,"jpegio", "libjpeg", "include")
15+
largs.append('-stdlib=libc++')
16+
largs.append('-mmacosx-version-min=10.9')
17+
18+
-if arch == 'x64':
19+
+if False and arch == 'x64': # Chaquopy: let the compiler use its default number of bits.
20+
cargs.append('-m64')
21+
22+
DIR_LIBJPEG_HEADER = pjoin(DIR_ROOT,"jpegio", "libjpeg", "include")

0 commit comments

Comments
 (0)