Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: refactor pkg-config for shared libraries #1603

Closed
wants to merge 16 commits into from
Closed

build: refactor pkg-config for shared libraries #1603

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e7ce51e
build: refactor pkg-config for shared libraries
jbergstroem May 4, 2015
38c6195
fixup! simplify library uniqueness
jbergstroem May 4, 2015
4365f34
fixup! avoid one pkg-config call
jbergstroem May 4, 2015
d5990d1
fixup! style
jbergstroem May 4, 2015
43feb45
fixup! remove unneeded string replace
jbergstroem May 4, 2015
82e5af7
fixup! check PKG_CONFIG_PATH as well
jbergstroem May 4, 2015
524de59
fixup: properly parse include headers
jbergstroem May 5, 2015
ac3df1b
fixup: styling and libpath support
jbergstroem May 12, 2015
bb6697f
fixup: another styling nit
jbergstroem May 12, 2015
1f99345
fixup: check for libs when using system-icu
jbergstroem May 12, 2015
dea139a
fixup: check_output returns bytes, not a string
jbergstroem May 12, 2015
0350f14
fixup: style and document info about splitting lib/libpath
jbergstroem May 14, 2015
d8f4f6d
fixup: provide libpath ahead of libraries
jbergstroem May 18, 2015
c5fed67
fixup: avoid using set for variable name
jbergstroem May 18, 2015
1e1b008
fix: Don't use PKG_CONFIG_PATH
jbergstroem May 18, 2015
389a667
fix: don't sort/unique libs
jbergstroem May 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! avoid one pkg-config call
  • Loading branch information
@jbergstroem
jbergstroem committed May 4, 2015
commit 4365f34fd5fe4eb1125ec22f17232a51bee15fa5
8 changes: 3 additions & 5 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,6 @@ def b(value):
def pkg_config(pkg):
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
pkg_config_args = '--silence-errors'
try:
subprocess.check_output([pkg_config, '--version'])
except OSError:
# no pkg-config/pkgconf installed
return (None, None)

retval = ()
for flag in ['--libs', '--cflags']:
Expand All @@ -358,6 +353,9 @@ def pkg_config(pkg):
except subprocess.CalledProcessError:
# most likely missing a .pc-file
val = None
except OSError:
# no pkg-config/pkgconf installed
return (None, None)

retval += (val,)

Expand Down