summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch35
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch (renamed from meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch)0
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch45
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h (renamed from meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h)0
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc6
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch48
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb13
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb10
8 files changed, 58 insertions, 99 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
deleted file mode 100644
index b6e7f62d4d..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Backport [fixed in 0.27]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in
5--- pkg-config-0.25/configure.in 2010-05-28 18:55:09.000000000 +0300
6+++ pkg-config-0.25/configure.in 2013-01-01 22:13:47.009573426 +0200
7@@ -4,7 +4,7 @@
8 AM_INIT_AUTOMAKE(pkg-config, 0.25)
9 AM_MAINTAINER_MODE
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 AM_PROG_LIBTOOL
15
16diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in
17--- pkg-config-0.25/glib-1.2.10/configure.in 2009-12-06 22:43:59.000000000 +0200
18+++ pkg-config-0.25/glib-1.2.10/configure.in 2013-01-01 22:23:36.701560486 +0200
19@@ -63,7 +63,7 @@
20 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
21
22 # Specify a configuration file
23-AM_CONFIG_HEADER(config.h)
24+AC_CONFIG_HEADERS(config.h)
25
26 AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
27 AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
28@@ -154,7 +154,6 @@
29
30 # Checks for programs.
31 AC_PROG_CC
32-AM_PROG_CC_STDC
33 AC_PROG_INSTALL
34
35 changequote(,)dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
index 9853577b58..9853577b58 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
new file mode 100644
index 0000000000..9bee438a49
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
@@ -0,0 +1,45 @@
1
2Upstream-Status: Inapropriate [embedded specific]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6
7Index: pkg-config-0.28/glib/configure.ac
8===================================================================
9--- pkg-config-0.28.orig/glib/configure.ac
10+++ pkg-config-0.28/glib/configure.ac
11@@ -1438,7 +1438,7 @@ if test x"$glib_native_win32" = xyes; th
12 G_MODULE_LDFLAGS=
13 else
14 export SED
15- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
16+ G_MODULE_LDFLAGS=`(./${host_alias}-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
17 fi
18 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
19 G_MODULE_NEED_USCORE=0
20@@ -1503,13 +1503,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
21 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
22 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
23 echo "void glib_plugin_test(void) { }" > plugin.c
24- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
25+ ${SHELL} ./${host_alias}-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
26 ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
27- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
28+ ${SHELL} ./${host_alias}-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
29 ${LDFLAGS} -module -o plugin.la -export-dynamic \
30 -shrext ".o" -avoid-version plugin.lo \
31 -rpath /dont/care >/dev/null 2>&1
32- eval `./libtool --config | grep ^objdir`
33+ eval `./${host_alias}-libtool --config | grep ^objdir`
34 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
35 glib_cv_rtldglobal_broken,[
36 AC_TRY_RUN([
37@@ -1582,7 +1582,7 @@ fi
38
39 AC_MSG_CHECKING(for the suffix of module shared libraries)
40 export SED
41-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
42+shrext_cmds=`./${host_alias}-libtool --config | grep '^shrext_cmds='`
43 eval $shrext_cmds
44 module=yes eval std_shrext=$shrext_cmds
45 # chop the initial dot
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h
index 1329e7f21c..1329e7f21c 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 52b9ad1e75..3e655a93e2 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -18,9 +18,9 @@ S = "${WORKDIR}/pkg-config-${PV}/"
18 18
19inherit autotools 19inherit autotools
20 20
21EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts" 21EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib"
22EXTRA_OECONF_class-native = "--disable-legacy-scripts" 22EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib"
23EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts" 23EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib"
24 24
25acpaths = "-I ." 25acpaths = "-I ."
26do_configure_prepend () { 26do_configure_prepend () {
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
deleted file mode 100644
index 30db36c182..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3On an Fedora host with glib-config installed pkgconfig-native can get into a
4horrible state with recursive calls between pkg-config and glib-config.
5The patch adds a configure time option to disable legacy script support in
6pkgconfig with the --disable-legacy-scripts option, to maintain compatibility
7the default is to leave the scripts enabled.
8
9JL - 22/06/10
10Index: pkg-config-0.25/configure.in
11===================================================================
12--- pkg-config-0.25.orig/configure.in 2011-10-05 18:52:24.879726050 +0100
13+++ pkg-config-0.25/configure.in 2011-10-05 18:55:39.639726152 +0100
14@@ -151,6 +151,18 @@
15 AC_SUBST([POPT_LIBS])
16 AM_CONDITIONAL([USE_INSTALLED_POPT], [test "x$with_installed_popt" = xyes])
17
18+# legacy *-configure scripts can cause headaches, add option to disable
19+AC_ARG_ENABLE(legacy-scripts,
20+ [AC_HELP_STRING([--enable-legacy-scripts=@<:@no/yes@:>@],
21+ [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])],
22+ [],
23+ [enable_legacy=yes])
24+AM_CONDITIONAL([NO_LEGACY_SCRIPTS], [test x$enable_legacy != xyes])
25+if test x$enable_legacy != xyes; then
26+ AC_DEFINE(NO_LEGACY_SCRIPTS, 1, [We are not using legacy scripts])
27+fi
28+
29+
30 AC_FUNC_ALLOCA
31
32 AC_CHECK_FUNCS(setresuid setreuid,break)
33Index: pkg-config-0.25/parse.c
34===================================================================
35--- pkg-config-0.25.orig/parse.c 2011-10-05 18:52:24.869726050 +0100
36+++ pkg-config-0.25/parse.c 2011-10-05 18:54:49.909726133 +0100
37@@ -1237,6 +1237,11 @@
38 * messages.
39 */
40 return NULL;
41+#elif defined(NO_LEGACY_SCRIPTS)
42+ /* There are scenarios where we might not want to use these legacy
43+ * scripts even if they are available.
44+ */
45+ return NULL;
46 #else
47
48 Package *pkg;
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
deleted file mode 100644
index a55d017581..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require pkgconfig.inc
2
3PR = "r7"
4
5SRC_URI += "file://autofoo.patch \
6 file://glibconfig-sysdefs.h \
7 file://pkg-config-native.in \
8 file://disable-legacy.patch \
9 file://obsolete_automake_macros.patch \
10 "
11
12SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
13SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
new file mode 100644
index 0000000000..99bb47f42d
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
@@ -0,0 +1,10 @@
1require pkgconfig.inc
2
3SRC_URI += " \
4 file://glibconfig-sysdefs.h \
5 file://pkg-config-native.in \
6 file://fix-glib-configure-libtool-usage.patch \
7 "
8
9SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"
10SRC_URI[sha256sum] = "6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 01:16:26 +0000