Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Robert Stone
VLC
Commits
0feb493b
Commit
0feb493b
authored
6 years ago
by
Steve Lhomme
Browse files
Options
Downloads
Patches
Plain Diff
contrib:gmp: do not try to detect assembler format when assembler is disabled
parent
36cba010
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/gmp/gmp-fix-asm-detection.patch
+11
-0
11 additions, 0 deletions
contrib/src/gmp/gmp-fix-asm-detection.patch
contrib/src/gmp/rules.mak
+1
-0
1 addition, 0 deletions
contrib/src/gmp/rules.mak
with
12 additions
and
0 deletions
contrib/src/gmp/gmp-fix-asm-detection.patch
0 → 100644
+
11
−
0
View file @
0feb493b
--- gmp/configure.ac.asm 2018-06-25 13:50:38.561396100 +0200
+++ gmp/configure.ac 2018-06-25 14:02:43.731673800 +0200
@@ -3592,7 +3592,7 @@
if test $found_asm = yes; then
fi
# Only do the GMP_ASM checks if there's a .S or .asm wanting them.
-if test $found_asm = no && test $found_S = no; then
+if test $found_asm = no || test $enable_assembly = no ; then
gmp_asm_syntax_testing=no
fi
This diff is collapsed.
Click to expand it.
contrib/src/gmp/rules.mak
+
1
−
0
View file @
0feb493b
...
...
@@ -34,6 +34,7 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
$(
UNPACK
)
$(
APPLY
)
$(
SRC
)
/gmp/ppc64.patch
$(
APPLY
)
$(
SRC
)
/gmp/win-arm64.patch
$(
APPLY
)
$(
SRC
)
/gmp/gmp-fix-asm-detection.patch
$(
MOVE
)
# GMP requires either GPLv2 or LGPLv3
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment