Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sct
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
dkrz-sw
sct
Commits
34376c28
Commit
34376c28
authored
5 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Remove redundant libtool patch.
parent
92baa032
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
+0
-5
0 additions, 5 deletions
autogen.sh
maint/ltmain.sh.no_flag_duplication.patch
+0
-41
0 additions, 41 deletions
maint/ltmain.sh.no_flag_duplication.patch
with
0 additions
and
46 deletions
autogen.sh
+
0
−
5
View file @
34376c28
...
...
@@ -38,11 +38,6 @@ touch -r m4/ltversion.m4 m4/libtool.m4 || exit $?
patch
--forward
--no-backup-if-mismatch
-p1
-s
-l
-i
maint/ltmain.sh.nag_pthread.patch
exitcode
=
$?
;
test
$exitcode
-ne
0
&&
test
$exitcode
-ne
1
&&
exit
$exitcode
# Libtool might duplicate some of the compilation or linking flags (e.g. -fopenmp)
# when calling the actual compiler, which is considered and error by nagfor:
patch
--forward
--no-backup-if-mismatch
-p1
-s
-l
-i
maint/ltmain.sh.no_flag_duplication.patch
exitcode
=
$?
;
test
$exitcode
-ne
0
&&
test
$exitcode
-ne
1
&&
exit
$exitcode
# All went fine since we have not exited before:
exit
0
This diff is collapsed.
Click to expand it.
maint/ltmain.sh.no_flag_duplication.patch
deleted
100644 → 0
+
0
−
41
View file @
92baa032
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -8539,11 +8539,33 @@
func_mode_link ()
fi # linkmode = lib
done # for deplib in $libs
if test link = "$pass"; then
- if test prog = "$linkmode"; then
- compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
- finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
- else
- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ # Avoid duplication of the flags
+ if test -n "$new_inherited_linker_flags"; then
+ if test prog = "$linkmode"; then
+ tmp_inherited_linker_flags_compile_deplibs=
+ tmp_inherited_linker_flags_finalize_deplibs=
+ for new_inherited_linker_flag in $new_inherited_linker_flags; do
+ case "$compile_command " in
+ *" $new_inherited_linker_flag "*) ;;
+ *) func_append tmp_inherited_linker_flags_compile_deplibs " $new_inherited_linker_flag" ;;
+ esac
+ case "$finalize_command " in
+ *" $new_inherited_linker_flag "*) ;;
+ *) func_append tmp_inherited_linker_flags_finalize_deplibs " $new_inherited_linker_flag" ;;
+ esac
+ done
+ compile_deplibs="$tmp_inherited_linker_flags_compile_deplibs $compile_deplibs"
+ finalize_deplibs="$tmp_inherited_linker_flags_finalize_deplibs $finalize_deplibs"
+ else
+ tmp_inherited_linker_flags_compiler_flags=
+ for new_inherited_linker_flag in $new_inherited_linker_flags; do
+ case "$compiler_flags " in
+ *" $new_inherited_linker_flag "*) ;;
+ *) func_append tmp_inherited_linker_flags_compiler_flags " $new_inherited_linker_flag" ;;
+ esac
+ done
+ compiler_flags="$compiler_flags "`$ECHO " $tmp_inherited_linker_flags_compiler_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
fi
fi
dependency_libs=$newdependency_libs
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