diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 8 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-1.62.0.inc | 4 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 8 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 2 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_58.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.11.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libiconv/libiconv_1.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.2.28.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3.inc | 2 | ||||
-rw-r--r-- | meta/recipes-support/taglib/taglib_1.11.1.bb | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 583ca1f84c..8750c3bc64 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc | |||
@@ -21,8 +21,8 @@ do_install_append_class-native () { | |||
21 | if test "${libdir}" = "${base_libdir}" ; then | 21 | if test "${libdir}" = "${base_libdir}" ; then |
22 | return | 22 | return |
23 | fi | 23 | fi |
24 | librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir', True))} | 24 | librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir'))} |
25 | baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir', True))} | 25 | baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir'))} |
26 | 26 | ||
27 | # Remove bad symlinks & create the correct symlinks | 27 | # Remove bad symlinks & create the correct symlinks |
28 | if test -L ${D}${libdir}/lib${BPN}.so ; then | 28 | if test -L ${D}${libdir}/lib${BPN}.so ; then |
@@ -45,5 +45,5 @@ FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" | |||
45 | 45 | ||
46 | BBCLASSEXTEND = "native" | 46 | BBCLASSEXTEND = "native" |
47 | # Only append ldflags for target recipe and if USE_NLS is enabled | 47 | # Only append ldflags for target recipe and if USE_NLS is enabled |
48 | LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}" | 48 | LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}" |
49 | EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" | 49 | EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" |
diff --git a/meta/recipes-support/boost/boost-1.62.0.inc b/meta/recipes-support/boost/boost-1.62.0.inc index 1e555e19bf..1138de61f1 100644 --- a/meta/recipes-support/boost/boost-1.62.0.inc +++ b/meta/recipes-support/boost/boost-1.62.0.inc | |||
@@ -7,8 +7,8 @@ HOMEPAGE = "http://www.boost.org/" | |||
7 | LICENSE = "BSL-1.0 & MIT & Python-2.0" | 7 | LICENSE = "BSL-1.0 & MIT & Python-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 8 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
9 | 9 | ||
10 | BOOST_VER = "${@"_".join(d.getVar("PV", True).split("."))}" | 10 | BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" |
11 | BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}" | 11 | BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" |
12 | BOOST_P = "boost_${BOOST_VER}" | 12 | BOOST_P = "boost_${BOOST_VER}" |
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" |
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 1966d3d807..a1a6a90f9c 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -59,7 +59,7 @@ PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" | |||
59 | python __anonymous () { | 59 | python __anonymous () { |
60 | packages = [] | 60 | packages = [] |
61 | extras = [] | 61 | extras = [] |
62 | for lib in d.getVar('BOOST_LIBS', True).split( ): | 62 | for lib in d.getVar('BOOST_LIBS').split( ): |
63 | # BJAM does not know '--with-python3' (only --with-python) | 63 | # BJAM does not know '--with-python3' (only --with-python) |
64 | if lib != "python3": | 64 | if lib != "python3": |
65 | extras.append("--with-%s" % lib) | 65 | extras.append("--with-%s" % lib) |
@@ -67,10 +67,10 @@ python __anonymous () { | |||
67 | packages.append(pkg) | 67 | packages.append(pkg) |
68 | if lib == "python": | 68 | if lib == "python": |
69 | # special: python*.so matches python3.so !! | 69 | # special: python*.so matches python3.so !! |
70 | if not d.getVar("FILES_%s" % pkg, True): | 70 | if not d.getVar("FILES_%s" % pkg): |
71 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) | 71 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) |
72 | else: | 72 | else: |
73 | if not d.getVar("FILES_%s" % pkg, True): | 73 | if not d.getVar("FILES_%s" % pkg): |
74 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) | 74 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) |
75 | d.setVar("BOOST_PACKAGES", " ".join(packages)) | 75 | d.setVar("BOOST_PACKAGES", " ".join(packages)) |
76 | d.setVar("BJAM_EXTRA", " ".join(extras)) | 76 | d.setVar("BJAM_EXTRA", " ".join(extras)) |
@@ -145,7 +145,7 @@ BJAM_TOOLS = "--ignore-site-config \ | |||
145 | # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j | 145 | # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j |
146 | # https://svn.boost.org/trac/boost/ticket/7634 | 146 | # https://svn.boost.org/trac/boost/ticket/7634 |
147 | def get_boost_parallel_make(d): | 147 | def get_boost_parallel_make(d): |
148 | pm = d.getVar('PARALLEL_MAKE', True) | 148 | pm = d.getVar('PARALLEL_MAKE') |
149 | if pm: | 149 | if pm: |
150 | # look for '-j' and throw other options (e.g. '-l') away | 150 | # look for '-j' and throw other options (e.g. '-l') away |
151 | # because they might have different meaning in bjam | 151 | # because they might have different meaning in bjam |
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 51b9d2b191..4a5c3dfebf 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ | |||
15 | DEPENDS = "nettle gmp virtual/libiconv" | 15 | DEPENDS = "nettle gmp virtual/libiconv" |
16 | DEPENDS_append_libc-musl = " argp-standalone" | 16 | DEPENDS_append_libc-musl = " argp-standalone" |
17 | 17 | ||
18 | SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" | 18 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
19 | 19 | ||
20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" | 20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" |
21 | 21 | ||
diff --git a/meta/recipes-support/icu/icu_58.1.bb b/meta/recipes-support/icu/icu_58.1.bb index cc7c94707b..9243a6a173 100644 --- a/meta/recipes-support/icu/icu_58.1.bb +++ b/meta/recipes-support/icu/icu_58.1.bb | |||
@@ -3,7 +3,7 @@ require icu.inc | |||
3 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" | 3 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" |
4 | 4 | ||
5 | def icu_download_version(d): | 5 | def icu_download_version(d): |
6 | pvsplit = d.getVar('PV', True).split('.') | 6 | pvsplit = d.getVar('PV').split('.') |
7 | return pvsplit[0] + "_" + pvsplit[1] | 7 | return pvsplit[0] + "_" + pvsplit[1] |
8 | 8 | ||
9 | ICU_PV = "${@icu_download_version(d)}" | 9 | ICU_PV = "${@icu_download_version(d)}" |
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb index 6ce4b96e33..f28e64ae2e 100644 --- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb +++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb | |||
@@ -23,7 +23,7 @@ S = "${WORKDIR}/libiconv-${PV}" | |||
23 | inherit autotools pkgconfig gettext | 23 | inherit autotools pkgconfig gettext |
24 | 24 | ||
25 | python __anonymous() { | 25 | python __anonymous() { |
26 | if d.getVar("TCLIBC", True) == "glibc": | 26 | if d.getVar("TCLIBC") == "glibc": |
27 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") | 27 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") |
28 | } | 28 | } |
29 | 29 | ||
diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb index 1b6fe09bb7..9fd5114ac8 100644 --- a/meta/recipes-support/libiconv/libiconv_1.14.bb +++ b/meta/recipes-support/libiconv/libiconv_1.14.bb | |||
@@ -23,9 +23,9 @@ S = "${WORKDIR}/libiconv-${PV}" | |||
23 | inherit autotools pkgconfig gettext | 23 | inherit autotools pkgconfig gettext |
24 | 24 | ||
25 | python __anonymous() { | 25 | python __anonymous() { |
26 | if d.getVar("TARGET_OS", True) != "linux": | 26 | if d.getVar("TARGET_OS") != "linux": |
27 | return | 27 | return |
28 | if d.getVar("TCLIBC", True) == "glibc": | 28 | if d.getVar("TCLIBC") == "glibc": |
29 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") | 29 | raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/meta/recipes-support/libnl/libnl_3.2.28.bb b/meta/recipes-support/libnl/libnl_3.2.28.bb index 26982f3efb..04e2d18f79 100644 --- a/meta/recipes-support/libnl/libnl_3.2.28.bb +++ b/meta/recipes-support/libnl/libnl_3.2.28.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
9 | 9 | ||
10 | DEPENDS = "flex-native bison-native" | 10 | DEPENDS = "flex-native bison-native" |
11 | 11 | ||
12 | SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV', True).replace('.','_')}/${BP}.tar.gz \ | 12 | SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ |
13 | file://fix-pktloc_syntax_h-race.patch \ | 13 | file://fix-pktloc_syntax_h-race.patch \ |
14 | file://fix-pc-file.patch \ | 14 | file://fix-pc-file.patch \ |
15 | file://0001-lib-add-utility-function-nl_strerror_l.patch \ | 15 | file://0001-lib-add-utility-function-nl_strerror_l.patch \ |
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb index 16c6068109..a1f294efbf 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | |||
7 | 7 | ||
8 | DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" | 8 | DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" |
9 | 9 | ||
10 | SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" | 10 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
11 | 11 | ||
12 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" | 12 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" |
13 | 13 | ||
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index 80424c9cd6..42b534d8ef 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc | |||
@@ -5,7 +5,7 @@ SECTION = "libs" | |||
5 | PE = "3" | 5 | PE = "3" |
6 | 6 | ||
7 | def sqlite_download_version(d): | 7 | def sqlite_download_version(d): |
8 | pvsplit = d.getVar('PV', True).split('.') | 8 | pvsplit = d.getVar('PV').split('.') |
9 | if len(pvsplit) < 4: | 9 | if len(pvsplit) < 4: |
10 | pvsplit.append('0') | 10 | pvsplit.append('0') |
11 | return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) | 11 | return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) |
diff --git a/meta/recipes-support/taglib/taglib_1.11.1.bb b/meta/recipes-support/taglib/taglib_1.11.1.bb index ee1b5234bb..54a92d94ec 100644 --- a/meta/recipes-support/taglib/taglib_1.11.1.bb +++ b/meta/recipes-support/taglib/taglib_1.11.1.bb | |||
@@ -26,7 +26,7 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ | |||
26 | -DHAVE_BOOST_BYTESWAP=FALSE \ | 26 | -DHAVE_BOOST_BYTESWAP=FALSE \ |
27 | -DCMAKE_CXX_STANDARD=11 \ | 27 | -DCMAKE_CXX_STANDARD=11 \ |
28 | -DCMAKE_CXX_STANDARD_REQUIRED=OFF \ | 28 | -DCMAKE_CXX_STANDARD_REQUIRED=OFF \ |
29 | -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \ | 29 | -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ |
30 | " | 30 | " |
31 | CXXFLAGS += "-std=c++11" | 31 | CXXFLAGS += "-std=c++11" |
32 | 32 | ||