Skip to contentSkip to conversation

gpgme: fix multilib header conflict

PATCH Superseded Changqing Li 3 participants 7 messages Aug 14, 2020 – Aug 18, 2020 1 message not in the archive

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH v2 1/1 gpgme: fix multilib header conflict

From: Changqing Li <[email protected]>

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

---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-support/gpgme/gpgme_1.13.1.bb +5 -1
index 9fc1ae24a4..b51534351d 100644
@@ -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
+}
Signature · 1 line
2.17.1
#2 lore raw
Quoted 24 lines · Changqing Li

From: Changqing Li <[email protected]>

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

---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-support/gpgme/gpgme_1.13.1.bb +1 -1
index 9fc1ae24a4..b51534351d 100644
@@ -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'
 

meta/recipes-support/gpgme/gpgme_1.13.1.bb do_configure_prepend () { · line 89

Quoted 7 lines
meta/recipes-support/gpgme/gpgme_1.13.1.bb +4 -0
@@ -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

#3 lore raw

PATCH v3 1/1 gpgme: fix multilib header conflict

From: Changqing Li <[email protected]>

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.
---

Quoted 1 line

* Generated from gpgme.h.in for x86_64-poky-linux-gnu.

109c109
< #if 64
---

Quoted 1 line

#if 0

111c111
< #error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
---

Quoted 1 line

#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.
---

Quoted 2 lines

#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.

---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-support/gpgme/gpgme_1.13.1.bb +5 -1
index 9fc1ae24a4..b51534351d 100644
@@ -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
+}
Signature · 1 line
2.26.2
#4 lore raw
Quoted 19 lines · Changqing Li

From: Changqing Li <[email protected]>

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.
---

Quoted 1 line

* Generated from gpgme.h.in for x86_64-poky-linux-gnu.

109c109
< #if 64
---

Quoted 1 line

#if 0

111c111
< #error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
---

Quoted 12 lines
Quoted 2 lines

#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.
---

Quoted 4 lines

#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

#5 lore raw
Quoted 32 lines · Richard Purdie
Quoted 19 lines · Changqing Li

From: Changqing Li<[email protected]>

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.
---

Quoted 1 line

* Generated from gpgme.h.in for x86_64-poky-linux-gnu.

109c109
< #if 64
---

Quoted 1 line

#if 0

111c111
< #error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
---

Quoted 12 lines
Quoted 2 lines

#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.
---

Quoted 4 lines

#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.

Quoted 5 lines

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.

Quoted 2 lines

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

I will refresh both patch with diff -u, thanks,

Quoted 4 lines

Cheers,

Richard

#6 lore raw

PATCH v4 1/1 gpgme: fix multilib header conflict

In reply to Richard Purdie

From: Changqing Li <[email protected]>

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

include/gpgme-64.h renamed from include/gpgme-32.h +5 -5
@@ -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

---
 meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-support/gpgme/gpgme_1.13.1.bb +5 -1
index 9fc1ae24a4..b51534351d 100644
@@ -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
+}
Signature · 1 line
2.17.1
#7 lore raw

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

In reply to a message not in the archive

== 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 ([email protected]) 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