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