Fix jpegio ARM64 patch for CRLF line endings
- Convert CRLF to LF before patching (jpegio uses Windows line endings) - Update patch context to match current jpegio setup.py 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -21,6 +21,12 @@ cd "$JPEGIO_DIR"
|
|||||||
|
|
||||||
echo "Applying ARM64 patch to jpegio..."
|
echo "Applying ARM64 patch to jpegio..."
|
||||||
|
|
||||||
|
# Fix CRLF line endings (jpegio uses Windows line endings)
|
||||||
|
if file setup.py | grep -q CRLF; then
|
||||||
|
echo " Converting CRLF to LF..."
|
||||||
|
sed -i 's/\r$//' setup.py
|
||||||
|
fi
|
||||||
|
|
||||||
# Strategy 1: Try the standard patch file
|
# Strategy 1: Try the standard patch file
|
||||||
if [ -f "$PATCH_FILE" ]; then
|
if [ -f "$PATCH_FILE" ]; then
|
||||||
echo " Trying patch file..."
|
echo " Trying patch file..."
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/setup.py
|
--- a/setup.py
|
||||||
+++ b/setup.py
|
+++ b/setup.py
|
||||||
@@ -69,12 +69,12 @@
|
@@ -64,7 +64,7 @@ elif sys.platform == 'darwin': # macOS
|
||||||
largs.append('-mmacosx-version-min=10.9')
|
largs.append('-mmacosx-version-min=10.9')
|
||||||
|
|
||||||
if arch == 'x64':
|
if arch == 'x64':
|
||||||
@@ -9,6 +9,9 @@
|
|||||||
elif sys.platform == 'linux':
|
elif sys.platform == 'linux':
|
||||||
cargs.extend(['-w', '-fPIC'])
|
cargs.extend(['-w', '-fPIC'])
|
||||||
|
|
||||||
|
@@ -68,7 +68,7 @@ elif sys.platform == 'linux':
|
||||||
|
cargs.extend(['-w', '-fPIC'])
|
||||||
|
|
||||||
if arch == 'x64':
|
if arch == 'x64':
|
||||||
- cargs.append('-m64')
|
- cargs.append('-m64')
|
||||||
+ pass # ARM64: removed x86-specific -m64 flag
|
+ pass # ARM64: removed x86-specific -m64 flag
|
||||||
|
|||||||
Reference in New Issue
Block a user