From 0a374e196fc00e4efca2a83de642296eca3eca91 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 10 Dec 2021 14:22:35 +0000 Subject: pkgconfig: remove obsolete support for renamed libtool libtool is now longer renamed to ${host}-libtool, so remove the changes to support this. (From OE-Core rev: 5a4088a1dce17886d391db25a667dd4e0dbbc5cb) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../fix-glib-configure-libtool-usage.patch | 45 ---------------------- meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 1 - 2 files changed, 46 deletions(-) delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch deleted file mode 100644 index 01c62472c1..0000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch +++ /dev/null @@ -1,45 +0,0 @@ - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Saul Wold - - -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/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index c220bafd90..16efcef561 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb @@ -14,7 +14,6 @@ PV = "0.29.2+git${SRCPV}" SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master;protocol=https \ file://pkg-config-esdk.in \ file://pkg-config-native.in \ - file://fix-glib-configure-libtool-usage.patch \ file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \ file://0001-autotools-remove-support-for-the-__int64-type.-See-1.patch \ file://0001-autotools-use-C99-printf-format-specifiers-on-Window.patch \ -- cgit v1.2.3-54-g00ecf