Skip to contentSkip to conversation

libsquish: Define LIBDIR knob

PATCH In review Khem Raj 2 participants 3 messages Mar 20, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 libsquish: Define LIBDIR knob

this is to avoid assuming /lib for library path Enable compile with altivec when in machine features

---
 .../libsquish/0001-makefile-Add-LIBDIR.patch  | 36 +++++++++++++++++++
 .../libsquish/libsquish_git.bb                |  3 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch
meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch new file +36 -0
new file mode 100644
index 0000000000..c6eb7ac576
@@ -0,0 +1,36 @@
+From 4fd08c0446ca02917014b63f9080c4205958a130 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 20 Mar 2022 01:15:32 -0700
+Subject: [PATCH] makefile: Add LIBDIR
+
+Avoid hardcoding /lib
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1c01f89..2b1df5b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,12 +11,12 @@ all : $(LIB) squish.pc
+ 
+ install : $(LIB) squish.pc
+ 	install squish.h $(INSTALL_DIR)/include 
+-	install libsquish.a $(INSTALL_DIR)/lib
+-	install squish.pc $(INSTALL_DIR)/lib/pkgconfig
++	install libsquish.a $(INSTALL_DIR)/$(LIBDIR)
++	install squish.pc $(INSTALL_DIR)/$(LIBDIR)/pkgconfig
+ 
+ uninstall:
+ 	$(RM) $(INSTALL_DIR)/include/squish.h
+-	$(RM) $(INSTALL_DIR)/lib/libsquish.a
++	$(RM) $(INSTALL_DIR)/$(LIBDIR)/libsquish.a
+ 
+ $(LIB) : $(OBJ)
+ 	$(AR) cr $@ $?
+-- 
+2.35.1
+
meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb +2 -1
index cb42d943fc..b69d30d259 100644
@@ -10,7 +10,8 @@ SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix}"
+EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix} LIBDIR=${base_libdir} \
+                ${@bb.utils.contains('TUNE_FEATURES', 'altivec', 'USE_ALTIVEC=1', '', d)}"
 
 do_install() {
 	install -d ${D}${includedir}
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH 2/2 io-compress-lzma-perl,io-compress-perl: Do not mark allarch

These recipes are using target perl install during build so they can not be allarch, the issue becomes evident when libdir for target the native build hosts do not match e.g. ppc64 where target libdir is usr/lib64 then the do_configure starts to fail because it can not find Config_heavy-target.pl script which is part of tatget perl install and allarch recipes seems to assume libdir defaults to /usr/lib when accessing it.

I think it can be fixed by perhaps building the missing perl files into perl native perhaps.

Cc Hongxu Jia <[email protected]>
Cc Tim "moto-timo" Orling <[email protected]>
---
 meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb | 2 +-
 meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb +1 -1
index 9655176a86..3b8ce8d02d 100644
@@ -19,6 +19,6 @@ RDEPENDS:${PN} += "io-compress-perl"
 
 S = "${WORKDIR}/IO-Compress-Lzma-${PV}"
 
-inherit cpan allarch
+inherit cpan
 
 BBCLASSEXTEND = "native"
meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb +1 -1
index ccc78d0078..c00d8945b7 100644
@@ -19,6 +19,6 @@ RDEPENDS:${PN} += "compress-raw-zlib-perl"
 
 S = "${WORKDIR}/IO-Compress-${PV}"
 
-inherit cpan allarch
+inherit cpan
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.35.1
#2 lore raw

Re: [oe] [meta-perl][PATCH 2/2] io-compress-lzma-perl,io-compress-perl: Do not mark allarch

These should also be using Debian naming: libio-compress-lzma-perl.

Quoted 60 lines · Khem Raj

These recipes are using target perl install during build so they can not be allarch, the issue becomes evident when libdir for target the native build hosts do not match e.g. ppc64 where target libdir is usr/lib64 then the do_configure starts to fail because it can not find Config_heavy-target.pl script which is part of tatget perl install and allarch recipes seems to assume libdir defaults to /usr/lib when accessing it.

I think it can be fixed by perhaps building the missing perl files into perl native perhaps.

Cc Hongxu Jia <[email protected]>
Cc Tim "moto-timo" Orling <[email protected]>
---
 meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb | 2 +-
 meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb +1 -1
index 9655176a86..3b8ce8d02d 100644
@@ -19,6 +19,6 @@ RDEPENDS:${PN} += "io-compress-perl"
 
 S = "${WORKDIR}/IO-Compress-Lzma-${PV}"
 
-inherit cpan allarch
+inherit cpan
 
 BBCLASSEXTEND = "native"
meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb +1 -2
index ccc78d0078..c00d8945b7 100644
@@ -19,6 +19,6 @@ RDEPENDS:${PN} += "compress-raw-zlib-perl"
 
 S = "${WORKDIR}/IO-Compress-${PV}"
 
-inherit cpan allarch
+inherit cpan
 
 BBCLASSEXTEND = "native"
--

2.35.1

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