Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
binary_c-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Izzard, Robert Dr (Maths & Physics)
binary_c-python
Commits
d1559079
Commit
d1559079
authored
7 years ago
by
Izzard, Robert Dr (Maths & Physics)
Browse files
Options
Downloads
Patches
Plain Diff
update configure and clean scripts
parent
44ace25c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
clean_release.sh
+4
-0
4 additions, 0 deletions
clean_release.sh
configure
+30
-5
30 additions, 5 deletions
configure
with
34 additions
and
5 deletions
clean_release.sh
+
4
−
0
View file @
d1559079
...
@@ -20,3 +20,7 @@ rm amanda_sn_plot.pl binary_c-antiTZ binary_c-Ba binary_c.orig binary_c-sn2014
...
@@ -20,3 +20,7 @@ rm amanda_sn_plot.pl binary_c-antiTZ binary_c-Ba binary_c.orig binary_c-sn2014
rm
-rf
faillist fails imfticks fionread
rm
-rf
faillist fails imfticks fionread
rm
*
~ src/
*
~ src/
*
/
*
~
rm
*
~ src/
*
~ src/
*
/
*
~
clean-svn.pl
clean-svn.pl
svn
rm
novae
*
pdf
svn
rm
novae
*
plt
svn
rm
cemps
This diff is collapsed.
Click to expand it.
configure
+
30
−
5
View file @
d1559079
...
@@ -462,9 +462,9 @@ sub secondary_variables
...
@@ -462,9 +462,9 @@ sub secondary_variables
if(
$cc
=~ /^(?:gcc|clang)/)
if(
$cc
=~ /^(?:gcc|clang)/)
{
{
# libraries we should include if we can
# libraries we should include if we can
if(
(
checklib('libbfd')
=~/libbfd-(
\
d+
\
.
\
d+)/)[0]
&&
if(checklib('libbfd') &&
test_for_header_file('bfd.h'))
test_for_header_file('bfd.h'))
{
{
$cflags
.= ' -D__HAVE_LIBBFD__ ';
$cflags
.= ' -D__HAVE_LIBBFD__ ';
$extralibs
.= ' -lbfd ';
$extralibs
.= ' -lbfd ';
}
}
...
@@ -1215,12 +1215,37 @@ sub stripversion
...
@@ -1215,12 +1215,37 @@ sub stripversion
sub checklib
sub checklib
{
{
# simple library checker : beware unescaped grep
# simple library checking function :
# on error return '' (empty string)
# get the library name
my
$lib
= shift;
my
$lib
= shift;
my
$r
= `ldconfig -p |grep
$lib
`;
my
$striplib
= (
$lib
=~/lib(.*)/)[0];
my
$r
;
# first try with ld because this is supposed to work on the mac
$r
= `ld -l
$striplib
2>
\
&1`;
# check for error string : if the library isn't found
# then return an empty
if(
$r
=~/cannot find -l
$striplib
/ ||
$r
=~/not found for -l
$striplib
/)
{
# library not found : return empty string
return '';
}
# find location using ld, return if found
$r
= `ld --verbose -l
$striplib
2>
\
&1`;
if(
$r
=~/attempt to open (
\
S+lib
$striplib
.so) succeeded/)
{
return $1;
}
# ld failed, try ldconfig
$r
= `ldconfig -p |grep
$lib
`;
$r
=~s/^
\
s+//;
$r
=~s/^
\
s+//;
$r
=~s/
\
s+$//;
$r
=~s/
\
s+$//;
return
$r
if(
$r
ne '');
return
$r
if(
$r
ne '');
# check in LIBRARY_PATH and LD_LIBRARY_PATH
# check in LIBRARY_PATH and LD_LIBRARY_PATH
...
...
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