Message ID | 1679451626-10625-1-git-send-email-wangmy@fujitsu.com |
---|---|
State | Accepted, archived |
Commit | 4876189dd2ae5a04a296b11b537b9f613159c6bf |
Headers | show |
Series | [V3] xcb-proto: Fix install conflict when enable multilib. | expand |
On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote: > +Subject: [PATCH] Fix install conflict when enable multilib. > + > +Upstream-Status: Pending Please send this upstream first: https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests There should also be a better commit message, something like "install .pc file to $libdir, as it refers to it. This is needed in particular for systems with multiple sets of libraries (i.e. 32/64 bit). " Alex
In xcb-proto's commit history, the previous commit changed libdir to datarootdir. So maybe it's not appropriate for me to directly change it back. I'am discussing this issue with the community. https://lists.freedesktop.org/archives/xcb/2023-March/011429.html -- Best Regards --------------------------------------------------- Wang Mingyu Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wangmy@fujitsu.com http://www.fujitsu.com/cn/fnst/ > -----Original Message----- > From: openembedded-core@lists.openembedded.org > <openembedded-core@lists.openembedded.org> On Behalf Of Alexander > Kanavin > Sent: Wednesday, March 22, 2023 2:18 PM > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com> > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable > multilib. > > On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote: > > +Subject: [PATCH] Fix install conflict when enable multilib. > > + > > +Upstream-Status: Pending > > Please send this upstream first: > https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests > > There should also be a better commit message, something like "install .pc file to > $libdir, as it refers to it. > > This is needed in particular for systems with multiple sets of libraries (i.e. 32/64 > bit). > " > > Alex
I would suggest you open a pull request anyway, it just needs a clear explanation why xcb-proto is in fact arch-specific (because it builds and installs python bindings). Alex On Wed, 22 Mar 2023 at 08:52, wangmy@fujitsu.com <wangmy@fujitsu.com> wrote: > > In xcb-proto's commit history, the previous commit changed libdir to datarootdir. > > So maybe it's not appropriate for me to directly change it back. > > I'am discussing this issue with the community. > https://lists.freedesktop.org/archives/xcb/2023-March/011429.html > -- > Best Regards > --------------------------------------------------- > Wang Mingyu > Development Dept.I > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China > TEL: +86+25-86630566-8568 > COINS: 79988548 > FAX: +86+25-83317685 > MAIL: wangmy@fujitsu.com > http://www.fujitsu.com/cn/fnst/ > > > -----Original Message----- > > From: openembedded-core@lists.openembedded.org > > <openembedded-core@lists.openembedded.org> On Behalf Of Alexander > > Kanavin > > Sent: Wednesday, March 22, 2023 2:18 PM > > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com> > > Cc: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable > > multilib. > > > > On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote: > > > +Subject: [PATCH] Fix install conflict when enable multilib. > > > + > > > +Upstream-Status: Pending > > > > Please send this upstream first: > > https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests > > > > There should also be a better commit message, something like "install .pc file to > > $libdir, as it refers to it. > > > > This is needed in particular for systems with multiple sets of libraries (i.e. 32/64 > > bit). > > " > > > > Alex
Ok, I checked what is going on. We patch automake to define pythondir in terms of libdir (rather than hardcode 'lib' or query it from python as automake upstream does): https://git.yoctoproject.org/poky/tree/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch This means that anywhere where pythondir is defined, libdir needs to be defined as well, and the whole thing should not be installed into libdir and not datadir. And therefore any patches to make this happen are Upstream-Status: Inappropriate, and you do not need to send them upstream :-) So please resubmit here taking this explanation into the commit message, and maybe notify upstream that they shouldn't worry about it. Alex On Wed, 22 Mar 2023 at 08:55, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > > I would suggest you open a pull request anyway, it just needs a clear > explanation why xcb-proto is in fact arch-specific (because it builds > and installs python bindings). > > Alex > > On Wed, 22 Mar 2023 at 08:52, wangmy@fujitsu.com <wangmy@fujitsu.com> wrote: > > > > In xcb-proto's commit history, the previous commit changed libdir to datarootdir. > > > > So maybe it's not appropriate for me to directly change it back. > > > > I'am discussing this issue with the community. > > https://lists.freedesktop.org/archives/xcb/2023-March/011429.html > > -- > > Best Regards > > --------------------------------------------------- > > Wang Mingyu > > Development Dept.I > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China > > TEL: +86+25-86630566-8568 > > COINS: 79988548 > > FAX: +86+25-83317685 > > MAIL: wangmy@fujitsu.com > > http://www.fujitsu.com/cn/fnst/ > > > > > -----Original Message----- > > > From: openembedded-core@lists.openembedded.org > > > <openembedded-core@lists.openembedded.org> On Behalf Of Alexander > > > Kanavin > > > Sent: Wednesday, March 22, 2023 2:18 PM > > > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com> > > > Cc: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable > > > multilib. > > > > > > On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote: > > > > +Subject: [PATCH] Fix install conflict when enable multilib. > > > > + > > > > +Upstream-Status: Pending > > > > > > Please send this upstream first: > > > https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests > > > > > > There should also be a better commit message, something like "install .pc file to > > > $libdir, as it refers to it. > > > > > > This is needed in particular for systems with multiple sets of libraries (i.e. 32/64 > > > bit). > > > " > > > > > > Alex > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#178919): https://lists.openembedded.org/g/openembedded-core/message/178919 > Mute This Topic: https://lists.openembedded.org/mt/97770319/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch new file mode 100644 index 0000000000..c263a22792 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch @@ -0,0 +1,27 @@ +From fc28149b6b198042c8d29e0931415adad7ed3231 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Thu, 16 Mar 2023 08:03:47 +0000 +Subject: [PATCH] Fix install conflict when enable multilib. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 8b57a83..580f5bc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS = src xcbgen + +-pkgconfigdir = $(datarootdir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xcb-proto.pc + + EXTRA_DIST=doc xcb-proto.pc.in autogen.sh README.md +-- +2.34.1 + diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb index 4e4472a9c1..e60e7958a7 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \ file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ + file://0001-Fix-install-conflict-when-enable-multilib.patch \ " SRC_URI[sha256sum] = "7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed"