From patchwork Wed Mar 18 01:20:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 1257124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::43d; helo=mail-pf1-x43d.google.com; envelope-from=swupdate+bncbctyrthe4edrbppoyxzqkgqefnqfuhq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=QMjo9Iz3; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Gv2392h7; dkim-atps=neutral Received: from mail-pf1-x43d.google.com (mail-pf1-x43d.google.com [IPv6:2607:f8b0:4864:20::43d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48hsfB0dPvz9sP7 for ; Wed, 18 Mar 2020 12:20:00 +1100 (AEDT) Received: by mail-pf1-x43d.google.com with SMTP id f75sf16986928pfa.13 for ; Tue, 17 Mar 2020 18:20:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1584494397; cv=pass; d=google.com; s=arc-20160816; b=MOgzkwI7iH+2xlagGJ1UJf7j6OHJlKOuuTge0dZRIGTN4UZ5oGIhFlkUZLnXVlxD6E soDOPqyzrAZ7maPUqSSQE/0RdWd2o+/Afj5ki1DkR0fzezNeH8ruzWmqji32QfuNg+ya ZpBa+ah8ai2CkH3Y0vY19B6cbZedHZv7ZASJ2BX5z0qccZSg5W7e1jiWwXtFWXOD6Cym G6JWkHrjADbZPw5gKujrb/4xYMNbkGJXul0BUbxRQ39bHF/95eMIB+1okXIzI/jSP+JB FLhx/bOGapXP4VFX6N8DfL01MpUBy7sAR4NzzJTiqABtELLuH9N7tU6SRO0bGPpDxr1f 1/pA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=MoaUGsUtg4K7Q6dag90KvIgUzy3RSxJDVXRPSYPXK30=; b=lnjOt3l6YkEoItdLMGYUOrMrzXcWaHilJhNd7VHqujiSxHFO96soWK949b5UatKyAu cEPWwh4NLjSRDqDnIVzC4Y5n0q+0kZUTyUMFoyljNxEaiA0NKMGgmYrgFGbH6I5Zfu14 0NF0rgaxd2we6s5VgsTF2uD5BcYrHhtG+ZEdavPeNHSizdkGad23thbVUbxwHsGsSnwp IWz0ATRlD5uQ0QjRrIIaaYXqOyyprqTvonso2GzT58oFPNz1J9450dm4BNeq1tXgXFES WALjbZpy4rwxf2MTRbJDWRIokS8g1rAopjdgIZ08GwMg8GEpCkvB1ryE/0s6rEZVI5Dt qnzQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="sOlVXtf/"; spf=pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::544 as permitted sender) smtp.mailfrom=raj.khem@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MoaUGsUtg4K7Q6dag90KvIgUzy3RSxJDVXRPSYPXK30=; b=QMjo9Iz3Ds+ZOKuDkXYlIj/OuXdKD5ztPblT1y3khVet9ie6l/NHFkD9HG/mgmPCAf YWSwj8O0DZREcZxzBaUffq4wXfNa7fLqmPxjNVw/7ZDZ7AlmocEXZLVRyZ3TSvjsHBYr +oi6/zz+GN6byjF5WKOXKwZEBoyxVxJwU1NSnanT7TajMtNHrFF/cLqwWD1EJTrVk+Ly ZGge/C3JNE/8GwJxhjKUGZw6bVlOYREMdnekbqVAynpfZUaquIDbNrzvP9qmGTRhs9ih oiUiA3AewUmCjvwCVQWZkBTgTb2K+qFHzgk5/367ew+d3R0etsT4euspynmpDJ9nb5B2 103g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=MoaUGsUtg4K7Q6dag90KvIgUzy3RSxJDVXRPSYPXK30=; b=Gv2392h7u0G1ejQeUjM0DaB7FVSUEpEpbzg9nJfIGlYf1ADfFgUpUdBglYh27Ornlr 96z/m+38035PJgbapfHCO2PGrEAvBCuE4im5OuX2rxgVp53pFT0EX3edt1qX9Ks2HKlL TlAb4NNpVUd84OGw4vED8YkdKf6DJ9LxVEGLbpXh7dzxQ/4VoE2gzY7AuE+f8oSRLljD su1e+kdS6Xi49Tt1FXDmgH3BKRBhHDo61NpSqvI0rHs2lEeYalgOUqrUEdHNctgsfedp nHzpZFED+tim6q4y3tr8rXUqv5hXKXD2G2utpY4DE7qwmtJ55uYeQRZPcran+X+lLKyw F0Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=MoaUGsUtg4K7Q6dag90KvIgUzy3RSxJDVXRPSYPXK30=; b=cb+tnr3ZCXO5JrXxPCSb2BvIkryIKe2AEZ09wiAfDFdpXVpNTIQva+8lMapgH20JAO WalqUgq4KnwiVMM+JKCp5Guslco+QqNGM2hEv63udlwE2tARMGR3aIdMArU5pGfkP6PG T75qcSqfLzGlWp7KdDySuRCDSSk77VR1rV2aC7qSZVtNSWzx7DnKqfk4y8AGEVEXidCz j5SIH2hrjjuFLTI8ot6y+aSj1ekljZaYuXuLaZPPmffwKyc/1QBBxB8uT6f1IRozbAFU +yURE08KeLcyguHp0KobpCZ8ksgP6DY2Q9Au5CDkWtqJK+C42wxVaQ0dl2MG2cuiDnVv EqEQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: ANhLgQ3V19iEkQN30n5E2l7kK77XRcLyCQuliDykhVIsh/MgUbFxKwI4 BC6vz5HKnyHmB6bBTYMdRKg= X-Google-Smtp-Source: ADFU+vv1GZ7kOY/gXaxD/g4xHPLc9SZwKfEthj+7zXm7UvF7FtBh61CriAGqCxfEC2tF87IBf9qfcQ== X-Received: by 2002:a62:2ad0:: with SMTP id q199mr1766366pfq.48.1584494397430; Tue, 17 Mar 2020 18:19:57 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:902:b203:: with SMTP id t3ls5303820plr.1.gmail; Tue, 17 Mar 2020 18:19:56 -0700 (PDT) X-Received: by 2002:a17:90a:d081:: with SMTP id k1mr2135905pju.57.1584494396640; Tue, 17 Mar 2020 18:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584494396; cv=none; d=google.com; s=arc-20160816; b=bqLzCyXpsRMyysHjSbabrUqACg9s2eOgylvQ7i2dE9u65VKCv3BsnlqccPh8yY4wKb gYHukTF86JdHJ5/yZb3qRn7d0Sco5SMn4h3eM14+4n/OzxlvdapjeqCJDlLexOKfPYpY +n3ALVXrg2hVn3zfpmkvSoPC+TAhiBnSP7dUo3yrX/1SsPevqILD5bJHy5HuHSJVhip6 5Qr7QY6PoZpF/pKvEbB7TjJROem2+mFjiOaFRBiPtEYN/4HjPthhhhhbyOBFdfCmMI5c W1QvJFLgDXBQF6YlvJuHEtKXNsnd+KT2nrIX7IEqtuygFW4DVXjASwPcnAh4eNYfpZkh /MUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=la2iyr/uHUQHHBxLhIBYWQy8dQQ5rZvPebNcvZp7DmA=; b=AieOiFcKt97kCkR3J5p2ccKNqImTolvGQ4TtAcR9VsHZYoYz1YUuSQ7vgZX2i0dih7 enlWZVooc1eTJBNHC1pXGcz6K5s4GieLPlLlkvoysOEWn04pq9vPQ1ClJykWOQb2wtND h070ruEmgtYEtygb1dd1iH4+cy3EfKRHQ5h6NOcaH0594ea+DiXIzri2udjJnu8Sy/XV RRL/pEenbmTUAFBE5qBUWqpChASfLRoqNM1vd9cZLrGyD8Du+qg/PnAxmortnUsQPiWH 5oVCy9EMSbLpwyoEu77BCo0yg5pbJ4rwMvWIudlHOpF8YK+pSgkGLNJ9ccooCF0G7m6m iZSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="sOlVXtf/"; spf=pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::544 as permitted sender) smtp.mailfrom=raj.khem@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com. [2607:f8b0:4864:20::544]) by gmr-mx.google.com with ESMTPS id j14si259618pgg.1.2020.03.17.18.19.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Mar 2020 18:19:56 -0700 (PDT) Received-SPF: pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::544 as permitted sender) client-ip=2607:f8b0:4864:20::544; Received: by mail-pg1-x544.google.com with SMTP id u12so12710816pgb.10 for ; Tue, 17 Mar 2020 18:19:56 -0700 (PDT) X-Received: by 2002:a63:4c66:: with SMTP id m38mr2061475pgl.313.1584494395788; Tue, 17 Mar 2020 18:19:55 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::593]) by smtp.gmail.com with ESMTPSA id j17sm4329455pfd.175.2020.03.17.18.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 18:19:55 -0700 (PDT) From: Khem Raj To: swupdate@googlegroups.com Cc: Khem Raj Subject: [swupdate] [meta-swupdate][PATCH] luasocket: Fix multilib build Date: Tue, 17 Mar 2020 18:20:08 -0700 Message-Id: <20200318012008.3579021-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: raj.khem@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="sOlVXtf/"; spf=pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::544 as permitted sender) smtp.mailfrom=raj.khem@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Define BASELIB Signed-off-by: Khem Raj --- .../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 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