Merge commit 'aa458a136ebd4abc55d502984b5c90ddab458288' into dora
This brings in libtalloc for the sdk
This commit is contained in:
commit
4e69783333
|
@ -0,0 +1,54 @@
|
||||||
|
# waf is a build system which is used by samba related project.
|
||||||
|
# Obtain details from https://wiki.samba.org/index.php/Waf
|
||||||
|
#
|
||||||
|
inherit qemu pythonnative
|
||||||
|
|
||||||
|
DEPENDS += "qemu-native python"
|
||||||
|
|
||||||
|
CONFIGUREOPTS = " --prefix=${prefix} \
|
||||||
|
--bindir=${bindir} \
|
||||||
|
--sbindir=${sbindir} \
|
||||||
|
--libexecdir=${libexecdir} \
|
||||||
|
--datadir=${datadir} \
|
||||||
|
--sysconfdir=${sysconfdir} \
|
||||||
|
--sharedstatedir=${sharedstatedir} \
|
||||||
|
--localstatedir=${localstatedir} \
|
||||||
|
--libdir=${libdir} \
|
||||||
|
--includedir=${includedir} \
|
||||||
|
--oldincludedir=${oldincludedir} \
|
||||||
|
--infodir=${infodir} \
|
||||||
|
--mandir=${mandir} \
|
||||||
|
"
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
qemu_binary="${@qemu_target_binary(d)}"
|
||||||
|
if [ "${qemu_binary}" = "qemu-allarch" ]; then
|
||||||
|
qemu_binary="qemuwrapper"
|
||||||
|
fi
|
||||||
|
|
||||||
|
libdir_qemu="${STAGING_DIR_HOST}/${libdir}"
|
||||||
|
base_libdir_qemu="${STAGING_DIR_HOST}/${base_libdir}"
|
||||||
|
|
||||||
|
CROSS_EXEC="${qemu_binary} \
|
||||||
|
${QEMU_OPTIONS} \
|
||||||
|
-L ${STAGING_DIR_HOST} \
|
||||||
|
-E LD_LIBRARY_PATH=${libdir_qemu}:${base_libdir_qemu}"
|
||||||
|
|
||||||
|
export BUILD_SYS=${BUILD_SYS}
|
||||||
|
export HOST_SYS=${HOST_SYS}
|
||||||
|
export BUILD_ARCH=${BUILD_ARCH}
|
||||||
|
export HOST_ARCH=${HOST_ARCH}
|
||||||
|
export STAGING_LIBDIR=${STAGING_LIBDIR}
|
||||||
|
export STAGING_INCDIR=${STAGING_INCDIR}
|
||||||
|
export PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
|
||||||
|
|
||||||
|
./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} --cross-compile --cross-execute="${CROSS_EXEC}"
|
||||||
|
}
|
||||||
|
|
||||||
|
do_compile () {
|
||||||
|
python ./buildtools/bin/waf ${PARALLEL_MAKE}
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
oe_runmake install DESTDIR=${D}
|
||||||
|
}
|
|
@ -24,7 +24,7 @@ PARALLEL_MAKE = ""
|
||||||
|
|
||||||
do_compile(){
|
do_compile(){
|
||||||
unset LD
|
unset LD
|
||||||
oe_runmake CCFLAGS="${CFLAGS}"
|
oe_runmake CCFLAGS="${CFLAGS}" CC="${CC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install(){
|
do_install(){
|
||||||
|
|
|
@ -13,7 +13,7 @@ PR = "r1"
|
||||||
|
|
||||||
PARALLEL_MAKE = ""
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
inherit autotools_stage pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-apps"
|
PACKAGES =+ "${PN}-apps"
|
||||||
FILES_${PN}-apps = "${bindir}/*"
|
FILES_${PN}-apps = "${bindir}/*"
|
||||||
|
|
|
@ -8,6 +8,6 @@ INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
||||||
|
|
||||||
inherit autotools_stage pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
ALLOW_EMPTY_libosmo-abis = "1"
|
ALLOW_EMPTY_libosmo-abis = "1"
|
||||||
|
|
|
@ -7,4 +7,4 @@ INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
inherit autotools_stage pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
|
@ -7,6 +7,6 @@ INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
inherit autotools_stage pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
ALLOW_EMPTY_libosmo-sccp = "1"
|
ALLOW_EMPTY_libosmo-sccp = "1"
|
||||||
|
|
|
@ -6,5 +6,5 @@ INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
inherit autotools_stage pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
SDK-OSMO = " \
|
SDK-OSMO = " \
|
||||||
|
libtalloc-dev \
|
||||||
libosmocore-dev \
|
libosmocore-dev \
|
||||||
libosmo-sccp-staticdev \
|
libosmo-sccp-staticdev \
|
||||||
libosmo-abis-dev \
|
libosmo-abis-dev \
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/lib/replace/wscript 2015-11-13 16:04:04.000000000 +0100
|
||||||
|
+++ b/lib/replace/wscript 2015-11-13 16:23:20.000000000 +0100
|
||||||
|
@@ -636,8 +636,6 @@
|
||||||
|
if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c'
|
||||||
|
if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c'
|
||||||
|
if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c'
|
||||||
|
- if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'):
|
||||||
|
- REPLACE_SOURCE += ' xattr.c'
|
||||||
|
|
||||||
|
bld.SAMBA_LIBRARY('replace',
|
||||||
|
source=REPLACE_SOURCE,
|
||||||
|
@@ -648,7 +646,7 @@
|
||||||
|
# at the moment:
|
||||||
|
# hide_symbols=bld.BUILTIN_LIBRARY('replace'),
|
||||||
|
private_library=True,
|
||||||
|
- deps='crypt dl nsl socket rt attr' + extra_libs)
|
||||||
|
+ deps='crypt dl nsl socket rt ' + extra_libs)
|
||||||
|
|
||||||
|
bld.SAMBA_SUBSYSTEM('replace-test',
|
||||||
|
source='''test/testsuite.c test/strptime.c
|
|
@ -0,0 +1,41 @@
|
||||||
|
SUMMARY = "Hierarchical, reference counted memory pool system with destructors"
|
||||||
|
HOMEPAGE = "http://talloc.samba.org"
|
||||||
|
SECTION = "libs"
|
||||||
|
LICENSE = "LGPL-3.0+ & GPL-3.0+"
|
||||||
|
|
||||||
|
DEPENDS += "libbsd"
|
||||||
|
|
||||||
|
SRC_URI = "http://samba.org/ftp/talloc/talloc-${PV}.tar.gz"
|
||||||
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
|
||||||
|
file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "3e285de2228ae67ff0a0f5cec658f627"
|
||||||
|
SRC_URI[sha256sum] = "7aa5f75b22d4ef9c737b25515f2a2837ddc13014ff4ac6e58dd9e311f41f2cb0"
|
||||||
|
|
||||||
|
inherit waf-samba
|
||||||
|
|
||||||
|
PACKAGECONFIG[attr] = ",,attr"
|
||||||
|
|
||||||
|
SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/talloc-${PV}"
|
||||||
|
|
||||||
|
EXTRA_OECONF += "--disable-rpath \
|
||||||
|
--disable-rpath-install \
|
||||||
|
--bundled-libraries=NONE \
|
||||||
|
--builtin-libraries=replace \
|
||||||
|
--disable-silent-rules \
|
||||||
|
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
|
||||||
|
"
|
||||||
|
DISABLE_STATIC = ""
|
||||||
|
|
||||||
|
PACKAGES += "pytalloc pytalloc-dbg pytalloc-dev"
|
||||||
|
|
||||||
|
FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \
|
||||||
|
${libdir}/libpytalloc-util.so.2 \
|
||||||
|
${libdir}/libpytalloc-util.so.2.1.1 \
|
||||||
|
"
|
||||||
|
FILES_pytalloc-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \
|
||||||
|
${libdir}/.debug/libpytalloc-util.so.2.1.1"
|
||||||
|
FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so"
|
||||||
|
RDEPENDS_pytalloc = "python"
|
Loading…
Reference in New Issue