Skip to contentSkip to conversation

nghttp2: fix for multilib support

PATCH Superseded [email protected] 2 participants 4 messages Jan 13, 2022 – Jan 24, 2022 1 message not in the archive

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nghttp2: fix for multilib support

From: Changqing Li <[email protected]>

correct the package name

---
 meta/recipes-support/nghttp2/nghttp2_1.46.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +2 -2
index 972ff2d60a..a5f0be856f 100644
@@ -19,7 +19,7 @@ PACKAGECONFIG[manpages] = ""
 # first place
 EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF"
 
-PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
+PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"
 
 RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})"
 RDEPENDS:${PN}:class-native = ""
@@ -27,7 +27,7 @@ RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell"
 
 ALLOW_EMPTY:${PN} = "1"
 FILES:${PN} = ""
-FILES:lib${PN} = "${libdir}/*${SOLIBS}"
+FILES:${MLPREFIX}lib${BPN} = "${libdir}/*${SOLIBS}"
 FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
 FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
 FILES:${PN}-server = "${bindir}/nghttpd"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 23 lines · Changqing Li

From: Changqing Li <[email protected]>

correct the package name

---
 meta/recipes-support/nghttp2/nghttp2_1.46.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +1 -1
index 972ff2d60a..a5f0be856f 100644
@@ -19,7 +19,7 @@ PACKAGECONFIG[manpages] = ""
 # first place
 EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF"
 
-PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
+PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"
 
 RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})"
 RDEPENDS:${PN}:class-native = ""

meta/recipes-support/nghttp2/nghttp2_1.46.0.bb RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" · line 33

Quoted 8 lines
meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +1 -1
@@ -27,7 +27,7 @@ RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell"
 
 ALLOW_EMPTY:${PN} = "1"
 FILES:${PN} = ""
-FILES:lib${PN} = "${libdir}/*${SOLIBS}"
+FILES:${MLPREFIX}lib${BPN} = "${libdir}/*${SOLIBS}"
 FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
 FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
 FILES:${PN}-server = "${bindir}/nghttpd"

This doesn't look correct, particularly using with MLPREFIX in one location and not in the other...

Cheers,

Richard

#2 lore raw
Quoted 27 lines · Richard Purdie

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 24 lines · Changqing Li

From: Changqing Li <[email protected]>

correct the package name

---
  meta/recipes-support/nghttp2/nghttp2_1.46.0.bb | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +1 -1
index 972ff2d60a..a5f0be856f 100644
@@ -19,7 +19,7 @@ PACKAGECONFIG[manpages] = ""
  # first place
  EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF"
 
-PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
+PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"
 
  RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})"
  RDEPENDS:${PN}:class-native = ""
@@ -27,7 +27,7 @@ RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell"
 
Quoted 9 lines

meta/recipes-support/nghttp2/nghttp2_1.46.0.bb RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" · line 33

Quoted 7 lines
meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +1 -1
  ALLOW_EMPTY:${PN} = "1"
  FILES:${PN} = ""
-FILES:lib${PN} = "${libdir}/*${SOLIBS}"
+FILES:${MLPREFIX}lib${BPN} = "${libdir}/*${SOLIBS}"
  FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
  FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
  FILES:${PN}-server = "${bindir}/nghttpd"

This doesn't look correct, particularly using with MLPREFIX in one location and not in the other...

PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"

the first package lib${PN} is not correct. when enable multilib,
for lib64, ${PN} is nghttp2, lib${PN}=libnghttp2,
for lib32, ${PN} is lib32-nghttp2, lib${PN}=liblib32-nghttp2, but I think it should be lib32-libnghttp2. so change it to lib${BPN}.

for PACKAGES, it will be extend by classextended.py
# prepend /buildarea3/cli10/yocto/poky/meta/recipes-support/nghttp2/nghttp2_1.46.0.bb:22
# "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"
# rename (to) classextend.py:127 [rename_packages]
# "PACKAGES_NONML"
# set classextend.py:128 [rename_packages]
# "${@oe.classextend.get_packages(d)}"

# pre-expansion value:
#   "${@oe.classextend.get_packages(d)}"
PACKAGES="lib32-libnghttp2 lib32-nghttp2-client lib32-nghttp2-proxy lib32-nghttp2-server lib32-nghttp2-src lib32-nghttp2-dbg lib32-nghttp2-staticdev lib32-nghttp2-dev lib32-nghttp2-doc lib32-nghttp2-locale lib32-nghttp2"

for FILES, other packages start with ${PN} aleady extened with lib32-, so don't need MLPREFIX. but lib${BPN} need to add it manually.

Quoted 5 lines

Cheers,

Richard

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

#4 lore raw
Quoted 55 lines · Changqing Li
Quoted 29 lines · Richard Purdie

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 26 lines · Changqing Li

From: Changqing Li <[email protected]>

correct the package name

---
  meta/recipes-support/nghttp2/nghttp2_1.46.0.bb | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +0 -0
index 972ff2d60a..a5f0be856f 100644
@@ -19,7 +19,7 @@ PACKAGECONFIG[manpages] = ""
   # first place

  EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF

meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +1 -2
-DENABLE_HPACK_TOOLS=OFF"
 
-PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
+PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"

  RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" RDEPENDS:${PN}:class-native = ""

meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +0 -0
@@ -27,7 +27,7 @@ RDEPENDS:${PN}-proxy = "openssl python3-core 

python3-io python3-shell"

Quoted 9 lines
Quoted 7 lines

  ALLOW_EMPTY:${PN} = "1"
  FILES:${PN} = ""

meta/recipes-support/nghttp2/nghttp2_1.46.0.bb +1 -1
-FILES:lib${PN} = "${libdir}/*${SOLIBS}"
+FILES:${MLPREFIX}lib${BPN} = "${libdir}/*${SOLIBS}"

  FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp" FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" FILES:${PN}-server = "${bindir}/nghttpd"

This doesn't look correct, particularly using with MLPREFIX in one location and not in the other...

PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"

the first package lib${PN}  is not correct. when enable multilib, for lib64, ${PN} is nghttp2,       lib${PN}=libnghttp2, for lib32, ${PN} is lib32-nghttp2, lib${PN}=liblib32-nghttp2, but I think it should be lib32-libnghttp2. so change it to lib${BPN}.

for PACKAGES, it will be extend by classextended.py
#   prepend /yocto/poky/meta/recipes-support/nghttp2/nghttp2_1.46.0.bb:22 #     "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"
#   rename (to) classextend.py:127 [rename_packages]
#     "PACKAGES_NONML"
#   set classextend.py:128 [rename_packages]
#     "${@oe.classextend.get_packages(d)}"

Quoted 5 lines
# pre-expansion value:
#   "${@oe.classextend.get_packages(d)}"
PACKAGES="lib32-libnghttp2 lib32-nghttp2-client lib32-nghttp2-proxy lib32-nghttp2-server lib32-nghttp2-src lib32-nghttp2-dbg lib32-nghttp2-staticdev lib32-nghttp2-dev lib32-nghttp2-doc lib32-nghttp2-locale lib32-nghttp2"

for FILES, other packages start with ${PN} aleady extened with lib32-,  so don't need MLPREFIX. but lib${BPN} need to add it manually.

ping

Quoted 15 lines
Quoted 6 lines

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160638): https://lists.openembedded.org/g/openembedded-core/message/160638
Mute This Topic: https://lists.openembedded.org/mt/88390547/3616873
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-