Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
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
Main Repositories
otb
Commits
8d7a4bd5
Commit
8d7a4bd5
authored
Aug 09, 2018
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "BUG: fix find files in pkgsetup (linux,osx)
#1672
"
This reverts commit
3001945a
.
parent
3001945a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
Packaging/Files/linux_pkgsetup.in
Packaging/Files/linux_pkgsetup.in
+1
-3
Packaging/Files/macx_pkgsetup.in
Packaging/Files/macx_pkgsetup.in
+2
-2
No files found.
Packaging/Files/linux_pkgsetup.in
View file @
8d7a4bd5
...
...
@@ -52,9 +52,7 @@ fi
unset
LD_LIBRARY_PATH
# we remove files in $OUT_DIR/lib/gtk which we CANNOT add new rpath
#RK: We cannot avoid -maxdepth 1 option in find command below and must list search directories
#search inside plugins/* and python* directories is what we need here.
BINARY_FILES
=
$(
find
"
$OUT_DIR
/bin"
"
$OUT_DIR
/lib"
"
$OUT_DIR
/lib/otb/applications"
$OUT_DIR
/lib/python
*
$OUT_DIR
/plugins/
*
-maxdepth
1
-type
f
-exec
file
{}
\;
|
grep
-i
elf|cut
-f1
-d
':'
)
BINARY_FILES
=
$(
find
"
$OUT_DIR
/lib"
"
$OUT_DIR
/bin"
"
$OUT_DIR
/plugins"
-type
f
-exec
file
{}
\;
|
grep
-v
'/lib/gtk/'
|
grep
-i
elf|cut
-f1
-d
':'
)
# run patchelf
for
bin_file
in
$BINARY_FILES
;
do
#echo "adding rpath to $bin_file"
...
...
Packaging/Files/macx_pkgsetup.in
View file @
8d7a4bd5
...
...
@@ -51,8 +51,8 @@ unset DYLD_FALLBACK_LIBRARY_PATH
echo
"Configuring..."
LIB_FILES
=
$(
find
"
$OUT_DIR
/lib"
"
$OUT_DIR
/
lib/otb/applications"
$OUT_DIR
/lib/python
*
$OUT_DIR
/plugins/
*
-maxdepth
1
-type
f
-exec
file
{}
\;
|
grep
-i
"Mach-O"
|cut
-d
':'
-f1
)
BIN_FILES
=
$(
find
"
$OUT_DIR
/bin"
-
maxdepth
1
-
type
f
-exec
file
{}
\;
|
grep
-i
"Mach-O*.*executable"
|cut
-d
':'
-f1
)
LIB_FILES
=
$(
find
"
$OUT_DIR
/lib"
"
$OUT_DIR
/
plugins"
-type
f
-exec
file
{}
\;
|
grep
-i
"Mach-O"
|cut
-d
':'
-f1
)
BIN_FILES
=
$(
find
"
$OUT_DIR
/bin"
-type
f
-exec
file
{}
\;
|
grep
-i
"Mach-O*.*executable"
|cut
-d
':'
-f1
)
# run install_name_tool
for
input_file
in
$LIB_FILES
$BIN_FILES
;
do
#echo "adding rpath to $OUT_DIR/$lib_file"
...
...
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