From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id A00716DF9C for ; Thu, 5 Dec 2013 22:41:34 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 05 Dec 2013 14:41:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,836,1378882800"; d="scan'208";a="439374315" Received: from jbrandeb-mobl.amr.corp.intel.com (HELO [10.255.15.213]) ([10.255.15.213]) by fmsmga001.fm.intel.com with ESMTP; 05 Dec 2013 14:41:30 -0800 Message-ID: <52A1011A.8080809@linux.intel.com> Date: Thu, 05 Dec 2013 14:41:30 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Qi.Chen@windriver.com, openembedded-core@lists.openembedded.org References: In-Reply-To: Subject: Re: [PATCH 1/1] libgcrypt: fix compile error with '-O2' in sysroot path X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 22:41:34 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 12/05/2013 12:55 AM, Qi.Chen@windriver.com wrote: > From: Chen Qi > > Characters like '-O2' or '-Ofast' will be replaced by '-O1' when > compiling cipher. If we are cross compiling libgcrypt and sysroot > contains such characters, we would get compile errors because the > sysroot path has been modified. > > Fix this by adding whitespaces before and after the original matching > pattern in the sed command. > > [YOCTO #5628] > > Signed-off-by: Chen Qi > --- > ...fix-compile-error-with-O2-in-sysroot-path.patch | 46 ++++++++++++++++++++ > meta/recipes-support/libgcrypt/libgcrypt.inc | 3 +- > 2 files changed, 48 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch > > diff --git a/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch > new file mode 100644 > index 0000000..6b1f119 > --- /dev/null > +++ b/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch > @@ -0,0 +1,46 @@ > +Upstream-Status: Pending > + > +libgcrypt: fix building error with '-O2' in sysroot path > + > +Characters like '-O2' or '-Ofast' will be replaced by '-O1' when compiling cipher. > +If we are cross compiling libgcrypt and sysroot contains such characters, we would > +get compile errors because the sysroot path has been modified. > + > +Fix this by adding blank spaces before and after the original matching pattern in the > +sed command. > + > +Signed-off-by: Chen Qi > +--- > + cipher/Makefile.am | 2 +- > + cipher/Makefile.in | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/cipher/Makefile.am b/cipher/Makefile.am > +index 76cdc96..9a89792 100644 > +--- a/cipher/Makefile.am > ++++ b/cipher/Makefile.am > +@@ -69,7 +69,7 @@ rfc2268.c \ > + camellia.c camellia.h camellia-glue.c > + > + if ENABLE_O_FLAG_MUNGING > +-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' > ++o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' > + else > + o_flag_munging = cat > + endif > +diff --git a/cipher/Makefile.in b/cipher/Makefile.in > +index 1394d15..6080d59 100644 > +--- a/cipher/Makefile.in > ++++ b/cipher/Makefile.in Why do we need to patch Makefile.in if we are already patching the Makefile.am which will re-generate the Makefile.in Sau! > +@@ -314,7 +314,7 @@ rfc2268.c \ > + camellia.c camellia.h camellia-glue.c > + > + @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat > +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' > ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' > + all: all-am > + > + .SUFFIXES: > +-- > +1.7.9.5 > + > diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc > index e0dfec2..9383e17 100644 > --- a/meta/recipes-support/libgcrypt/libgcrypt.inc > +++ b/meta/recipes-support/libgcrypt/libgcrypt.inc > @@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > DEPENDS = "libgpg-error libcap" > > SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ > - file://add-pkgconfig-support.patch" > + file://add-pkgconfig-support.patch \ > + file://fix-compile-error-with-O2-in-sysroot-path.patch" > > inherit autotools binconfig pkgconfig > >