Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
2cb87846
Commit
2cb87846
authored
Mar 22, 2014
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib/gcrypt: fix compilation on x86_64/Darwin with clang
Patch is pending for upstream submission
parent
313038e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
0 deletions
+30
-0
contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
...rib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
+29
-0
contrib/src/gcrypt/rules.mak
contrib/src/gcrypt/rules.mak
+1
-0
No files found.
contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
0 → 100644
View file @
2cb87846
From 3149e9b73a94b45a5126cc778fe03f0b686dced9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 22 Mar 2014 19:55:52 +0100
Subject: [PATCH] Fix code path selection for x86_64 on Darwin
---
mpi/config.links | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/mpi/config.links b/mpi/config.links
index 0217d35..4f35ea2 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -127,6 +127,12 @@
case "${host}" in
path="i586 i386"
mpi_cpu_arch="x86"
;;
+ x86_64-apple-darwin*)
+ echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
+ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
+ path="amd64"
+ mpi_cpu_arch="x86"
+ ;;
x86_64-*-*)
echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
--
1.8.5.2 (Apple Git-48)
contrib/src/gcrypt/rules.mak
View file @
2cb87846
...
...
@@ -11,6 +11,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
libgcrypt
:
libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY)
$(SRC)
/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
$(MOVE)
DEPS_gcrypt
=
gpg-error
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment