diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-core/glib-2.0 | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
12 files changed, 434 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch new file mode 100644 index 0000000000..0be36316b9 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | commit 9b38d507ec37b3d7d4df6095fa7ed16b47d399f7 | ||
2 | Author: Drew Moseley <drew_moseley@mentor.com> | ||
3 | Date: Sat Mar 29 21:10:43 2014 -0400 | ||
4 | |||
5 | configure.ac: Do not use readlink when cross compiling. | ||
6 | |||
7 | Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross | ||
8 | compiling. Doing so causes host paths to potentially pollute | ||
9 | the target. | ||
10 | |||
11 | Note that in this case the path is not converted to absolute if | ||
12 | it contains any ".." references so it's not completely correct. | ||
13 | |||
14 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=727575] | ||
15 | Signed-off-by: Drew Moseley <drew_moseley@mentor.com> | ||
16 | |||
17 | diff -rub glib-2.38.2.orig/configure.ac glib-2.38.2/configure.ac | ||
18 | --- glib-2.38.2.orig/configure.ac 2014-04-03 20:17:13.035567143 -0400 | ||
19 | +++ glib-2.38.2/configure.ac 2014-04-03 20:19:07.071566057 -0400 | ||
20 | @@ -275,7 +275,11 @@ | ||
21 | [], | ||
22 | [with_runtime_libdir=""]) | ||
23 | GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" | ||
24 | +AS_IF([ test $cross_compiling = yes ], [ | ||
25 | +ABS_GLIB_RUNTIME_LIBDIR="$libdir/$with_runtime_libdir" | ||
26 | +], [ | ||
27 | ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`" | ||
28 | +]) | ||
29 | AC_SUBST(GLIB_RUNTIME_LIBDIR) | ||
30 | AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR) | ||
31 | AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"]) | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch b/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch new file mode 100644 index 0000000000..3aac35a5d3 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 55253b55b9c65f3e0efbbe03cbab2a4c4014a16b Mon Sep 17 00:00:00 2001 | ||
2 | From: Song.Li <Song.Li@windriver.com> | ||
3 | Date: Thu, 5 Jul 2012 15:09:41 +0800 | ||
4 | Subject: [PATCH] add -march=i486 into CFLAGS automatically | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | glib configure will check if current gcc need -march=i486, | ||
9 | when gcc need -march=i486 but CFLAGS don't have, | ||
10 | glib configure will abort and advise the user to add -march=i486 or later. | ||
11 | This will break the build process,it's not good for automatic build system. | ||
12 | so change this to adding -march=i485 automatically when it is needed. | ||
13 | --- | ||
14 | configure.ac | 6 ++++-- | ||
15 | 1 files changed, 4 insertions(+), 2 deletions(-) | ||
16 | |||
17 | Index: glib-2.36.0/configure.ac | ||
18 | =================================================================== | ||
19 | --- glib-2.36.0.orig/configure.ac | ||
20 | +++ glib-2.36.0/configure.ac | ||
21 | @@ -2378,7 +2378,7 @@ dnl | ||
22 | dnl Note that the atomic ops are only available with GCC on x86 when | ||
23 | dnl using -march=i486 or higher. If we detect that the atomic ops are | ||
24 | dnl not available but would be available given the right flags, we want | ||
25 | -dnl to abort and advise the user to fix their CFLAGS. It's better to do | ||
26 | +dnl to add -march=i486 automatically to fix their CFLAGS. It's better to do | ||
27 | dnl that then to silently fall back on emulated atomic ops just because | ||
28 | dnl the user had the wrong build environment. | ||
29 | |||
30 | @@ -2401,7 +2401,8 @@ AC_CACHE_CHECK([for lock-free atomic int | ||
31 | AC_TRY_COMPILE([], | ||
32 | [volatile int atomic = 2;\ | ||
33 | __sync_bool_compare_and_swap (&atomic, 2, 3);], | ||
34 | - [AC_MSG_ERROR([GLib must be build with -march=i486 or later.])], | ||
35 | + [AC_MSG_WARN([GLib must be build with -march=i486 or later.]) | ||
36 | + SAVE_CFLAGS="${SAVE_CFLAGS} -march=i486"], | ||
37 | []) | ||
38 | CFLAGS="${SAVE_CFLAGS}" | ||
39 | fi | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch new file mode 100644 index 0000000000..3d0c008bbe --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From c53e94a520b573aa0dcf12903e9563fe8badc34c Mon Sep 17 00:00:00 2001 | ||
2 | From: Marius Avram <marius.avram@intel.com> | ||
3 | Date: Wed, 27 Aug 2014 12:10:41 +0300 | ||
4 | Subject: [PATCH] Allow /run/media/sdX drive mount if username root | ||
5 | |||
6 | In case that the username logged in the system is root | ||
7 | the drives are directly mounted in /run/media/sdX and | ||
8 | not /run/media/<username>/sdX as the function | ||
9 | g_unix_mount_guess_should_display() expects. | ||
10 | |||
11 | Without this change USB stick mounts are not accesible from | ||
12 | graphical applications such as the File Manager (pcmanfm). | ||
13 | |||
14 | Upstream-Status: Inappropriate | ||
15 | |||
16 | Signed-off-by: Marius Avram <marius.avram@intel.com> | ||
17 | --- | ||
18 | gio/gunixmounts.c | 5 +++++ | ||
19 | 1 file changed, 5 insertions(+) | ||
20 | |||
21 | diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c | ||
22 | index 4999354..f6c1472 100644 | ||
23 | --- a/gio/gunixmounts.c | ||
24 | +++ b/gio/gunixmounts.c | ||
25 | @@ -2136,6 +2136,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry) | ||
26 | mount_path[sizeof ("/run/media/") - 1 + user_name_len] == '/') | ||
27 | is_in_runtime_dir = TRUE; | ||
28 | |||
29 | + /* Allow no username in path in /run/media if current user is root */ | ||
30 | + if (strcmp(user_name, "root") == 0 && | ||
31 | + strncmp (mount_path, "/run/media/", sizeof("run/media")) == 0) | ||
32 | + is_in_runtime_dir = TRUE; | ||
33 | + | ||
34 | if (is_in_runtime_dir || g_str_has_prefix (mount_path, "/media/")) | ||
35 | { | ||
36 | char *path; | ||
37 | -- | ||
38 | 1.7.9.5 | ||
39 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch new file mode 100644 index 0000000000..1d69a3f290 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 28 Apr 2012 18:24:50 +0200 | ||
4 | Subject: [PATCH] configure: use $host_alias-libtool instead of libtool | ||
5 | directly | ||
6 | |||
7 | Poky renames libtool to $host_alias-libtool. | ||
8 | ./$host_alias-libtool isn't created until after configure runs with | ||
9 | libtool >= 2.2.2 | ||
10 | so we can't call # it at this point. We can safely assume a version is | ||
11 | available | ||
12 | from PATH though | ||
13 | |||
14 | Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> | ||
15 | Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> | ||
16 | |||
17 | Upstream-Status: Inappropriate [configuration] | ||
18 | |||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | --- | ||
21 | configure.ac | 8 ++++---- | ||
22 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index a6478c6..9a93d60 100644 | ||
26 | --- a/configure.ac | ||
27 | +++ b/configure.ac | ||
28 | @@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then | ||
29 | G_MODULE_LDFLAGS= | ||
30 | else | ||
31 | export SED | ||
32 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
33 | + G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
34 | fi | ||
35 | dnl G_MODULE_IMPL= don't reset, so cmd-line can override | ||
36 | G_MODULE_NEED_USCORE=0 | ||
37 | @@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then | ||
38 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" | ||
39 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness | ||
40 | echo "void glib_plugin_test(void) { }" > plugin.c | ||
41 | - ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ | ||
42 | + ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ | ||
43 | ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 | ||
44 | - ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ | ||
45 | + ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ | ||
46 | ${LDFLAGS} -module -o plugin.la -export-dynamic \ | ||
47 | -shrext ".o" -avoid-version plugin.lo \ | ||
48 | -rpath /dont/care >/dev/null 2>&1 | ||
49 | @@ -1614,7 +1614,7 @@ fi | ||
50 | |||
51 | AC_MSG_CHECKING(for the suffix of module shared libraries) | ||
52 | export SED | ||
53 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` | ||
54 | +shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` | ||
55 | eval $shrext_cmds | ||
56 | module=yes eval std_shrext=$shrext_cmds | ||
57 | # chop the initial dot | ||
58 | -- | ||
59 | 1.7.8.6 | ||
60 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch new file mode 100644 index 0000000000..1571112b0e --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Rename 'rand' variable to avoid conflict. | ||
2 | |||
3 | Upstream-Status: pending | ||
4 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
5 | |||
6 | diff -u glib-2.34.3/tests/refcount/signals.c~ glib-2.34.3/tests/refcount/signals.c | ||
7 | --- glib-2.34.3/tests/refcount/signals.c 2012-11-26 17:52:48.000000000 +0100 | ||
8 | +++ glib-2.34.3/tests/refcount/signals.c 2013-02-08 14:24:10.052477546 +0100 | ||
9 | @@ -9,7 +9,7 @@ | ||
10 | #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) | ||
11 | #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) | ||
12 | |||
13 | -static GRand *rand; | ||
14 | +static GRand *grand; | ||
15 | |||
16 | typedef struct _GTest GTest; | ||
17 | typedef struct _GTestClass GTestClass; | ||
18 | @@ -84,7 +84,7 @@ | ||
19 | NULL | ||
20 | }; | ||
21 | |||
22 | - rand = g_rand_new(); | ||
23 | + grand = g_rand_new(); | ||
24 | |||
25 | test_type = g_type_register_static (G_TYPE_OBJECT, "GTest", | ||
26 | &test_info, 0); | ||
27 | @@ -218,7 +218,7 @@ | ||
28 | static void | ||
29 | my_test_do_prop (GTest * test) | ||
30 | { | ||
31 | - test->value = g_rand_int (rand); | ||
32 | + test->value = g_rand_int (grand); | ||
33 | g_object_notify (G_OBJECT (test), "test-prop"); | ||
34 | } | ||
35 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch new file mode 100644 index 0000000000..9759d11e3c --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | configure.ac: change readlink -f to -m | ||
2 | |||
3 | Change "readlink -f" to "readlink -m" since $libdir/$with_runtime_libdir | ||
4 | may not exist. | ||
5 | |||
6 | This patch should go to the upstream, I will send it sooner. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | --- | ||
12 | configure.ac | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -271,7 +271,7 @@ AC_ARG_WITH(runtime-libdir, | ||
19 | [], | ||
20 | [with_runtime_libdir=""]) | ||
21 | GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" | ||
22 | -ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`" | ||
23 | +ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`" | ||
24 | AC_SUBST(GLIB_RUNTIME_LIBDIR) | ||
25 | AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR) | ||
26 | AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"]) | ||
27 | -- | ||
28 | 1.8.1.2 | ||
29 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch new file mode 100644 index 0000000000..ee435111fc --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | # an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container | ||
2 | # for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d | ||
3 | # in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4. | ||
4 | # | ||
5 | # keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more | ||
6 | # portable here. mark for upstream | ||
7 | # | ||
8 | # by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 | ||
9 | # Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in | ||
14 | --- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 | ||
15 | +++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 | ||
16 | @@ -52,7 +52,7 @@ | ||
17 | datadir=@datadir@ | ||
18 | datarootdir=@datarootdir@ | ||
19 | |||
20 | -gettext_dir=$prefix/share/glib-2.0/gettext | ||
21 | +gettext_dir=@datadir@/glib-2.0/gettext | ||
22 | |||
23 | while test $# -gt 0; do | ||
24 | case "$1" in | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch new file mode 100644 index 0000000000..f3be02770c --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Instead of writing the temporary mapping files in the mappedfile test to the | ||
2 | user runtime directory, write them to $TMP. The runtime directory may not | ||
3 | currently exist if the test is executed on a non-desktop system and the test | ||
4 | doesn't attempt to create the directory structure. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c | ||
10 | index 40e0e60..27a24be 100644 | ||
11 | --- a/glib/tests/mappedfile.c | ||
12 | +++ b/glib/tests/mappedfile.c | ||
13 | @@ -81,7 +81,7 @@ test_writable (void) | ||
14 | const gchar *new = "abcdefghijklmnopqrstuvxyz"; | ||
15 | gchar *tmp_copy_path; | ||
16 | |||
17 | - tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL); | ||
18 | + tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL); | ||
19 | |||
20 | g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error); | ||
21 | g_assert_no_error (error); | ||
22 | @@ -125,7 +125,7 @@ test_writable_fd (void) | ||
23 | int fd; | ||
24 | gchar *tmp_copy_path; | ||
25 | |||
26 | - tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL); | ||
27 | + tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL); | ||
28 | |||
29 | g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error); | ||
30 | g_assert_no_error (error); | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest new file mode 100644 index 0000000000..130ae09b6c --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | gnome-desktop-testing-runner glib | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch new file mode 100644 index 0000000000..2a154fdd4a --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Fix DATADIRNAME on uclibc/Linux | ||
2 | |||
3 | translation files are always installed under PREFIX/share/locale in uclibc | ||
4 | based systems therefore lets set DATADIRNAME to "share". | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Pending | ||
8 | Index: glib-2.38.2/m4macros/glib-gettext.m4 | ||
9 | =================================================================== | ||
10 | --- glib-2.38.2.orig/m4macros/glib-gettext.m4 2013-11-07 07:29:13.000000000 -0800 | ||
11 | +++ glib-2.38.2/m4macros/glib-gettext.m4 2014-03-15 14:51:54.712135644 -0700 | ||
12 | @@ -239,7 +239,7 @@ | ||
13 | [CATOBJEXT=.mo | ||
14 | DATADIRNAME=lib]) | ||
15 | ;; | ||
16 | - *-*-openbsd*) | ||
17 | + *-*-openbsd* | *-*-linux-uclibc*) | ||
18 | CATOBJEXT=.mo | ||
19 | DATADIRNAME=share | ||
20 | ;; | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb new file mode 100644 index 0000000000..4b1bcf85c5 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | require glib.inc | ||
2 | |||
3 | PE = "1" | ||
4 | |||
5 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
6 | |||
7 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | ||
8 | file://configure-libtool.patch \ | ||
9 | file://fix-conflicting-rand.patch \ | ||
10 | file://add-march-i486-into-CFLAGS-automatically.patch \ | ||
11 | file://glib-2.0-configure-readlink.patch \ | ||
12 | file://run-ptest \ | ||
13 | file://ptest-paths.patch \ | ||
14 | file://uclibc.patch \ | ||
15 | file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ | ||
16 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ | ||
17 | " | ||
18 | |||
19 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" | ||
20 | |||
21 | SRC_URI[md5sum] = "05fb7cb17eacbc718e90366a1eae60d9" | ||
22 | SRC_URI[sha256sum] = "0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5" | ||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc new file mode 100644 index 0000000000..2d81afc8f2 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -0,0 +1,102 @@ | |||
1 | SUMMARY = "A general-purpose utility library" | ||
2 | DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on." | ||
3 | # pcre is under BSD; | ||
4 | # docs/reference/COPYING is with a 'public domai'-like license! | ||
5 | LICENSE = "LGPLv2+ & BSD & PD" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | ||
7 | file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ | ||
8 | file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | ||
9 | file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ | ||
10 | file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ | ||
11 | file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ | ||
12 | file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" | ||
13 | BUGTRACKER = "http://bugzilla.gnome.org" | ||
14 | SECTION = "libs" | ||
15 | |||
16 | BBCLASSEXTEND = "native nativesdk" | ||
17 | |||
18 | DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" | ||
19 | DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" | ||
20 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" | ||
21 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native" | ||
22 | |||
23 | PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" | ||
24 | |||
25 | LEAD_SONAME = "libglib-2.0.*" | ||
26 | FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" | ||
27 | |||
28 | inherit autotools gettext gtk-doc pkgconfig ptest-gnome | ||
29 | |||
30 | S = "${WORKDIR}/glib-${PV}" | ||
31 | |||
32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" | ||
33 | |||
34 | PRINTF = "--enable-included-printf=no" | ||
35 | PRINTF_darwin = "--enable-included-printf=yes" | ||
36 | PRINTF_mingw32 = "--enable-included-printf=yes" | ||
37 | EXTRA_OECONF = "${PRINTF} ${CORECONF}" | ||
38 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | ||
39 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" | ||
40 | |||
41 | do_configure_prepend() { | ||
42 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | ||
43 | } | ||
44 | |||
45 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas \ | ||
46 | ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" | ||
47 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | ||
48 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ | ||
49 | ${libdir}/gio/modules/*.la" | ||
50 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ | ||
51 | ${libdir}/gio/modules/.debug \ | ||
52 | ${libdir}/glib-2.0/installed-tests/glib/.debug" | ||
53 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" | ||
54 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ | ||
55 | ${datadir}/bash-completion" | ||
56 | |||
57 | ARM_INSTRUCTION_SET = "arm" | ||
58 | USE_NLS = "yes" | ||
59 | |||
60 | do_install_append () { | ||
61 | if [ -f ${D}${bindir}/gtester-report ]; then | ||
62 | sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python|' | ||
63 | fi | ||
64 | |||
65 | # Remove some unpackaged files | ||
66 | rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc | ||
67 | rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo | ||
68 | |||
69 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location | ||
70 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | ||
71 | if [ -f ${D}${bindir}/glib-mkenums ]; then | ||
72 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums | ||
73 | fi | ||
74 | } | ||
75 | |||
76 | RDEPENDS_${PN}-ptest += "\ | ||
77 | gnome-desktop-testing \ | ||
78 | tzdata \ | ||
79 | tzdata-americas \ | ||
80 | tzdata-asia \ | ||
81 | tzdata-europe \ | ||
82 | tzdata-posix \ | ||
83 | python-pygobject \ | ||
84 | python-dbus \ | ||
85 | shared-mime-info \ | ||
86 | " | ||
87 | |||
88 | RDEPENDS_${PN}-ptest_append_libc-glibc = "\ | ||
89 | glibc-gconv-utf-16 \ | ||
90 | glibc-charmap-utf-8 \ | ||
91 | glibc-gconv-cp1255 \ | ||
92 | glibc-charmap-cp1255 \ | ||
93 | glibc-gconv-utf-32 \ | ||
94 | glibc-gconv-utf-7 \ | ||
95 | glibc-gconv-euc-jp \ | ||
96 | glibc-gconv-iso8859-1 \ | ||
97 | glibc-gconv-iso8859-15 \ | ||
98 | glibc-charmap-invariant \ | ||
99 | glibc-localedata-translit-cjk-variants \ | ||
100 | " | ||
101 | |||
102 | INSANE_SKIP_${PN}-ptest += "libdir" | ||