diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-devtools/pkgconfig | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.gz talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.zip |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/pkgconfig')
4 files changed, 107 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig.inc new file mode 100644 index 000000000..55ab5c41f --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig.inc @@ -0,0 +1,49 @@ +SUMMARY = "Helper tool used when compiling" +DESCRIPTION = "pkg-config is a helper tool used when compiling applications and libraries. It helps determined \ +the correct compiler/link options. It is also language-agnostic." +HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" +BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config" +SECTION = "console/utils" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0" +DEPENDS_class-native = "" +DEPENDS_class-nativesdk = "" + +SRCREV = "40342dd0ead05d457a2a4e692cf865f50033a709" +PV = "0.28+git${SRCPV}" +SRC_URI = "git://anongit.freedesktop.org/pkg-config" + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "--without-internal-glib" +EXTRA_OECONF_class-native = "--with-internal-glib" +EXTRA_OECONF_class-nativesdk = "--with-internal-glib" + +acpaths = "-I ." + +BBCLASSEXTEND = "native nativesdk" + +# Set an empty dev package to ensure the base PN package gets +# the pkg.m4 macros, pkgconfig does not deliver any other -dev +# files. +FILES_${PN}-dev = "" +FILES_${PN} += "${datadir}/aclocal/pkg.m4" + +# When using the RPM generated automatic package dependencies, some packages +# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by +# specifying an appropriate provide. +RPROVIDES_${PN} += "pkgconfig(pkg-config)" + +# Install a pkg-config-native wrapper that will use the native sysroot instead +# of the MACHINE sysroot, for using pkg-config when building native tools. +do_install_append_class-native () { + sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ + -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ + < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native + install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native +} diff --git a/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch new file mode 100644 index 000000000..01c62472c --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch @@ -0,0 +1,45 @@ + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + + +Index: pkg-config-0.28/glib/configure.ac +=================================================================== +--- pkg-config-0.28.orig/glib/configure.ac ++++ pkg-config-0.28/glib/configure.ac +@@ -1438,7 +1438,7 @@ if test x"$glib_native_win32" = xyes; th + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./${host_alias}-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1503,13 +1503,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./${host_alias}-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ + ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 +- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./${host_alias}-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ + ${LDFLAGS} -module -o plugin.la -export-dynamic \ + -shrext ".o" -avoid-version plugin.lo \ + -rpath /dont/care >/dev/null 2>&1 +- eval `./libtool --config | grep ^objdir` ++ eval `./${host_alias}-libtool --config | grep ^objdir` + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ + AC_TRY_RUN([ +@@ -1582,7 +1582,7 @@ fi + + AC_MSG_CHECKING(for the suffix of module shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`./${host_alias}-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in new file mode 100644 index 000000000..5e44bb435 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in @@ -0,0 +1,7 @@ +#! /bin/sh + +PKG_CONFIG_PATH="@PATH_NATIVE@" +PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" +unset PKG_CONFIG_SYSROOT_DIR + +pkg-config "$@" diff --git a/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb new file mode 100644 index 000000000..eaa511a8b --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb @@ -0,0 +1,6 @@ +require pkgconfig.inc + +SRC_URI += " \ + file://pkg-config-native.in \ + file://fix-glib-configure-libtool-usage.patch \ + " |