git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20b5268
)
waf: build private libraries with so names.
author
Jelmer Vernooij
<jelmer@samba.org>
Sun, 24 Oct 2010 07:54:40 +0000
(
00:54
-0700)
committer
Jelmer Vernooij
<jelmer@samba.org>
Tue, 26 Oct 2010 17:17:17 +0000
(10:17 -0700)
buildtools/wafsamba/wafsamba.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/wafsamba.py
b/buildtools/wafsamba/wafsamba.py
index eb0c3696cb8c7dc76f520c3156a4ba039ceacafc..8e215de99485a4874033aeadcc55595f5c0d844f 100644
(file)
--- a/
buildtools/wafsamba/wafsamba.py
+++ b/
buildtools/wafsamba/wafsamba.py
@@
-181,6
+181,12
@@
def SAMBA_LIBRARY(bld, libname, source,
else:
bundled_name = PRIVATE_NAME(bld, libname, bundled_extension, private_library)
+ if private_library:
+ if vnum:
+ Logs.error("vnum is invalid for private libraries")
+ sys.exit(1)
+ vnum = bld.env.PACKAGE_VERSION
+
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
features += ' pyext'
@@
-881,7
+887,6
@@
def subst_at_vars(task):
return 0
-
def PKG_CONFIG_FILES(bld, pc_files, vnum=None):
'''install some pkg_config pc files'''
dest = '${PKGCONFIGDIR}'