[PATCH V2] gpgme: fix multilib header conflict

[PATCH V2] gpgme: fix multilib header conflict

[Changqing Li]

From: Changqing Li <changqing.li@windriver.com>

fix error:
file /usr/include/gpgme.h conflicts between attempted installs of gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
index 9fc1ae24a4..b51534351d 100644
--- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
@@ -59,7 +59,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
                  --disable-lang-python-test \
 '
 
-inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT}
+inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header
 
 export PKG_CONFIG='pkg-config'
 
@@ -83,3 +83,7 @@ do_configure_prepend () {
 	rm -f ${S}/m4/libassuan.m4
 	rm -f ${S}/m4/python.m4
 }
+
+do_install_append() {
+       oe_multilib_header gpgme.h
+}
-- 
2.17.1

Re: [OE-core] [PATCH V2] gpgme: fix multilib header conflict

[Richard Purdie]

On Fri, 2020-08-14 at 14:31 +0800, Changqing Li wrote:
> From: Changqing Li <changqing.li@windriver.com>
> 
> fix error:
> file /usr/include/gpgme.h conflicts between attempted installs of gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32
> 
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
> index 9fc1ae24a4..b51534351d 100644
> --- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb
> +++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
> @@ -59,7 +59,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
>                   --disable-lang-python-test \
>  '
>  
> -inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT}
> +inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header
>  
>  export PKG_CONFIG='pkg-config'
>  
> @@ -83,3 +83,7 @@ do_configure_prepend () {
>  	rm -f ${S}/m4/libassuan.m4
>  	rm -f ${S}/m4/python.m4
>  }
> +
> +do_install_append() {
> +       oe_multilib_header gpgme.h
> +}

These kinds of changes are hard to review. Could you please include a
diff of the header issues in the commit message please?

Cheers,

Richard

[PATCH V3] gpgme: fix multilib header conflict

[Changqing Li]

From: Changqing Li <changqing.li@windriver.com>

fix error:
file /usr/include/gpgme.h conflicts between attempted installs of gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32

diff of gpgme-32.h and gpgme-64.h
21c21
<  * Generated from gpgme.h.in for i686-pokymllib32-linux-gnu.
---
>  * Generated from gpgme.h.in for x86_64-poky-linux-gnu.
109c109
< #if 64
---
> #if 0
111c111
< #error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
---
> #error GPGME was compiled with _FILE_OFFSET_BITS = 0, please see the section "Largefile support (LFS)" in the GPGME manual.
113,114c113,114
< #if (_FILE_OFFSET_BITS) != (64)
< #error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 64, please see the section "Largefile support (LFS)" in the GPGME manual.
---
> #if (_FILE_OFFSET_BITS) != (0)
> #error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 0, please see the section "Largefile support (LFS)" in the GPGME manual.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
index 9fc1ae24a4..b51534351d 100644
--- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
@@ -59,7 +59,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
                  --disable-lang-python-test \
 '
 
-inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT}
+inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header
 
 export PKG_CONFIG='pkg-config'
 
@@ -83,3 +83,7 @@ do_configure_prepend () {
 	rm -f ${S}/m4/libassuan.m4
 	rm -f ${S}/m4/python.m4
 }
+
+do_install_append() {
+       oe_multilib_header gpgme.h
+}
-- 
2.26.2

Re: [OE-core] [PATCH V3] gpgme: fix multilib header conflict

[Richard Purdie]

On Mon, 2020-08-17 at 10:57 +0800, Changqing Li wrote:
> From: Changqing Li <changqing.li@windriver.com>
> 
> fix error:
> file /usr/include/gpgme.h conflicts between attempted installs of
> gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32
> 
> diff of gpgme-32.h and gpgme-64.h
> 21c21
> <  * Generated from gpgme.h.in for i686-pokymllib32-linux-gnu.
> ---
> >  * Generated from gpgme.h.in for x86_64-poky-linux-gnu.
> 109c109
> < #if 64
> ---
> > #if 0
> 111c111
> < #error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see
> the section "Largefile support (LFS)" in the GPGME manual.
> ---
> > #error GPGME was compiled with _FILE_OFFSET_BITS = 0, please see
> > the section "Largefile support (LFS)" in the GPGME manual.
> 113,114c113,114
> < #if (_FILE_OFFSET_BITS) != (64)
> < #error GPGME was compiled with a different value for
> _FILE_OFFSET_BITS, namely 64, please see the section "Largefile
> support (LFS)" in the GPGME manual.
> ---
> > #if (_FILE_OFFSET_BITS) != (0)
> > #error GPGME was compiled with a different value for
> > _FILE_OFFSET_BITS, namely 0, please see the section "Largefile
> > support (LFS)" in the GPGME manual.

Please use unifed diff format as we use in patches as its much more
readable.

This one raises interesting questions, perhaps we should be enabling
large file support everywhere within gpgme instead of this patch?

The other patch (libffi) looks necessary but I'd much prefer if it diff
-u.

Cheers,

Richard

Re: [OE-core] [PATCH V3] gpgme: fix multilib header conflict

[Changqing Li]

On 8/17/20 3:41 PM, Richard Purdie wrote:
> On Mon, 2020-08-17 at 10:57 +0800, Changqing Li wrote:
>> From: Changqing Li<changqing.li@windriver.com>
>>
>> fix error:
>> file /usr/include/gpgme.h conflicts between attempted installs of
>> gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32
>>
>> diff of gpgme-32.h and gpgme-64.h
>> 21c21
>> <  * Generated from gpgme.h.in for i686-pokymllib32-linux-gnu.
>> ---
>>>   * Generated from gpgme.h.in for x86_64-poky-linux-gnu.
>> 109c109
>> < #if 64
>> ---
>>> #if 0
>> 111c111
>> < #error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see
>> the section "Largefile support (LFS)" in the GPGME manual.
>> ---
>>> #error GPGME was compiled with _FILE_OFFSET_BITS = 0, please see
>>> the section "Largefile support (LFS)" in the GPGME manual.
>> 113,114c113,114
>> < #if (_FILE_OFFSET_BITS) != (64)
>> < #error GPGME was compiled with a different value for
>> _FILE_OFFSET_BITS, namely 64, please see the section "Largefile
>> support (LFS)" in the GPGME manual.
>> ---
>>> #if (_FILE_OFFSET_BITS) != (0)
>>> #error GPGME was compiled with a different value for
>>> _FILE_OFFSET_BITS, namely 0, please see the section "Largefile
>>> support (LFS)" in the GPGME manual.
> Please use unifed diff format as we use in patches as its much more
> readable.
>
> This one raises interesting questions, perhaps we should be enabling
> large file support everywhere within gpgme instead of this patch?
I checked GPGME manual and the src,  LFS support is enabled by default

with Autoconf macro AC_SYS_LARGEFILE for both gpgme and lib32-gpgme.

This header is generated during build according current configure.

> The other patch (libffi) looks necessary but I'd much prefer if it diff
> -u.
I will refresh both patch with diff -u, thanks,
> Cheers,
>
> Richard
>

[PATCH V4] gpgme: fix multilib header conflict

[Changqing Li]

From: Changqing Li <changqing.li@windriver.com>

fix error:
file /usr/include/gpgme.h conflicts between attempted installs of gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32

--- usr/include/gpgme-32.h	2018-03-09 20:34:56.000000000 +0800
+++ usr/include/gpgme-64.h	2018-03-09 20:34:56.000000000 +0800
@@ -18,7 +18,7 @@
  * License along with this program; if not, see <https://gnu.org/licenses/>.
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * Generated from gpgme.h.in for i686-pokymllib32-linux-gnu.
+ * Generated from gpgme.h.in for x86_64-poky-linux-gnu.
  */

 #ifndef GPGME_H
@@ -106,12 +106,12 @@

 /* Check for a matching _FILE_OFFSET_BITS definition.  */
-#if 64
+#if 0
 #ifndef _FILE_OFFSET_BITS
-#error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
+#error GPGME was compiled with _FILE_OFFSET_BITS = 0, please see the section "Largefile support (LFS)" in the GPGME manual.
 #else
-#if (_FILE_OFFSET_BITS) != (64)
-#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 64, please see the section "Largefile support (LFS)" in the GPGME manual.
+#if (_FILE_OFFSET_BITS) != (0)
+#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 0, please see the section "Largefile support (LFS)" in the GPGME manual.
 #endif
 #endif
 #endif

LFS support is enabled by default, and this header is generated during
build according to current configure

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
index 9fc1ae24a4..b51534351d 100644
--- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
@@ -59,7 +59,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
                  --disable-lang-python-test \
 '
 
-inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT}
+inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header
 
 export PKG_CONFIG='pkg-config'
 
@@ -83,3 +83,7 @@ do_configure_prepend () {
 	rm -f ${S}/m4/libassuan.m4
 	rm -f ${S}/m4/python.m4
 }
+
+do_install_append() {
+       oe_multilib_header gpgme.h
+}
-- 
2.17.1

✗ patchtest: failure for gpgme: fix multilib header conflict (rev4)

[Patchwork]

== Series Details ==

Series: gpgme: fix multilib header conflict (rev4)
Revision: 4
URL   : https://patchwork.openembedded.org/series/25613/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 686b770af6)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe