* [PATCH 01/15] automake: upgrade from 1.11.3 to 1.12.1
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 02/15] jpeg: fix configure with automake 1.12.1 nitin.a.kamble
` (14 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../automake/automake/path_prog_fixes.patch | 40 +++-----------------
.../{automake_1.11.3.bb => automake_1.12.1.bb} | 5 +-
2 files changed, 8 insertions(+), 37 deletions(-)
rename meta/recipes-devtools/automake/{automake_1.11.3.bb => automake_1.12.1.bb} (93%)
diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
index 312cec6..9ee0672 100644
--- a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
+++ b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
@@ -7,38 +7,10 @@ Upstream-Status: Inappropriate [embedded specific]
automake.in | 6 ++++--
4 files changed, 10 insertions(+), 6 deletions(-)
-Index: automake-1.10.1/Makefile.am
+Index: automake-1.12.1/aclocal.in
===================================================================
---- automake-1.10.1.orig/Makefile.am 2008-01-21 22:28:58.000000000 +0000
-+++ automake-1.10.1/Makefile.am 2008-10-10 17:21:20.000000000 +0100
-@@ -75,7 +75,8 @@
- -e 's,[@]SHELL[@],$(SHELL),g' \
- -e 's,[@]VERSION[@],$(VERSION),g' \
- -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
-- -e 's,[@]datadir[@],$(datadir),g'
-+ -e 's,[@]datadir[@],$(datadir),g' \
-+ -e 's,[@]bindir[@],$(bindir),g'
-
- ## These files depend on Makefile so they are rebuilt if $(VERSION),
- ## $(datadir) or other do_subst'ituted variables change.
-Index: automake-1.10.1/Makefile.in
-===================================================================
---- automake-1.10.1.orig/Makefile.in 2008-01-21 22:29:10.000000000 +0000
-+++ automake-1.10.1/Makefile.in 2008-10-10 17:22:21.000000000 +0100
-@@ -185,7 +185,8 @@
- -e 's,[@]SHELL[@],$(SHELL),g' \
- -e 's,[@]VERSION[@],$(VERSION),g' \
- -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
-- -e 's,[@]datadir[@],$(datadir),g'
-+ -e 's,[@]datadir[@],$(datadir),g' \
-+ -e 's,[@]bindir[@],$(bindir),g'
-
- WGET = wget
- WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
-Index: automake-1.10.1/aclocal.in
-===================================================================
---- automake-1.10.1.orig/aclocal.in 2008-01-21 22:11:41.000000000 +0000
-+++ automake-1.10.1/aclocal.in 2008-10-10 17:21:20.000000000 +0100
+--- automake-1.12.1.orig/aclocal.in
++++ automake-1.12.1/aclocal.in
@@ -1,8 +1,8 @@
-#!@PERL@ -w
+#!@bindir@/env perl
@@ -50,10 +22,10 @@ Index: automake-1.10.1/aclocal.in
if 0;
# aclocal - create aclocal.m4 by scanning configure.ac
-Index: automake-1.10.1/automake.in
+Index: automake-1.12.1/automake.in
===================================================================
---- automake-1.10.1.orig/automake.in 2008-01-21 22:11:41.000000000 +0000
-+++ automake-1.10.1/automake.in 2008-10-10 17:21:20.000000000 +0100
+--- automake-1.12.1.orig/automake.in
++++ automake-1.12.1/automake.in
@@ -1,8 +1,10 @@
-#!@PERL@ -w
+#!@bindir@/env perl
diff --git a/meta/recipes-devtools/automake/automake_1.11.3.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb
similarity index 93%
rename from meta/recipes-devtools/automake/automake_1.11.3.bb
rename to meta/recipes-devtools/automake/automake_1.12.1.bb
index 2008774..c2bc6a3 100644
--- a/meta/recipes-devtools/automake/automake_1.11.3.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.1.bb
@@ -43,9 +43,8 @@ SRC_URI += "${PATHFIXPATCH} \
file://python-libdir.patch \
file://py-compile-compile-only-optimized-byte-code.patch"
-
-SRC_URI[md5sum] = "93ecb319f0365cb801990b00f658d026"
-SRC_URI[sha256sum] = "921b5188057e57bdd9c0ba06e21d0b0ea7dafa61a9bd08a2b041215bcff12f55"
+SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba"
+SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f"
PR = "r0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 02/15] jpeg: fix configure with automake 1.12.1
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
2012-07-09 16:26 ` [PATCH 01/15] automake: upgrade from 1.11.3 " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 03/15] gnutls: Fix build " nitin.a.kamble
` (13 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Bring back earlier jpeg fix. upstream has removed the fix from earlier release.
The support for automatic de-ANSI-fication has been deprecated in
automake 1.11.2, and will be removed altogether in automake 1.12
This avoids this error:
| configure.ac:24: automatic de-ANSI-fication support is deprecated
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
NOTE: package jpeg-native-8c-r2: task do_configure: Failed
(From OE-Core rev: 893ce9db79a5c4cca8a6b6ed6a9cec81777aba2f)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 ++++++++++++++++++++
meta/recipes-core/jpeg/jpeg_8d.bb | 5 +-
2 files changed, 47 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
diff --git a/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
new file mode 100644
index 0000000..3a970ea
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
@@ -0,0 +1,44 @@
+Upstream-Status: Pending
+
+The support for automatic de-ANSI-fication has been deprecated in
+automake 1.11.2, and will be removed altogether in automake 1.12
+
+This avoids this error:
+| configure.ac:24: automatic de-ANSI-fication support is deprecated
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+NOTE: package jpeg-native-8c-r2: task do_configure: Failed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/12/28
+
+
+Index: jpeg-8d/configure.ac
+===================================================================
+--- jpeg-8d.orig/configure.ac
++++ jpeg-8d/configure.ac
+@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
+
+ # Initialize Automake
+ # Don't require all the GNU mandated files
+-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
++AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign])
+
+ # Make --enable-silent-rules the default.
+ # To get verbose build output you may configure
+@@ -29,7 +29,14 @@ AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obs
+ AM_SILENT_RULES([yes])
+
+ # This is required when using the de-ANSI-fication feature.
+-AM_C_PROTOTYPES
++#AM_C_PROTOTYPES
++# add following to avoid this error:
++#| automake: warnings are treated as errors
++#| /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libjpeg.la': linking libtool libraries using a non-POSIX
++#| /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
++#| Makefile.am:65: while processing Libtool library 'libjpeg.la'
++#| autoreconf: automake failed with exit status: 1
++AM_PROG_AR
+
+ # Add configure option --enable-maintainer-mode which enables
+ # dependency checking and generation useful to package maintainers.
diff --git a/meta/recipes-core/jpeg/jpeg_8d.bb b/meta/recipes-core/jpeg/jpeg_8d.bb
index 61f1c2e..6781619 100644
--- a/meta/recipes-core/jpeg/jpeg_8d.bb
+++ b/meta/recipes-core/jpeg/jpeg_8d.bb
@@ -11,10 +11,11 @@ SECTION = "libs"
DEPENDS = "libtool-cross"
DEPENDS_virtclass-native = "libtool-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
- file://debian-libjpeg7_7-1.diff"
+ file://debian-libjpeg7_7-1.diff \
+ file://fix_for_automake_1.12.1.patch"
SRC_URI[md5sum] = "52654eb3b2e60c35731ea8fc87f1bd29"
SRC_URI[sha256sum] = "00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 03/15] gnutls: Fix build with automake 1.12.1
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
2012-07-09 16:26 ` [PATCH 01/15] automake: upgrade from 1.11.3 " nitin.a.kamble
2012-07-09 16:26 ` [PATCH 02/15] jpeg: fix configure with automake 1.12.1 nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 04/15] pcmanfm: fix build with automake 1.12.x nitin.a.kamble
` (12 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Added new patches:
avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
gnutls_fix_for_automake_1.12.1.patch
more details in patch headers.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
..._MKDIR_P_warning_error_with_automake_1.12.patch | 51 ++++++++++++++++++++
.../gnutls_fix_for_automake_1.12.1.patch | 43 ++++++++++++++++
meta/recipes-support/gnutls/gnutls_2.12.19.bb | 4 +-
3 files changed, 97 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.19/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.19/gnutls_fix_for_automake_1.12.1.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.19/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
new file mode 100644
index 0000000..dde683f
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.19/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
@@ -0,0 +1,51 @@
+Upsteam-Status: Inappropriate
+
+automake 1.12.x has depricated AM_PROG_MKDIR_P , and throws a warning for that,
+and the warnings are treated as errors becuase of the -Werror parameter.
+
+These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not
+eliminated these depricated macros yet. So disable the treatment of warnings
+as errors until gettext is updeated to remove the depricated macros.
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/09
+
+Index: gnutls-2.12.19/configure.ac
+===================================================================
+--- gnutls-2.12.19.orig/configure.ac
++++ gnutls-2.12.19/configure.ac
+@@ -26,7 +26,7 @@ AC_INIT([GnuTLS], [2.12.19], [bug-gnutls
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+
+Index: gnutls-2.12.19/lib/configure.ac
+===================================================================
+--- gnutls-2.12.19.orig/lib/configure.ac
++++ gnutls-2.12.19/lib/configure.ac
+@@ -26,7 +26,7 @@ AC_INIT([libgnutls], [2.12.19], [bug-gnu
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+
+Index: gnutls-2.12.19/libextra/configure.ac
+===================================================================
+--- gnutls-2.12.19.orig/libextra/configure.ac
++++ gnutls-2.12.19/libextra/configure.ac
+@@ -26,7 +26,7 @@ AC_INIT([libgnutls-extra], [2.12.19], [b
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.19/gnutls_fix_for_automake_1.12.1.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/gnutls_fix_for_automake_1.12.1.patch
new file mode 100644
index 0000000..1625255
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.19/gnutls_fix_for_automake_1.12.1.patch
@@ -0,0 +1,43 @@
+Upsteam-Status: Pending
+
+Avoids these kind of warnings:
+Warning: 'libgnutls.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+Date: 2012/07/09
+Index: gnutls-2.12.19/configure.ac
+===================================================================
+--- gnutls-2.12.19.orig/configure.ac
++++ gnutls-2.12.19/configure.ac
+@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
+
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+ AM_CONFIG_HEADER(config.h)
+
+ AC_MSG_RESULT([***
+Index: gnutls-2.12.19/lib/configure.ac
+===================================================================
+--- gnutls-2.12.19.orig/lib/configure.ac
++++ gnutls-2.12.19/lib/configure.ac
+@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
+
+ AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
+Index: gnutls-2.12.19/libextra/configure.ac
+===================================================================
+--- gnutls-2.12.19.orig/libextra/configure.ac
++++ gnutls-2.12.19/libextra/configure.ac
+@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
+
+ AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.19.bb b/meta/recipes-support/gnutls/gnutls_2.12.19.bb
index 7d76510..ff70c07 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.19.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.19.bb
@@ -1,10 +1,12 @@
require gnutls.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI += "file://gnutls-openssl.patch \
file://correct_rpl_gettimeofday_signature.patch \
file://configure-fix.patch \
+ file://gnutls_fix_for_automake_1.12.1.patch \
+ file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
"
SRC_URI[md5sum] = "14228b34e3d8ed176a617df40693b441"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 04/15] pcmanfm: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (2 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 03/15] gnutls: Fix build " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 05/15] avahi: fix build with automake 1.12.1 nitin.a.kamble
` (11 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Added a patch:
pcmanfm_fix_for_automake_1.12.patch
More information in the patch header.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../files/pcmanfm_fix_for_automake_1.12.patch | 35 ++++++++++++++++++++
meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb | 5 ++-
2 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
diff --git a/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
new file mode 100644
index 0000000..1ad0ff5
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Pending
+
+Fix these errors:
+| automake: warnings are treated as errors
+| data/ui/Makefile.am:18: warning: '%'-style pattern rules are a GNU make extension
+| src/Makefile.am:10: warning: compiling 'pcmanfm.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@Intel.com>
+2012/07/09
+
+Index: pcmanfm-0.9.10/configure.ac
+===================================================================
+--- pcmanfm-0.9.10.orig/configure.ac
++++ pcmanfm-0.9.10/configure.ac
+@@ -13,6 +13,7 @@ AC_PROG_CC
+ AM_PROG_LIBTOOL
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
++AM_PROG_CC_C_O
+
+ # Checks for header files.
+ AC_HEADER_STDC
+Index: pcmanfm-0.9.10/data/ui/Makefile.am
+===================================================================
+--- pcmanfm-0.9.10.orig/data/ui/Makefile.am
++++ pcmanfm-0.9.10/data/ui/Makefile.am
+@@ -15,6 +15,6 @@ EXTRA_DIST = \
+ $(NULL)
+
+ # Purge GtkBuilder UI files
+-%.ui: %.glade
++.glade.ui:
+ cp $< $@
+ # $(top_builddir)/src/xml-purge $@
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
index 545367a..576b4ba 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb
@@ -11,7 +11,7 @@ SECTION = "x11"
DEPENDS = "gtk+ startup-notification libfm"
DEPENDS_append_poky = " libowl"
-PR = "r0"
+PR = "r1"
COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)'
@@ -20,7 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
file://gnome-fs-regular.png \
file://gnome-mime-text-plain.png \
file://emblem-symbolic-link.png \
- file://cross-compile-fix.patch"
+ file://cross-compile-fix.patch \
+ file://pcmanfm_fix_for_automake_1.12.patch"
SRC_URI_append_poky = " file://owl-window-menu.patch"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 05/15] avahi: fix build with automake 1.12.1
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (3 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 04/15] pcmanfm: fix build with automake 1.12.x nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 06/15] dates: fix build with automake 1.12.x nitin.a.kamble
` (10 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
added a new patch : fix_for_automake_1.12.x.patch
More information in the patch header.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 3 +-
.../avahi/files/fix_for_automake_1.12.x.patch | 34 ++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index c118758..37ff70d 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r4"
+INC_PR = "r5"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
@@ -23,6 +23,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://99avahi-autoipd \
file://initscript.patch \
file://avahi_fix_install_issue.patch \
+ file://fix_for_automake_1.12.x.patch \
"
USERADD_PACKAGES = "avahi-daemon"
diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
new file mode 100644
index 0000000..0fc4c29
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Pending
+
+autoamke 1.12.x has depricated use of mkdir_p , and recommends use of MKDIR_P
+instead. Fixed the automake files accordingly to avoid warning-errors.
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/09
+
+
+Index: avahi-0.6.31/avahi-daemon/Makefile.am
+===================================================================
+--- avahi-0.6.31.orig/avahi-daemon/Makefile.am
++++ avahi-0.6.31/avahi-daemon/Makefile.am
+@@ -169,7 +169,7 @@ xmllint:
+ done
+
+ install-data-local:
+- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
++ test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
+
+ update-systemd:
+ curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
+Index: avahi-0.6.31/avahi-autoipd/Makefile.am
+===================================================================
+--- avahi-0.6.31.orig/avahi-autoipd/Makefile.am
++++ avahi-0.6.31/avahi-autoipd/Makefile.am
+@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dh
+ dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
+
+ install-exec-hook: dhclient-exit-hook dhclient-enter-hook
+- $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
++ $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+ $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
+ $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 06/15] dates: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (4 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 05/15] avahi: fix build with automake 1.12.1 nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 07/15] librsvg: " nitin.a.kamble
` (9 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-sato/pimlico/dates_git.bb | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index 73258ae..9ee0105 100644
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
PV = "0.4.11+git${SRCPV}"
-PR = "r7"
+PR = "r8"
S = "${WORKDIR}/git"
@@ -16,7 +16,3 @@ SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
file://dso_linking_change_build_fix.patch \
file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
"
-
-do_install_append () {
- rmdir ${D}/srv
-}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 07/15] librsvg: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (5 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 06/15] dates: fix build with automake 1.12.x nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 08/15] evolution-data-server: " nitin.a.kamble
` (8 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 4e4e339..a3e8f0f 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -11,7 +11,7 @@ DEPENDS = "gtk+ libcroco cairo libxml2 popt"
DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native"
BBCLASSEXTEND = "native"
-PR = "r5"
+PR = "r6"
inherit autotools pkgconfig gnome
@@ -27,11 +27,6 @@ do_configure_prepend () {
echo "CLEANFILES=" > gtk-doc.make
}
-do_install_append () {
- rmdir ${D}${libdir}/gtk-3.0/engines/
- rmdir ${D}${libdir}/gtk-3.0/
-}
-
PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
FILES_${PN} = "${libdir}/*.so.*"
FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \
@@ -65,3 +60,4 @@ fi
test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
}
+PARALLEL_MAKE = ""
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 08/15] evolution-data-server: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (6 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 07/15] librsvg: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 09/15] tar: " nitin.a.kamble
` (7 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Added 2 patches:
avoid_automake_errors.patch
fix_for_automake-1.12.x.patch
More information in the patch headers.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../avoid_automake_errors.patch | 83 ++++++++++++++++++++
.../fix_for_automake-1.12.x.patch | 28 +++++++
meta/recipes-sato/eds/evolution-data-server_git.bb | 4 +-
3 files changed, 114 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch
create mode 100644 meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch
diff --git a/meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch b/meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch
new file mode 100644
index 0000000..ebf00c3
--- /dev/null
+++ b/meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch
@@ -0,0 +1,83 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Avoid these warning-errors
+
+automake: warnings are treated as errors
+Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension
+Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+addressbook/backends/file/Makefile.am: installing './depcomp'
+addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name
+addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
+addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name
+addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension)
+glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
+glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
+glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
+glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
+glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
+glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
+addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name
+calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name
+calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension)
+glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
+glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
+glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
+glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
+glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
+glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
+calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension
+libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension
+libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension
+libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension
+libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension
+servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension
+servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension
+servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+autoreconf: automake failed with exit status: 1
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/09
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
+ dnl Autoconf / Automake Initialization
+ AC_PREREQ(2.58)
+ AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+-AM_INIT_AUTOMAKE([gnu 1.9 tar-ustar -Wall -Werror foreign])
++AM_INIT_AUTOMAKE([gnu 1.9 tar-ustar -Wall foreign])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(README)
+ AC_CONFIG_HEADERS(config.h)
diff --git a/meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch b/meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch
new file mode 100644
index 0000000..ac77a6d
--- /dev/null
+++ b/meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+Fixed these kinds if warning-errors
+
+warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/09
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -17,6 +17,7 @@ dnl This number is meaningless, but we'r
+ dnl library names for backward compatibility.
+ m4_define([api_version], [1.2])
+
++
+ dnl Autoconf / Automake Initialization
+ AC_PREREQ(2.58)
+ AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+@@ -30,6 +31,7 @@ AC_LANG(C)
+
+ dnl Automake 1.11 - Silent Build Rules
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+
+ dnl Required Package Versions
+ m4_define([glib_minimum_version], [2.16.1])
diff --git a/meta/recipes-sato/eds/evolution-data-server_git.bb b/meta/recipes-sato/eds/evolution-data-server_git.bb
index 1d675dc..5e8adbc 100644
--- a/meta/recipes-sato/eds/evolution-data-server_git.bb
+++ b/meta/recipes-sato/eds/evolution-data-server_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi
SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f"
PV = "2.30+git${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://oh-contact.patch;striplevel=0 \
@@ -21,6 +21,8 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://new-contact-fix.patch \
file://old-gdk-api.patch \
file://depbuildfix.patch \
+ file://fix_for_automake-1.12.x.patch \
+ file://avoid_automake_errors.patch \
file://iconv-detect.h"
S = "${WORKDIR}/git"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 09/15] tar: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (7 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 08/15] evolution-data-server: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 10/15] libgcrypt: " nitin.a.kamble
` (6 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
Avoid this error:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
NOTE: package tar-1.26-r1: task do_install: Failed
no PR bump as no change in the output.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-extended/tar/tar.inc | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 8c475df..203fb97 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -18,8 +18,6 @@ do_install () {
do_install_extra () {
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar
- rmdir ${D}${bindir}/
- rmdir ${D}${sbindir}/
}
inherit update-alternatives
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 10/15] libgcrypt: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (8 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 09/15] tar: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 11/15] gpgme: " nitin.a.kamble
` (5 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
avoid this issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/libgcrypt-1.5.0-r0/image/usr/sbin': No such file or directory
NOTE: package libgcrypt-1.5.0-r0: task do_install: Failed
no PR bump as no change in the output
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/libgcrypt/libgcrypt.inc | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index a890188..088cd34 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -21,9 +21,6 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
do_install_append() {
install -d ${D}/${libdir}/pkgconfig
install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
-
- # Remove empty sbin directory since we don't build the daemon that would install there
- rmdir ${D}${sbindir}
}
ARM_INSTRUCTION_SET = "arm"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 11/15] gpgme: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (9 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 10/15] libgcrypt: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 12/15] telepathy-glib: " nitin.a.kamble
` (4 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
avoid this issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/wERROR: Function failed: do_install (see /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/gpgme-1.3.1-r1/temp/log.do_install.36763 for further information)
| ork/i586-poky-linux/gpgme-1.3.1-r1/image/usr/libexec': No such file or directory
NOTE: package gpgme-1.3.1-r1: task do_install: Failed
no PR bump as no change in the output
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/gpgme/gpgme_1.3.1.bb | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
index 43d8aad..c336048 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
@@ -29,7 +29,3 @@ FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
FILES_${PN} = "${libdir}/libgpgme.so.*"
FILES_${PN}-dev += "${bindir}/gpgme-config ${datadir}/common-lisp/source/gpgme/*"
-
-do_install_append() {
- rmdir ${D}/usr/libexec
-}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 12/15] telepathy-glib: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (10 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 11/15] gpgme: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 13/15] xf86-video-vmware: " nitin.a.kamble
` (3 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
avoid this issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/telepathy-glib-0.18.1-r0/image/usr/bin': No such file or directory
NOTE: package telepathy-glib-0.18.1-r0: task do_install: Failed
no PR bump as no change in the output
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../telepathy/telepathy-glib_0.19.0.bb | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.0.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.0.bb
index 6c4e12c..9799605 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.0.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.0.bb
@@ -16,9 +16,3 @@ inherit autotools pkgconfig gettext
FILES_${PN} += "${datadir}/telepathy \
${datadir}/dbus-1"
-
-do_install_append() {
- rmdir ${D}${bindir}
- rmdir ${D}${libexecdir}
- rmdir ${D}${servicedir}
-}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 13/15] xf86-video-vmware: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (11 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 12/15] telepathy-glib: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 14/15] libfm: " nitin.a.kamble
` (2 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
Fixes this build issue:
| rmdir: failed to remove
`/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/xf86-video-vmware-2_12.0.1-r17.1/image/usr/bin':
No such file or directory
NOTE: package xf86-video-vmware-2_12.0.1-r17.1: task do_install: Failed
No PR bump as no change in the output.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../xorg-driver/xf86-video-vmware_12.0.2.bb | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
index 71f0339..4468fae 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
@@ -15,8 +15,3 @@ SRC_URI[md5sum] = "0743ec7c479603fba60d118858fd5783"
SRC_URI[sha256sum] = "c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
-do_install_append () {
- # Remove useless empty directory
- rmdir ${D}${bindir}
-}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 14/15] libfm: fix build with automake 1.12.x
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (12 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 13/15] xf86-video-vmware: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-09 16:26 ` [PATCH 15/15] pango: fix dependencies to avoid build issue nitin.a.kamble
2012-07-10 13:50 ` [PATCH 00/15] commits related to automake update to 1.12.1 Richard Purdie
15 siblings, 0 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.
cleanup the do_install_append for automake 1.12.x
Avoids this build issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/libfm-0.1.17-r4/image/usr/lib/gio/modules/': No such file or directory
NOTE: package libfm-0.1.17-r4: task do_install: Failed
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/libfm/libfm_0.1.17.bb | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb b/meta/recipes-support/libfm/libfm_0.1.17.bb
index 1bd8850..2cac361 100644
--- a/meta/recipes-support/libfm/libfm_0.1.17.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.17.bb
@@ -21,10 +21,5 @@ SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15b
inherit autotools pkgconfig
-do_install_append () {
- rmdir ${D}${libdir}/gio/modules/
- rmdir ${D}${libdir}/gio/
-}
-
PACKAGES += "${PN}-mime"
FILES_${PN}-mime = "${datadir}/mime/"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 15/15] pango: fix dependencies to avoid build issue
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (13 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 14/15] libfm: " nitin.a.kamble
@ 2012-07-09 16:26 ` nitin.a.kamble
2012-07-10 5:20 ` Khem Raj
2012-07-10 12:12 ` Richard Purdie
2012-07-10 13:50 ` [PATCH 00/15] commits related to automake update to 1.12.1 Richard Purdie
15 siblings, 2 replies; 19+ messages in thread
From: nitin.a.kamble @ 2012-07-09 16:26 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
this commit avoids this build issue:
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.7.1/ld: cannot find -lelf
| collect2: error: ld returned 1 exit status
...
| make: *** [all] Error 2
| ERROR: oe_runmake failed
NOTE: package pango-1.28.4-r7: task do_compile: Failed
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-graphics/pango/pango.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index fbf5027..754a720 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.0+"
X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo "
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo elfutils"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 15/15] pango: fix dependencies to avoid build issue
2012-07-09 16:26 ` [PATCH 15/15] pango: fix dependencies to avoid build issue nitin.a.kamble
@ 2012-07-10 5:20 ` Khem Raj
2012-07-10 12:12 ` Richard Purdie
1 sibling, 0 replies; 19+ messages in thread
From: Khem Raj @ 2012-07-10 5:20 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Jul 9, 2012 at 9:26 AM, <nitin.a.kamble@intel.com> wrote:
>
> | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.7.1/ld: cannot find -lelf
> | collect2: error: ld returned 1 exit status
I wonder why this is not seen generally. Is there something in your
build box thats triggering pango to ask for libelf ?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 15/15] pango: fix dependencies to avoid build issue
2012-07-09 16:26 ` [PATCH 15/15] pango: fix dependencies to avoid build issue nitin.a.kamble
2012-07-10 5:20 ` Khem Raj
@ 2012-07-10 12:12 ` Richard Purdie
1 sibling, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2012-07-10 12:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2012-07-09 at 09:26 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> this commit avoids this build issue:
>
> | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.7.1/ld: cannot find -lelf
> | collect2: error: ld returned 1 exit status
> ...
> | make: *** [all] Error 2
> | ERROR: oe_runmake failed
> NOTE: package pango-1.28.4-r7: task do_compile: Failed
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
> meta/recipes-graphics/pango/pango.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
> index fbf5027..754a720 100644
> --- a/meta/recipes-graphics/pango/pango.inc
> +++ b/meta/recipes-graphics/pango/pango.inc
> @@ -10,7 +10,7 @@ SECTION = "libs"
> LICENSE = "LGPLv2.0+"
>
> X11DEPENDS = "virtual/libx11 libxft"
> -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo "
> +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo elfutils"
>
> PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
I think rather than blindly adding the dependency, we need to figure out
what this is needed for. We had a similar issue with glib-2.0:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=38da655788361e949d605bebfab45cf5830df613
so I'm leaning to disabling this here.
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 00/15] commits related to automake update to 1.12.1
2012-07-09 16:26 [PATCH 00/15] commits related to automake update to 1.12.1 nitin.a.kamble
` (14 preceding siblings ...)
2012-07-09 16:26 ` [PATCH 15/15] pango: fix dependencies to avoid build issue nitin.a.kamble
@ 2012-07-10 13:50 ` Richard Purdie
15 siblings, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2012-07-10 13:50 UTC (permalink / raw)
To: nitin.a.kamble; +Cc: Openembedded-core
On Mon, 2012-07-09 at 09:26 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> This work is based on 1.3_M1 branch to get a stable base. These commits
> build core-image-sato-sdk & core-image-lsb images fine.
This is all well and good but its neigh on impossible for me to merge
this since many of the packages have been upgraded after 1.3M1. Please
rebase this on master.
I've attempted this on OE-Core's master-next branch but many of the
commits didn't apply and were dropped.
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread