| Message ID | 20200318012008.3579021-1-raj.khem@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-swupdate] luasocket: Fix multilib build | expand |
On 18.03.20 02:20, Khem Raj wrote: > Define BASELIB > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../luasocket/files/0001-fix-for-OE.patch | 18 ++++++++++++------ > recipes-lua/luasocket/luasocket_git.bb | 2 +- > 2 files changed, 13 insertions(+), 7 deletions(-) > > diff --git a/recipes-lua/luasocket/files/0001-fix-for-OE.patch b/recipes-lua/luasocket/files/0001-fix-for-OE.patch > index 051b503..f9840a8 100644 > --- a/recipes-lua/luasocket/files/0001-fix-for-OE.patch > +++ b/recipes-lua/luasocket/files/0001-fix-for-OE.patch > @@ -8,11 +8,9 @@ Signed-off-by: Kas User <kas@example.com> > makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > -diff --git a/makefile b/makefile > -index cc15b4e..632fb73 100644 > --- a/makefile > +++ b/makefile > -@@ -14,8 +14,10 @@ PLATS= macosx linux win32 mingw freebsd solaris > +@@ -14,8 +14,10 @@ PLATS= macosx linux win32 mingw freebsd > > all: $(PLAT) > > @@ -24,6 +22,14 @@ index cc15b4e..632fb73 100644 > > print: > $(MAKE) -C src $@ > --- > -2.7.4 > - > +--- a/src/makefile > ++++ b/src/makefile > +@@ -50,7 +50,7 @@ LDIR_macosx?=share/lua/$(LUAV) > + LUAINC_linux_base?=/usr/include > + LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUAV) > + LUAPREFIX_linux?=/usr/local > +-CDIR_linux?=lib/lua/$(LUAV) > ++CDIR_linux?=$(BASELIB)/lua/$(LUAV) > + LDIR_linux?=share/lua/$(LUAV) > + > + # LUAINC_freebsd: > diff --git a/recipes-lua/luasocket/luasocket_git.bb b/recipes-lua/luasocket/luasocket_git.bb > index ad8d5eb..d073828 100644 > --- a/recipes-lua/luasocket/luasocket_git.bb > +++ b/recipes-lua/luasocket/luasocket_git.bb > @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" > > FILES_${PN} = "${libdir} ${datadir}/lua" > > -EXTRA_OEMAKE = 'DESTDIR=${D} PREFIX=/usr CC="${CC}" LD="${CC}" MYLDFLAGS="${LDFLAGS}"' > +EXTRA_OEMAKE = 'DESTDIR=${D} BASELIB=${base_libdir} PREFIX=/usr CC="${CC}" LD="${CC}" MYLDFLAGS="${LDFLAGS}"' > > inherit pkgconfig > > Applied to -master, thanks ! Best regards, Stefano Babic
diff --git a/recipes-lua/luasocket/files/0001-fix-for-OE.patch b/recipes-lua/luasocket/files/0001-fix-for-OE.patch index 051b503..f9840a8 100644 --- a/recipes-lua/luasocket/files/0001-fix-for-OE.patch +++ b/recipes-lua/luasocket/files/0001-fix-for-OE.patch @@ -8,11 +8,9 @@ Signed-off-by: Kas User <kas@example.com> makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/makefile b/makefile -index cc15b4e..632fb73 100644 --- a/makefile +++ b/makefile -@@ -14,8 +14,10 @@ PLATS= macosx linux win32 mingw freebsd solaris +@@ -14,8 +14,10 @@ PLATS= macosx linux win32 mingw freebsd all: $(PLAT) @@ -24,6 +22,14 @@ index cc15b4e..632fb73 100644 print: $(MAKE) -C src $@ --- -2.7.4 - +--- a/src/makefile ++++ b/src/makefile +@@ -50,7 +50,7 @@ LDIR_macosx?=share/lua/$(LUAV) + LUAINC_linux_base?=/usr/include + LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUAV) + LUAPREFIX_linux?=/usr/local +-CDIR_linux?=lib/lua/$(LUAV) ++CDIR_linux?=$(BASELIB)/lua/$(LUAV) + LDIR_linux?=share/lua/$(LUAV) + + # LUAINC_freebsd: diff --git a/recipes-lua/luasocket/luasocket_git.bb b/recipes-lua/luasocket/luasocket_git.bb index ad8d5eb..d073828 100644 --- a/recipes-lua/luasocket/luasocket_git.bb +++ b/recipes-lua/luasocket/luasocket_git.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" FILES_${PN} = "${libdir} ${datadir}/lua" -EXTRA_OEMAKE = 'DESTDIR=${D} PREFIX=/usr CC="${CC}" LD="${CC}" MYLDFLAGS="${LDFLAGS}"' +EXTRA_OEMAKE = 'DESTDIR=${D} BASELIB=${base_libdir} PREFIX=/usr CC="${CC}" LD="${CC}" MYLDFLAGS="${LDFLAGS}"' inherit pkgconfig
Define BASELIB Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../luasocket/files/0001-fix-for-OE.patch | 18 ++++++++++++------ recipes-lua/luasocket/luasocket_git.bb | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-)