summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-23 20:35:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 14:59:50 +0100
commit3ec67a951ebd670261fb1fd61f6bd043c6ec9573 (patch)
tree166a1aa829ed66afb5f1a77b6b44a23434706a9a
parent2a14041f3c3296d22dae44f980318e836a9bf502 (diff)
downloadpoky-3ec67a951ebd670261fb1fd61f6bd043c6ec9573.tar.gz
pkgconfig: Upgrade to latest git tip
0.28 was released 2 years ago and bunch of patches have gone in since. The commit rate is quite low so its not a lot of churn to use. We have backports for few bugs that are removed. Git version of recipe is removed too since its no longer needed Change-Id: I4b57db15320c76b1de5d26a733e60436663ff34a (From OE-Core rev: c7478e328f6507350b7d2d2c790b3dd2bfe2d832) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch30
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch528
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch16
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc6
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch528
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch (renamed from meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch)0
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb11
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb42
8 files changed, 8 insertions, 1153 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
deleted file mode 100644
index 84d0dd8ca7..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Backport (will be in 0.29)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ce1a2416ce0f0bd9a8a8a5caaf7dad20cda4d47d Mon Sep 17 00:00:00 2001
5From: Andrew Oakley <aoakley@espial.com>
6Date: Tue, 29 Apr 2014 13:14:35 +0100
7Subject: [PATCH] Strip system library directories reliably
8
9This loop was changed from a while loop to a for loop in commit
109bf6277b, but the iterator is now advanced twice each time round the
11loop.
12---
13 pkg.c | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/pkg.c b/pkg.c
17index 3697fec..c847c95 100644
18--- a/pkg.c
19+++ b/pkg.c
20@@ -917,7 +917,6 @@ verify_package (Package *pkg)
21 }
22 system_dir_iter = system_dir_iter->next;
23 }
24- iter = iter->next;
25 }
26 g_list_free (system_directories);
27
28--
291.7.10.4
30
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
deleted file mode 100644
index 9853577b58..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch
+++ /dev/null
@@ -1,528 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 glib-1.2.10/acglib.m4 | 12 +-
5 glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------
6 2 files changed, 140 insertions(+), 84 deletions(-)
7
8Index: pkg-config-0.23/glib-1.2.10/acglib.m4
9===================================================================
10--- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000
11+++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000
12@@ -10,7 +10,7 @@
13 AC_DIVERT_POP()])])])
14
15 dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
16-AC_DEFUN(GLIB_IF_VAR_EQ,[
17+AC_DEFUN([GLIB_IF_VAR_EQ],[
18 case "$[$1]" in
19 "[$2]"[)]
20 [$3]
21@@ -21,7 +21,7 @@
22 esac
23 ])
24 dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION])
25-AC_DEFUN(GLIB_STR_CONTAINS,[
26+AC_DEFUN([GLIB_STR_CONTAINS],[
27 case "[$1]" in
28 *"[$2]"*[)]
29 [$3]
30@@ -32,12 +32,12 @@
31 esac
32 ])
33 dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING)
34-AC_DEFUN(GLIB_ADD_TO_VAR,[
35+AC_DEFUN([GLIB_ADD_TO_VAR],[
36 GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]")
37 ])
38
39 dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
40-AC_DEFUN(GLIB_SIZEOF,
41+AC_DEFUN([GLIB_SIZEOF],
42 [changequote(<<, >>)dnl
43 dnl The name to #define.
44 define(<<AC_TYPE_NAME>>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl
45@@ -62,7 +62,7 @@
46 ])
47
48 dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER)
49-AC_DEFUN(GLIB_BYTE_CONTENTS,
50+AC_DEFUN([GLIB_BYTE_CONTENTS],
51 [changequote(<<, >>)dnl
52 dnl The name to #define.
53 define(<<AC_TYPE_NAME>>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl
54@@ -92,7 +92,7 @@
55 ])
56
57 dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
58-AC_DEFUN(GLIB_SYSDEFS,
59+AC_DEFUN([GLIB_SYSDEFS],
60 [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
61 glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'`
62 if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
63Index: pkg-config-0.23/glib-1.2.10/configure.in
64===================================================================
65--- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000
66+++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000
67@@ -1,10 +1,11 @@
68 dnl ***********************************
69 dnl *** include special GLib macros ***
70 dnl ***********************************
71-builtin(include, acglib.m4)dnl
72+dnl no need, just use aclocal -I . --CL
73+dnl builtin(include, acglib.m4)dnl
74
75 # require autoconf 2.13
76-AC_PREREQ(2.13)
77+AC_PREREQ(2.53)
78
79 # init autoconf (and check for presence of glist.c)
80 AC_INIT(glist.c)
81@@ -13,11 +14,48 @@
82 cflags_set=${CFLAGS+set}
83
84 # we rewrite this file
85+if test "x$cross_compiling" != "xyes"; then
86 rm -f glibconfig-sysdefs.h
87+fi
88+
89+# config defines
90+
91+AH_TEMPLATE([ENABLE_MEM_CHECK],
92+ [Define if enabling memory checking])
93+AH_TEMPLATE([ENABLE_MEM_PROFILE], [])
94+AH_TEMPLATE([GLIB_BINARY_AGE], [])
95+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], [])
96+AH_TEMPLATE([GLIB_INTERFACE_AGE], [])
97+AH_TEMPLATE([GLIB_MAJOR_VERSION], [])
98+AH_TEMPLATE([GLIB_MINOR_VERSION], [])
99+AH_TEMPLATE([GLIB_MICRO_VERSION], [])
100+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], [])
101+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], [])
102+AH_TEMPLATE([G_HAVE_INLINE], [])
103+AH_TEMPLATE([G_HAVE___INLINE], [])
104+AH_TEMPLATE([G_HAVE___INLINE__], [])
105+AH_TEMPLATE([G_THREAD_SOURCE], [])
106+AH_TEMPLATE([G_VA_COPY], [])
107+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], [])
108+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], [])
109+AH_TEMPLATE([HAVE_GETPWUID_R], [])
110+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], [])
111+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], [])
112+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], [])
113+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], [])
114+AH_TEMPLATE([HAVE_WCHAR_H], [])
115+AH_TEMPLATE([HAVE_WCTYPE_H], [])
116+AH_TEMPLATE([NO_FD_SET], [])
117+AH_TEMPLATE([NO_SYS_ERRLIST], [])
118+AH_TEMPLATE([NO_SYS_SIGLIST], [])
119+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], [])
120+AH_TEMPLATE([REALLOC_0_WORKS], [])
121+
122
123 dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
124 dnl are available for $ac_help expansion (don't we all *love* autoconf?)
125-GLIB_AC_DIVERT_BEFORE_HELP([
126+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
127+#dnl
128 #
129 # The following version number definitions apply to GLib, GModule and GThread
130 # as a whole, so if changes occoured in any of them, they are all
131@@ -38,7 +76,7 @@
132 GLIB_BINARY_AGE=10
133 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
134 dnl
135-])
136+#AC_DIVERT_POP()dnl
137
138 AC_SUBST(GLIB_MAJOR_VERSION)
139 AC_SUBST(GLIB_MINOR_VERSION)
140@@ -72,22 +110,20 @@
141 AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
142
143 dnl Initialize libtool
144-AC_PROG_LIBTOOL
145+AM_PROG_LIBTOOL
146
147 dnl Initialize maintainer mode
148 AM_MAINTAINER_MODE
149
150-AC_CANONICAL_HOST
151-
152 dnl figure debugging default, prior to $ac_help setup
153 dnl
154-GLIB_AC_DIVERT_BEFORE_HELP([
155+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
156 if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
157 debug_default=yes
158 else
159 debug_default=minimum
160 fi
161-]) dnl
162+#AC_DIVERT_POP()dnl
163
164 dnl declare --enable-* args and collect ac_help strings
165 AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
166@@ -194,7 +230,9 @@
167 CFLAGS=$glib_save_CFLAGS
168 AC_MSG_WARN(
169 [No ANSI prototypes found in library. (-std1 didn't work.)])
170+ , AC_MSG_WARN([Skipping test due to crosscompilation])
171 )
172+ , AC_MSG_WARN([Skipping test due to crosscompilation])
173 )
174 LIBS=$glib_save_LIBS
175
176@@ -336,7 +374,7 @@
177 if test $gtk_ok = yes; then
178 AC_MSG_RESULT([yes, found in sys/types.h])
179 else
180- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
181+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
182 if test $gtk_ok = yes; then
183 AC_DEFINE(HAVE_SYS_SELECT_H)
184 AC_MSG_RESULT([yes, found in sys/select.h])
185@@ -409,7 +447,7 @@
186 glib_cv_sane_realloc=no
187 ,)
188 ])
189-if test x$glib_cv_sane_realloc = xyes; then
190+if test "x$glib_cv_sane_realloc" = "xyes"; then
191 AC_DEFINE(REALLOC_0_WORKS)
192 fi
193 AC_MSG_RESULT($glib_cv_sane_realloc)
194@@ -487,7 +525,8 @@
195 ])
196 if test "x$glib_cv_va_copy" = "xyes"; then
197 AC_DEFINE(G_VA_COPY, va_copy)
198-else if test "x$glib_cv___va_copy" = "xyes"; then
199+else
200+if test "x$glib_cv___va_copy" = "xyes"; then
201 AC_DEFINE(G_VA_COPY, __va_copy)
202 fi
203 fi
204@@ -496,6 +535,7 @@
205 fi
206 AC_MSG_RESULT($glib_cv_va_val_copy)
207
208+AC_MSG_WARN([hi mom])
209
210 dnl ***********************
211 dnl *** g_module checks ***
212@@ -507,23 +547,27 @@
213 G_MODULE_BROKEN_RTLD_GLOBAL=0
214 G_MODULE_HAVE_DLERROR=0
215 dnl *** dlopen() and dlsym() in system libraries
216+AC_CHECK_FUNC(dlopen,[
217+ AC_CHECK_FUNC(dlsym,[
218+ G_MODULE_IMPL=G_MODULE_IMPL_DL
219+ ],
220+ )],
221+)
222 if test -z "$G_MODULE_IMPL"; then
223- AC_CHECK_FUNC(dlopen,
224- [AC_CHECK_FUNC(dlsym,
225+ AC_CHECK_FUNC(dlopen,[
226+ AC_CHECK_FUNC(dlsym,[
227 G_MODULE_IMPL=G_MODULE_IMPL_DL
228- ,)]
229- ,)
230-
231+ ])],
232+ )
233 fi
234-
235 dnl *** dlopen() and dlsym() in libdl
236 if test -z "$G_MODULE_IMPL"; then
237- AC_CHECK_LIB(dl, dlopen,
238- [AC_CHECK_LIB(dl, dlsym,
239+ AC_CHECK_LIB(dl, dlopen,[
240+ AC_CHECK_LIB(dl, dlsym,[
241 G_MODULE_LIBS=-ldl
242 G_MODULE_IMPL=G_MODULE_IMPL_DL
243- ,)]
244- ,)
245+ ])]
246+ )
247 fi
248 dnl *** shl_load() in libdld (HP-UX)
249 if test -z "$G_MODULE_IMPL"; then
250@@ -633,6 +677,7 @@
251 AC_SUBST(G_MODULE_NEED_USCORE)
252 AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
253 AC_SUBST(GLIB_DEBUG_FLAGS)
254+AC_MSG_WARN([hi mom])
255
256
257 dnl ***********************
258@@ -869,40 +914,50 @@
259 fi
260 if test x"$have_threads" = xposix; then
261 LIBS="$LIBS $G_THREAD_LIBS"
262- AC_MSG_CHECKING(whether pthread_getspecific is posix like)
263 # PCThreads has pthread_getspecific(pthread_key_t, void **);
264- AC_TRY_COMPILE([#include <pthread.h>],
265- [pthread_getspecific(0,NULL);],
266- [AC_MSG_RESULT(no)],
267- [AC_MSG_RESULT(yes)
268- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)])
269- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like)
270+ AC_CACHE_CHECK([whether pthread_getspecific is posix like],
271+ [glib_cv_sys_pthread_getspecific_posix],
272+ AC_TRY_COMPILE([#include <pthread.h>],
273+ [pthread_getspecific(0,NULL);],
274+ [glib_cv_sys_pthread_getspecific_posix=no],
275+ [glib_cv_sys_pthread_getspecific_posix=yes])
276+ )
277+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then
278+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)
279+ fi
280 # DCE Threads return 1 as success, posix 0. what a mess.
281- AC_TRY_RUN([#include <pthread.h>
282- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
283- int main () {
284- return !pthread_mutex_trylock (&mutex); }],
285- [AC_MSG_RESULT(no)],
286- [AC_MSG_RESULT(yes)
287- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)])
288- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
289+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like],
290+ [glib_cv_sys_pthread_mutex_trylock_posix],
291+ AC_TRY_RUN([#include <pthread.h>
292+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
293+ int main () {
294+ return !pthread_mutex_trylock (&mutex); }],
295+ [glib_cv_sys_pthread_mutex_trylock_posix=no],
296+ [glib_cv_sys_pthread_mutex_trylock_posix=yes])
297+ )
298+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then
299+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)
300+ fi
301 # DCE Threads return -1 as failure, posix ETIMEDOUT.
302- AC_TRY_RUN([#include <pthread.h>
303- #include <sys/time.h>
304- int main () {
305- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
306- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
307- struct timeval tval;
308- struct timespec tspec;
309- gettimeofday (&tval, NULL);
310- tspec.tv_sec = tval.tv_sec;
311- tspec.tv_nsec = 0;
312- pthread_mutex_lock (&mutex);
313- return pthread_cond_timedwait (&cond,&mutex,&tspec)
314- != -1;}],
315- [AC_MSG_RESULT(no)],
316- [AC_MSG_RESULT(yes)
317- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)])
318+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like],
319+ [glib_cv_sys_pthread_cond_timedwait_posix],
320+ AC_TRY_RUN([#include <pthread.h>
321+ int main () {
322+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
323+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
324+ struct timeval tval;
325+ struct timespec tspec;
326+ gettimeofday (&tval, NULL);
327+ tspec.tv_sec = tval.tv_sec;
328+ tspec.tv_nsec = 0;
329+ return pthread_cond_timedwait (&cond,&mutex,&tspec)
330+ != -1;}],
331+ [glib_cv_sys_pthread_cond_timedwait_posix=no],
332+ [glib_cv_sys_pthread_cond_timedwait_posix=yes])
333+ )
334+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then
335+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)
336+ fi
337 fi
338 LIBS="$glib_save_LIBS"
339 CFLAGS="$glib_save_CFLAGS"
340@@ -946,13 +1001,14 @@
341 dnl ****************************************
342 dnl *** GLib POLL* compatibility defines ***
343 dnl ****************************************
344+if test x"$cross_compiling" != xyes; then
345 GLIB_SYSDEFS(
346 [#include <sys/types.h>
347 #include <sys/poll.h>],
348 POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
349 glibconfig-sysdefs.h,
350 =)
351-
352+fi
353
354 dnl ******************************
355 dnl *** output the whole stuff ***
356@@ -1005,7 +1061,7 @@
357 echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
358 fi
359
360- cat >> $outfile <<_______EOF
361+ cat >> $outfile <<EOF
362
363 #ifdef __cplusplus
364 extern "C" {
365@@ -1022,60 +1078,60 @@
366 #define G_MINLONG $glib_ml
367 #define G_MAXLONG $glib_Ml
368
369-_______EOF
370+EOF
371
372
373 ### this should always be true in a modern C/C++ compiler
374- cat >>$outfile <<_______EOF
375+ cat >>$outfile <<EOF
376 typedef signed char gint8;
377 typedef unsigned char guint8;
378-_______EOF
379+EOF
380
381
382 if test -n "$gint16"; then
383- cat >>$outfile <<_______EOF
384+ cat >>$outfile <<EOF
385 typedef signed $gint16 gint16;
386 typedef unsigned $gint16 guint16;
387-_______EOF
388+EOF
389 fi
390
391
392 if test -n "$gint32"; then
393- cat >>$outfile <<_______EOF
394+ cat >>$outfile <<EOF
395 typedef signed $gint32 gint32;
396 typedef unsigned $gint32 guint32;
397-_______EOF
398+EOF
399 fi
400
401
402 if test -n "$gint64"; then
403- cat >>$outfile <<_______EOF
404+ cat >>$outfile <<EOF
405 ${glib_warning_guard}#define G_HAVE_GINT64 1
406
407 ${glib_extension}typedef signed $gint64 gint64;
408 ${glib_extension}typedef unsigned $gint64 guint64;
409
410 #define G_GINT64_CONSTANT(val) $gint64_constant
411-_______EOF
412+EOF
413 fi
414
415
416 if test -z "$glib_unknown_void_p"; then
417- cat >>$outfile <<_______EOF
418+ cat >>$outfile <<EOF
419
420 #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
421 #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
422
423 #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
424 #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
425-_______EOF
426+EOF
427 else
428 echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
429 fi
430
431
432
433- cat >>$outfile <<_______EOF
434+ cat >>$outfile <<EOF
435 $glib_atexit
436 $glib_memmove
437 $glib_defines
438@@ -1087,11 +1143,11 @@
439 #else /* !__cplusplus */
440 $glib_inline
441 #endif /* !__cplusplus */
442-_______EOF
443+EOF
444
445 echo >>$outfile
446 if test x$g_mutex_has_default = xyes; then
447- cat >>$outfile <<_______EOF
448+ cat >>$outfile <<EOF
449 $g_enable_threads_def G_THREADS_ENABLED
450 #define G_THREADS_IMPL_$g_threads_impl_def
451 typedef struct _GStaticMutex GStaticMutex;
452@@ -1109,15 +1165,15 @@
453 #define g_static_mutex_get_mutex(mutex) \
454 (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
455 g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
456-_______EOF
457+EOF
458 else
459- cat >>$outfile <<_______EOF
460+ cat >>$outfile <<EOF
461 $g_enable_threads_def G_THREADS_ENABLED
462 #define G_THREADS_IMPL_$g_threads_impl_def
463 typedef struct _GMutex* GStaticMutex;
464 #define G_STATIC_MUTEX_INIT NULL
465 #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
466-_______EOF
467+EOF
468 fi
469
470 echo >>$outfile
471@@ -1126,15 +1182,15 @@
472 g_bit_sizes="$g_bit_sizes 64"
473 fi
474 for bits in $g_bit_sizes; do
475- cat >>$outfile <<_______EOF
476+ cat >>$outfile <<EOF
477 #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
478 #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
479 #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
480 #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
481-_______EOF
482+EOF
483 done
484
485- cat >>$outfile <<_______EOF
486+ cat >>$outfile <<EOF
487 #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
488 #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
489 #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
490@@ -1145,14 +1201,14 @@
491 #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
492 #define G_BYTE_ORDER $g_byte_order
493
494-_______EOF
495+EOF
496
497 if test -r glibconfig-sysdefs.h; then
498 cat glibconfig-sysdefs.h >>$outfile
499 fi
500
501
502- cat >>$outfile <<_______EOF
503+ cat >>$outfile <<EOF
504
505 $glib_wc
506
507@@ -1162,7 +1218,7 @@
508 #endif /* __cplusplus */
509
510 #endif /* GLIBCONFIG_H */
511-_______EOF
512+EOF
513
514
515 if cmp -s $outfile glibconfig.h; then
516Index: pkg-config-0.23/glib-1.2.10/glib.m4
517===================================================================
518--- pkg-config-0.23.orig/glib-1.2.10/glib.m4 2008-04-14 23:34:39.000000000 +0100
519+++ pkg-config-0.23/glib-1.2.10/glib.m4 2008-04-14 09:26:29.000000000 +0100
520@@ -5,7 +5,7 @@
521 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
522 dnl gthread is specified in MODULES, pass to glib-config
523 dnl
524-AC_DEFUN(AM_PATH_GLIB,
525+AC_DEFUN([AM_PATH_GLIB],
526 [dnl
527 dnl Get the cflags and libraries from the glib-config script
528 dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
deleted file mode 100644
index 7d93b1c05a..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Remove obsolete AM_PROG_CC_STDC use as there's already modern equivalent,
2AC_PROG_CC, present.
3
4Upstream-Status: Submitted
5
6Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
7diff -Nurd pkg-config-0.28/glib/configure.ac pkg-config-0.28/glib/configure.ac
8--- pkg-config-0.28/glib/configure.ac 2012-10-13 17:35:36.000000000 +0300
9+++ pkg-config-0.28/glib/configure.ac 2013-05-24 23:48:34.093415116 +0300
10@@ -288,7 +288,6 @@
11 AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
12 AC_LANG_RESTORE
13
14-AM_PROG_CC_STDC
15 AM_PROG_CC_C_O
16 AC_PROG_INSTALL
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index c4ada808ab..55ab5c41f7 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -12,9 +12,11 @@ DEPENDS = "glib-2.0"
12DEPENDS_class-native = "" 12DEPENDS_class-native = ""
13DEPENDS_class-nativesdk = "" 13DEPENDS_class-nativesdk = ""
14 14
15SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz" 15SRCREV = "40342dd0ead05d457a2a4e692cf865f50033a709"
16PV = "0.28+git${SRCPV}"
17SRC_URI = "git://anongit.freedesktop.org/pkg-config"
16 18
17S = "${WORKDIR}/pkg-config-${PV}/" 19S = "${WORKDIR}/git"
18 20
19inherit autotools 21inherit autotools
20 22
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
deleted file mode 100644
index 9853577b58..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
+++ /dev/null
@@ -1,528 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 glib-1.2.10/acglib.m4 | 12 +-
5 glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------
6 2 files changed, 140 insertions(+), 84 deletions(-)
7
8Index: pkg-config-0.23/glib-1.2.10/acglib.m4
9===================================================================
10--- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000
11+++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000
12@@ -10,7 +10,7 @@
13 AC_DIVERT_POP()])])])
14
15 dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
16-AC_DEFUN(GLIB_IF_VAR_EQ,[
17+AC_DEFUN([GLIB_IF_VAR_EQ],[
18 case "$[$1]" in
19 "[$2]"[)]
20 [$3]
21@@ -21,7 +21,7 @@
22 esac
23 ])
24 dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION])
25-AC_DEFUN(GLIB_STR_CONTAINS,[
26+AC_DEFUN([GLIB_STR_CONTAINS],[
27 case "[$1]" in
28 *"[$2]"*[)]
29 [$3]
30@@ -32,12 +32,12 @@
31 esac
32 ])
33 dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING)
34-AC_DEFUN(GLIB_ADD_TO_VAR,[
35+AC_DEFUN([GLIB_ADD_TO_VAR],[
36 GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]")
37 ])
38
39 dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE])
40-AC_DEFUN(GLIB_SIZEOF,
41+AC_DEFUN([GLIB_SIZEOF],
42 [changequote(<<, >>)dnl
43 dnl The name to #define.
44 define(<<AC_TYPE_NAME>>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl
45@@ -62,7 +62,7 @@
46 ])
47
48 dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER)
49-AC_DEFUN(GLIB_BYTE_CONTENTS,
50+AC_DEFUN([GLIB_BYTE_CONTENTS],
51 [changequote(<<, >>)dnl
52 dnl The name to #define.
53 define(<<AC_TYPE_NAME>>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl
54@@ -92,7 +92,7 @@
55 ])
56
57 dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
58-AC_DEFUN(GLIB_SYSDEFS,
59+AC_DEFUN([GLIB_SYSDEFS],
60 [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
61 glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'`
62 if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
63Index: pkg-config-0.23/glib-1.2.10/configure.in
64===================================================================
65--- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000
66+++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000
67@@ -1,10 +1,11 @@
68 dnl ***********************************
69 dnl *** include special GLib macros ***
70 dnl ***********************************
71-builtin(include, acglib.m4)dnl
72+dnl no need, just use aclocal -I . --CL
73+dnl builtin(include, acglib.m4)dnl
74
75 # require autoconf 2.13
76-AC_PREREQ(2.13)
77+AC_PREREQ(2.53)
78
79 # init autoconf (and check for presence of glist.c)
80 AC_INIT(glist.c)
81@@ -13,11 +14,48 @@
82 cflags_set=${CFLAGS+set}
83
84 # we rewrite this file
85+if test "x$cross_compiling" != "xyes"; then
86 rm -f glibconfig-sysdefs.h
87+fi
88+
89+# config defines
90+
91+AH_TEMPLATE([ENABLE_MEM_CHECK],
92+ [Define if enabling memory checking])
93+AH_TEMPLATE([ENABLE_MEM_PROFILE], [])
94+AH_TEMPLATE([GLIB_BINARY_AGE], [])
95+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], [])
96+AH_TEMPLATE([GLIB_INTERFACE_AGE], [])
97+AH_TEMPLATE([GLIB_MAJOR_VERSION], [])
98+AH_TEMPLATE([GLIB_MINOR_VERSION], [])
99+AH_TEMPLATE([GLIB_MICRO_VERSION], [])
100+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], [])
101+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], [])
102+AH_TEMPLATE([G_HAVE_INLINE], [])
103+AH_TEMPLATE([G_HAVE___INLINE], [])
104+AH_TEMPLATE([G_HAVE___INLINE__], [])
105+AH_TEMPLATE([G_THREAD_SOURCE], [])
106+AH_TEMPLATE([G_VA_COPY], [])
107+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], [])
108+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], [])
109+AH_TEMPLATE([HAVE_GETPWUID_R], [])
110+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], [])
111+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], [])
112+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], [])
113+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], [])
114+AH_TEMPLATE([HAVE_WCHAR_H], [])
115+AH_TEMPLATE([HAVE_WCTYPE_H], [])
116+AH_TEMPLATE([NO_FD_SET], [])
117+AH_TEMPLATE([NO_SYS_ERRLIST], [])
118+AH_TEMPLATE([NO_SYS_SIGLIST], [])
119+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], [])
120+AH_TEMPLATE([REALLOC_0_WORKS], [])
121+
122
123 dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
124 dnl are available for $ac_help expansion (don't we all *love* autoconf?)
125-GLIB_AC_DIVERT_BEFORE_HELP([
126+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
127+#dnl
128 #
129 # The following version number definitions apply to GLib, GModule and GThread
130 # as a whole, so if changes occoured in any of them, they are all
131@@ -38,7 +76,7 @@
132 GLIB_BINARY_AGE=10
133 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
134 dnl
135-])
136+#AC_DIVERT_POP()dnl
137
138 AC_SUBST(GLIB_MAJOR_VERSION)
139 AC_SUBST(GLIB_MINOR_VERSION)
140@@ -72,22 +110,20 @@
141 AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE)
142
143 dnl Initialize libtool
144-AC_PROG_LIBTOOL
145+AM_PROG_LIBTOOL
146
147 dnl Initialize maintainer mode
148 AM_MAINTAINER_MODE
149
150-AC_CANONICAL_HOST
151-
152 dnl figure debugging default, prior to $ac_help setup
153 dnl
154-GLIB_AC_DIVERT_BEFORE_HELP([
155+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
156 if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
157 debug_default=yes
158 else
159 debug_default=minimum
160 fi
161-]) dnl
162+#AC_DIVERT_POP()dnl
163
164 dnl declare --enable-* args and collect ac_help strings
165 AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
166@@ -194,7 +230,9 @@
167 CFLAGS=$glib_save_CFLAGS
168 AC_MSG_WARN(
169 [No ANSI prototypes found in library. (-std1 didn't work.)])
170+ , AC_MSG_WARN([Skipping test due to crosscompilation])
171 )
172+ , AC_MSG_WARN([Skipping test due to crosscompilation])
173 )
174 LIBS=$glib_save_LIBS
175
176@@ -336,7 +374,7 @@
177 if test $gtk_ok = yes; then
178 AC_MSG_RESULT([yes, found in sys/types.h])
179 else
180- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
181+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
182 if test $gtk_ok = yes; then
183 AC_DEFINE(HAVE_SYS_SELECT_H)
184 AC_MSG_RESULT([yes, found in sys/select.h])
185@@ -409,7 +447,7 @@
186 glib_cv_sane_realloc=no
187 ,)
188 ])
189-if test x$glib_cv_sane_realloc = xyes; then
190+if test "x$glib_cv_sane_realloc" = "xyes"; then
191 AC_DEFINE(REALLOC_0_WORKS)
192 fi
193 AC_MSG_RESULT($glib_cv_sane_realloc)
194@@ -487,7 +525,8 @@
195 ])
196 if test "x$glib_cv_va_copy" = "xyes"; then
197 AC_DEFINE(G_VA_COPY, va_copy)
198-else if test "x$glib_cv___va_copy" = "xyes"; then
199+else
200+if test "x$glib_cv___va_copy" = "xyes"; then
201 AC_DEFINE(G_VA_COPY, __va_copy)
202 fi
203 fi
204@@ -496,6 +535,7 @@
205 fi
206 AC_MSG_RESULT($glib_cv_va_val_copy)
207
208+AC_MSG_WARN([hi mom])
209
210 dnl ***********************
211 dnl *** g_module checks ***
212@@ -507,23 +547,27 @@
213 G_MODULE_BROKEN_RTLD_GLOBAL=0
214 G_MODULE_HAVE_DLERROR=0
215 dnl *** dlopen() and dlsym() in system libraries
216+AC_CHECK_FUNC(dlopen,[
217+ AC_CHECK_FUNC(dlsym,[
218+ G_MODULE_IMPL=G_MODULE_IMPL_DL
219+ ],
220+ )],
221+)
222 if test -z "$G_MODULE_IMPL"; then
223- AC_CHECK_FUNC(dlopen,
224- [AC_CHECK_FUNC(dlsym,
225+ AC_CHECK_FUNC(dlopen,[
226+ AC_CHECK_FUNC(dlsym,[
227 G_MODULE_IMPL=G_MODULE_IMPL_DL
228- ,)]
229- ,)
230-
231+ ])],
232+ )
233 fi
234-
235 dnl *** dlopen() and dlsym() in libdl
236 if test -z "$G_MODULE_IMPL"; then
237- AC_CHECK_LIB(dl, dlopen,
238- [AC_CHECK_LIB(dl, dlsym,
239+ AC_CHECK_LIB(dl, dlopen,[
240+ AC_CHECK_LIB(dl, dlsym,[
241 G_MODULE_LIBS=-ldl
242 G_MODULE_IMPL=G_MODULE_IMPL_DL
243- ,)]
244- ,)
245+ ])]
246+ )
247 fi
248 dnl *** shl_load() in libdld (HP-UX)
249 if test -z "$G_MODULE_IMPL"; then
250@@ -633,6 +677,7 @@
251 AC_SUBST(G_MODULE_NEED_USCORE)
252 AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
253 AC_SUBST(GLIB_DEBUG_FLAGS)
254+AC_MSG_WARN([hi mom])
255
256
257 dnl ***********************
258@@ -869,40 +914,50 @@
259 fi
260 if test x"$have_threads" = xposix; then
261 LIBS="$LIBS $G_THREAD_LIBS"
262- AC_MSG_CHECKING(whether pthread_getspecific is posix like)
263 # PCThreads has pthread_getspecific(pthread_key_t, void **);
264- AC_TRY_COMPILE([#include <pthread.h>],
265- [pthread_getspecific(0,NULL);],
266- [AC_MSG_RESULT(no)],
267- [AC_MSG_RESULT(yes)
268- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)])
269- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like)
270+ AC_CACHE_CHECK([whether pthread_getspecific is posix like],
271+ [glib_cv_sys_pthread_getspecific_posix],
272+ AC_TRY_COMPILE([#include <pthread.h>],
273+ [pthread_getspecific(0,NULL);],
274+ [glib_cv_sys_pthread_getspecific_posix=no],
275+ [glib_cv_sys_pthread_getspecific_posix=yes])
276+ )
277+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then
278+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)
279+ fi
280 # DCE Threads return 1 as success, posix 0. what a mess.
281- AC_TRY_RUN([#include <pthread.h>
282- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
283- int main () {
284- return !pthread_mutex_trylock (&mutex); }],
285- [AC_MSG_RESULT(no)],
286- [AC_MSG_RESULT(yes)
287- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)])
288- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like)
289+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like],
290+ [glib_cv_sys_pthread_mutex_trylock_posix],
291+ AC_TRY_RUN([#include <pthread.h>
292+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
293+ int main () {
294+ return !pthread_mutex_trylock (&mutex); }],
295+ [glib_cv_sys_pthread_mutex_trylock_posix=no],
296+ [glib_cv_sys_pthread_mutex_trylock_posix=yes])
297+ )
298+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then
299+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)
300+ fi
301 # DCE Threads return -1 as failure, posix ETIMEDOUT.
302- AC_TRY_RUN([#include <pthread.h>
303- #include <sys/time.h>
304- int main () {
305- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
306- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
307- struct timeval tval;
308- struct timespec tspec;
309- gettimeofday (&tval, NULL);
310- tspec.tv_sec = tval.tv_sec;
311- tspec.tv_nsec = 0;
312- pthread_mutex_lock (&mutex);
313- return pthread_cond_timedwait (&cond,&mutex,&tspec)
314- != -1;}],
315- [AC_MSG_RESULT(no)],
316- [AC_MSG_RESULT(yes)
317- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)])
318+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like],
319+ [glib_cv_sys_pthread_cond_timedwait_posix],
320+ AC_TRY_RUN([#include <pthread.h>
321+ int main () {
322+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
323+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
324+ struct timeval tval;
325+ struct timespec tspec;
326+ gettimeofday (&tval, NULL);
327+ tspec.tv_sec = tval.tv_sec;
328+ tspec.tv_nsec = 0;
329+ return pthread_cond_timedwait (&cond,&mutex,&tspec)
330+ != -1;}],
331+ [glib_cv_sys_pthread_cond_timedwait_posix=no],
332+ [glib_cv_sys_pthread_cond_timedwait_posix=yes])
333+ )
334+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then
335+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)
336+ fi
337 fi
338 LIBS="$glib_save_LIBS"
339 CFLAGS="$glib_save_CFLAGS"
340@@ -946,13 +1001,14 @@
341 dnl ****************************************
342 dnl *** GLib POLL* compatibility defines ***
343 dnl ****************************************
344+if test x"$cross_compiling" != xyes; then
345 GLIB_SYSDEFS(
346 [#include <sys/types.h>
347 #include <sys/poll.h>],
348 POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
349 glibconfig-sysdefs.h,
350 =)
351-
352+fi
353
354 dnl ******************************
355 dnl *** output the whole stuff ***
356@@ -1005,7 +1061,7 @@
357 echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile
358 fi
359
360- cat >> $outfile <<_______EOF
361+ cat >> $outfile <<EOF
362
363 #ifdef __cplusplus
364 extern "C" {
365@@ -1022,60 +1078,60 @@
366 #define G_MINLONG $glib_ml
367 #define G_MAXLONG $glib_Ml
368
369-_______EOF
370+EOF
371
372
373 ### this should always be true in a modern C/C++ compiler
374- cat >>$outfile <<_______EOF
375+ cat >>$outfile <<EOF
376 typedef signed char gint8;
377 typedef unsigned char guint8;
378-_______EOF
379+EOF
380
381
382 if test -n "$gint16"; then
383- cat >>$outfile <<_______EOF
384+ cat >>$outfile <<EOF
385 typedef signed $gint16 gint16;
386 typedef unsigned $gint16 guint16;
387-_______EOF
388+EOF
389 fi
390
391
392 if test -n "$gint32"; then
393- cat >>$outfile <<_______EOF
394+ cat >>$outfile <<EOF
395 typedef signed $gint32 gint32;
396 typedef unsigned $gint32 guint32;
397-_______EOF
398+EOF
399 fi
400
401
402 if test -n "$gint64"; then
403- cat >>$outfile <<_______EOF
404+ cat >>$outfile <<EOF
405 ${glib_warning_guard}#define G_HAVE_GINT64 1
406
407 ${glib_extension}typedef signed $gint64 gint64;
408 ${glib_extension}typedef unsigned $gint64 guint64;
409
410 #define G_GINT64_CONSTANT(val) $gint64_constant
411-_______EOF
412+EOF
413 fi
414
415
416 if test -z "$glib_unknown_void_p"; then
417- cat >>$outfile <<_______EOF
418+ cat >>$outfile <<EOF
419
420 #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p))
421 #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p))
422
423 #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i))
424 #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))
425-_______EOF
426+EOF
427 else
428 echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
429 fi
430
431
432
433- cat >>$outfile <<_______EOF
434+ cat >>$outfile <<EOF
435 $glib_atexit
436 $glib_memmove
437 $glib_defines
438@@ -1087,11 +1143,11 @@
439 #else /* !__cplusplus */
440 $glib_inline
441 #endif /* !__cplusplus */
442-_______EOF
443+EOF
444
445 echo >>$outfile
446 if test x$g_mutex_has_default = xyes; then
447- cat >>$outfile <<_______EOF
448+ cat >>$outfile <<EOF
449 $g_enable_threads_def G_THREADS_ENABLED
450 #define G_THREADS_IMPL_$g_threads_impl_def
451 typedef struct _GStaticMutex GStaticMutex;
452@@ -1109,15 +1165,15 @@
453 #define g_static_mutex_get_mutex(mutex) \
454 (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
455 g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
456-_______EOF
457+EOF
458 else
459- cat >>$outfile <<_______EOF
460+ cat >>$outfile <<EOF
461 $g_enable_threads_def G_THREADS_ENABLED
462 #define G_THREADS_IMPL_$g_threads_impl_def
463 typedef struct _GMutex* GStaticMutex;
464 #define G_STATIC_MUTEX_INIT NULL
465 #define g_static_mutex_get_mutex(mutex) (g_static_mutex_get_mutex_impl (mutex))
466-_______EOF
467+EOF
468 fi
469
470 echo >>$outfile
471@@ -1126,15 +1182,15 @@
472 g_bit_sizes="$g_bit_sizes 64"
473 fi
474 for bits in $g_bit_sizes; do
475- cat >>$outfile <<_______EOF
476+ cat >>$outfile <<EOF
477 #define GINT${bits}_TO_${g_bs_native}(val) ((gint${bits}) (val))
478 #define GUINT${bits}_TO_${g_bs_native}(val) ((guint${bits}) (val))
479 #define GINT${bits}_TO_${g_bs_alien}(val) ((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
480 #define GUINT${bits}_TO_${g_bs_alien}(val) (GUINT${bits}_SWAP_LE_BE (val))
481-_______EOF
482+EOF
483 done
484
485- cat >>$outfile <<_______EOF
486+ cat >>$outfile <<EOF
487 #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
488 #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
489 #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
490@@ -1145,14 +1201,14 @@
491 #define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
492 #define G_BYTE_ORDER $g_byte_order
493
494-_______EOF
495+EOF
496
497 if test -r glibconfig-sysdefs.h; then
498 cat glibconfig-sysdefs.h >>$outfile
499 fi
500
501
502- cat >>$outfile <<_______EOF
503+ cat >>$outfile <<EOF
504
505 $glib_wc
506
507@@ -1162,7 +1218,7 @@
508 #endif /* __cplusplus */
509
510 #endif /* GLIBCONFIG_H */
511-_______EOF
512+EOF
513
514
515 if cmp -s $outfile glibconfig.h; then
516Index: pkg-config-0.23/glib-1.2.10/glib.m4
517===================================================================
518--- pkg-config-0.23.orig/glib-1.2.10/glib.m4 2008-04-14 23:34:39.000000000 +0100
519+++ pkg-config-0.23/glib-1.2.10/glib.m4 2008-04-14 09:26:29.000000000 +0100
520@@ -5,7 +5,7 @@
521 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
522 dnl gthread is specified in MODULES, pass to glib-config
523 dnl
524-AC_DEFUN(AM_PATH_GLIB,
525+AC_DEFUN([AM_PATH_GLIB],
526 [dnl
527 dnl Get the cflags and libraries from the glib-config script
528 dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
index 9bee438a49..9bee438a49 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
deleted file mode 100644
index 57a22d4c78..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require pkgconfig.inc
2
3SRC_URI += " \
4 file://pkg-config-native.in \
5 file://fix-glib-configure-libtool-usage.patch \
6 file://obsolete_automake_macros.patch \
7 file://0001-Strip-system-library-directories-reliably.patch \
8 "
9
10SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d"
11SRC_URI[sha256sum] = "6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index e420420ae1..eaa511a8b7 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -1,40 +1,6 @@
1require pkgconfig.inc 1require pkgconfig.inc
2 2
3SRC_URI = "git://anongit.freedesktop.org/pkg-config \ 3SRC_URI += " \
4 file://autofoo.patch" 4 file://pkg-config-native.in \
5 5 file://fix-glib-configure-libtool-usage.patch \
6S = "${WORKDIR}/git/" 6 "
7
8SRCREV = "66d49f1375fec838bcd301bb4ca2ef76cee0e47c"
9PV = "0.23+git${SRCPV}"
10PR = "r1"
11
12DEFAULT_PREFERENCE = "-1"
13
14# Can't do native version with git since git-native depends on pkgconfig-native
15BBCLASSEXTEND = "nativesdk"
16
17do_fixsource() {
18 # Adapted from autogen.sh
19 cd ${S}
20 tar -xvzf glib-1.2.10.tar.gz
21
22 chmod +w `find glib-1.2.10 -name Makefile.am`
23 perl -p -i.bak -e "s/lib_LTLIBRARIES/noinst_LTLIBRARIES/g" `find glib-1.2.10 -name Makefile.am`
24 perl -p -i.bak -e "s/bin_SCRIPTS/noinst_SCRIPTS/g" `find glib-1.2.10 -name Makefile.am`
25 perl -p -i.bak -e "s/include_HEADERS/noinst_HEADERS/g" `find glib-1.2.10 -name Makefile.am`
26 perl -p -i.bak -e "s/glibnoinst_HEADERS/noinst_HEADERS/g" `find glib-1.2.10 -name Makefile.am`
27 perl -p -i.bak -e 's/([a-zA-Z0-9]+)_DATA/noinst_DATA/g' `find glib-1.2.10 -name Makefile.am`
28 perl -p -i.bak -e "s/info_TEXINFOS/noinst_TEXINFOS/g" `find glib-1.2.10 -name Makefile.am`
29 perl -p -i.bak -e "s/man_MANS/noinst_MANS/g" `find glib-1.2.10 -name Makefile.am`
30
31 ## patch gslist.c to have stable sort
32 perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compare_func\(l1->data,l2->data\) <= 0\)/g' glib-1.2.10/gslist.c
33
34 # Update random auto* files to actually have something which have a snowball's
35 # chance in a hot place of working with modern auto* tools.
36
37 (cd glib-1.2.10 && for p in ../glib-patches/*.diff; do echo $p; patch -p1 < $p || exit 1; done ) || exit 1
38}
39
40addtask fixsource before do_patch after do_unpack
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-06 22:43:34 +0000