diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-29 15:27:54 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:15 +1000 |
| commit | 970892594b15b946667e02d2b521cf8a501f2662 (patch) | |
| tree | 523bff2cd0b5261a7b0b4e398f67bdd9c6005bb4 /buildtools/wafsamba | |
| parent | d87b77e649bee4e4acbc0ab1d2d462673b541e7a (diff) | |
| download | samba-970892594b15b946667e02d2b521cf8a501f2662.tar.gz samba-970892594b15b946667e02d2b521cf8a501f2662.tar.xz samba-970892594b15b946667e02d2b521cf8a501f2662.zip | |
build: override PACKAGE_VERSION in pkg-config generation for libraries
we should use the vnum
Diffstat (limited to 'buildtools/wafsamba')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 291d8acb4b2..1ab583fcc9d 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -217,7 +217,7 @@ def SAMBA_LIBRARY(bld, libname, source, bld.PUBLIC_HEADERS(public_headers, header_path=header_path) if pc_files is not None: - bld.PKG_CONFIG_FILES(pc_files) + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY @@ -761,16 +761,18 @@ def subst_at_vars(task): -def PKG_CONFIG_FILES(bld, pc_files): +def PKG_CONFIG_FILES(bld, pc_files, vnum=None): '''install some pkg_config pc files''' dest = '${PKGCONFIGDIR}' dest = bld.EXPAND_VARIABLES(dest) for f in TO_LIST(pc_files): base=os.path.basename(f) - bld.SAMBA_GENERATOR('PKGCONFIG_%s' % base, - rule=subst_at_vars, - source=f+'.in', - target=f) + t = bld.SAMBA_GENERATOR('PKGCONFIG_%s' % base, + rule=subst_at_vars, + source=f+'.in', + target=f) + if vnum: + t.env.PACKAGE_VERSION = vnum INSTALL_FILES(bld, dest, f, flat=True, destname=base) Build.BuildContext.PKG_CONFIG_FILES = PKG_CONFIG_FILES |