Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
libcdi
Commits
5bcf0227
Commit
5bcf0227
authored
6 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Add a patch for libtool.m4.
parent
dabf8b70
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
autogen.sh
+11
-1
11 additions, 1 deletion
autogen.sh
patch/libtool_m4.patch
+19
-0
19 additions, 0 deletions
patch/libtool_m4.patch
with
30 additions
and
1 deletion
autogen.sh
+
11
−
1
View file @
5bcf0227
#!/bin/sh
autoreconf
-fvi
||
exit
$?
patch
-p
1
-i
patch/ltmain_sh.patch
-d
.
patch
-p
1
--no-backup-if-mismatch
--forward
-r
-
-i
patch/libtool_m4.patch
-d
.
# The program 'patch' exits with exitcode=1 if the patch has already been applied.
# Consider this a normal scenario:
exitcode
=
$?
;
if
test
$exitcode
-ne
0
&&
test
$exitcode
-ne
1
;
then
exit
$exitcode
;
fi
autoconf
-f
||
exit
$?
# Reset libtool.m4 timestamps to avoid confusing make
touch
-r
m4/ltversion.m4 m4/libtool.m4
||
exit
$?
patch
-p
1
--no-backup-if-mismatch
--forward
-r
-
-i
patch/ltmain_sh.patch
-d
.
exitcode
=
$?
;
if
test
$exitcode
-ne
0
&&
test
$exitcode
-ne
1
;
then
exit
$exitcode
;
fi
This diff is collapsed.
Click to expand it.
patch/libtool_m4.patch
0 → 100644
+
19
−
0
View file @
5bcf0227
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a3bc337..28d0091 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -7532,10 +7532,11 @@
if AC_TRY_EVAL(ac_compile); then
case $prev$p in
-L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
+ # Some compilers place space between "-{L,R,l}" and the path (value).
# Remove the space.
- if test x-L = "$p" ||
- test x-R = "$p"; then
+ if test x-L = x"$p" ||
+ test x-R = x"$p" ||
+ test x-l = x"$p"; then
prev=$p
continue
fi
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