Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
ThirdParty-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Development
ThirdParty-common
Commits
1189ff23
Commit
1189ff23
authored
8 years ago
by
mark
Browse files
Options
Downloads
Patches
Plain Diff
BUG: pkgconfigPrefix calling the incorrect backend
ENH: avoid editing pkgconfig symlinks
parent
5c09a643
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!4
Merge develop into master for v1706 release
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
etc/pkgconfigPrefix
+1
-1
1 addition, 1 deletion
etc/pkgconfigPrefix
etc/tools/ThirdPartyFunctions
+2
-2
2 additions, 2 deletions
etc/tools/ThirdPartyFunctions
with
3 additions
and
3 deletions
etc/pkgconfigPrefix
+
1
−
1
View file @
1189ff23
...
...
@@ -76,7 +76,7 @@ do
usage
;;
*
)
pkgconfig
Adjust
"
$1
"
pkgconfig
NewPrefix
"
$1
"
;;
esac
shift
...
...
This diff is collapsed.
Click to expand it.
etc/tools/ThirdPartyFunctions
+
2
−
2
View file @
1189ff23
...
...
@@ -281,7 +281,7 @@ pkgconfigNewPrefix()
[
-d
"
$dir
/
$libdir
"
]
||
continue
for
i
in
$dir
/
$libdir
/
*
.pc
do
if
[
-f
"
$i
"
]
if
[
-f
"
$i
"
-a
!
-L
"
$i
"
]
then
nfiles
=
"x
$nfiles
"
sed
-i
-e
's@^\(prefix=\).*$@\1'
"
$dir
@"
$i
...
...
@@ -329,7 +329,7 @@ pkgconfigAdjust()
[
-d
"
$dir
/
$libdir
"
]
||
continue
for
i
in
$dir
/
$libdir
/
*
.pc
do
if
[
-f
"
$i
"
]
if
[
-f
"
$i
"
-a
!
-L
"
$i
"
]
then
nfiles
=
"x
$nfiles
"
sed
-i
\
...
...
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