From: "Alexander Stohr" <Alexander.Stohr@gmx.de>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [patch] fix for building freetype-native on a symlinked build environment
Date: Thu, 07 Oct 2010 17:27:55 +0200 [thread overview]
Message-ID: <20101007152755.298000@gmx.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
patchyfied for 2.2.1, 2.3.6 and 2.3.12 including recipes changes
see attachment
--
GMX DSL Doppel-Flat ab 19,99 €/mtl.! Jetzt auch mit
gratis Notebook-Flat! http://portal.gmx.net/de/go/dsl
[-- Attachment #2: oe-ft-configure-using-inodes.patch --]
[-- Type: text/x-patch, Size: 6528 bytes --]
diff -Nur openembedded.orig/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch openembedded/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch
--- openembedded.orig/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch 1970-01-01 01:00:00.000000000 +0100
+++ openembedded/recipes/freetype/freetype-2.2.1/configure-using-inodes.patch 2010-10-07 17:01:08.000000000 +0200
@@ -0,0 +1,30 @@
+http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=75eeb32a2e55ffb3e4102ee56cd913a442d1ac9a
+
+author Werner Lemberg <wl@gnu.org> 2010-10-03 18:17:27 (GMT)
+
+Avoid `configure' issues with symbolic links.
+Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
+* configure: Compare directories using `ls -id'.
+Check existence of `reference' subdirectory before creating it.
+
+--- freetype.orig/configure 2010-10-07 16:46:51.000000000 +0200
++++ freetype/configure 2010-10-07 16:49:52.000000000 +0200
+@@ -67,10 +67,15 @@
+ abs_curr_dir=`pwd`
+ abs_ft2_dir=`cd "$ft2_dir" && pwd`
+
+-# build a dummy Makefile if we are not building in the source tree
++# build a dummy Makefile if we are not building in the source tree;
++# we use inodes to avoid issues with symbolic links
++inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
++inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
+
+-if test "$abs_curr_dir" != "$abs_ft2_dir"; then
+- mkdir reference
++if test $inode_src -ne $inode_dst; then
++ if test ! -d reference; then
++ mkdir reference
++ fi
+ echo "Copying \`modules.cfg'"
+ cp $abs_ft2_dir/modules.cfg $abs_curr_dir
+ echo "Generating \`Makefile'"
diff -Nur openembedded.orig/recipes/freetype/freetype_2.2.1.bb openembedded/recipes/freetype/freetype_2.2.1.bb
--- openembedded.orig/recipes/freetype/freetype_2.2.1.bb 2010-10-07 16:30:39.000000000 +0200
+++ openembedded/recipes/freetype/freetype_2.2.1.bb 2010-10-07 17:03:00.000000000 +0200
@@ -5,7 +5,8 @@
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
file://configure.patch \
- file://no-hardcode.patch"
+ file://no-hardcode.patch \
+ file://configure-using-inodes.patch"
S = "${WORKDIR}/freetype-${PV}"
inherit autotools pkgconfig binconfig
diff -Nur openembedded.orig/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch openembedded/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch
--- openembedded.orig/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch 1970-01-01 01:00:00.000000000 +0100
+++ openembedded/recipes/freetype/freetype-2.3.12/configure-using-inodes.patch 2010-10-07 17:11:05.000000000 +0200
@@ -0,0 +1,30 @@
+http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=75eeb32a2e55ffb3e4102ee56cd913a442d1ac9a
+
+author Werner Lemberg <wl@gnu.org> 2010-10-03 18:17:27 (GMT)
+
+Avoid `configure' issues with symbolic links.
+Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
+* configure: Compare directories using `ls -id'.
+Check existence of `reference' subdirectory before creating it.
+
+--- freetype.orig/configure 2010-10-07 16:46:51.000000000 +0200
++++ freetype/configure 2010-10-07 16:49:52.000000000 +0200
+@@ -78,10 +78,15 @@
+ done
+ fi
+
+-# build a dummy Makefile if we are not building in the source tree
++# build a dummy Makefile if we are not building in the source tree;
++# we use inodes to avoid issues with symbolic links
++inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
++inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
+
+-if test "$abs_curr_dir" != "$abs_ft2_dir"; then
+- mkdir reference
++if test $inode_src -ne $inode_dst; then
++ if test ! -d reference; then
++ mkdir reference
++ fi
+ if test ! -r $abs_curr_dir/modules.cfg; then
+ echo "Copying \`modules.cfg'"
+ cp $abs_ft2_dir/modules.cfg $abs_curr_dir
diff -Nur openembedded.orig/recipes/freetype/freetype_2.3.12.bb openembedded/recipes/freetype/freetype_2.3.12.bb
--- openembedded.orig/recipes/freetype/freetype_2.3.12.bb 2010-10-07 16:30:10.000000000 +0200
+++ openembedded/recipes/freetype/freetype_2.3.12.bb 2010-10-07 17:03:24.000000000 +0200
@@ -9,6 +9,7 @@
file://no-hardcode.patch \
file://fix-configure.patch \
file://libtool-tag.patch \
+ file://configure-using-inodes.patch \
"
S = "${WORKDIR}/freetype-${PV}"
diff -Nur openembedded.orig/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch openembedded/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch
--- openembedded.orig/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch 1970-01-01 01:00:00.000000000 +0100
+++ openembedded/recipes/freetype/freetype-2.3.6/configure-using-inodes.patch 2010-10-07 17:05:13.000000000 +0200
@@ -0,0 +1,30 @@
+http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=75eeb32a2e55ffb3e4102ee56cd913a442d1ac9a
+
+author Werner Lemberg <wl@gnu.org> 2010-10-03 18:17:27 (GMT)
+
+Avoid `configure' issues with symbolic links.
+Based on a patch from Alexander Stohr <Alexander.Stohr@gmx.de>.
+* configure: Compare directories using `ls -id'.
+Check existence of `reference' subdirectory before creating it.
+
+--- freetype.orig/configure 2010-10-07 16:46:51.000000000 +0200
++++ freetype/configure 2010-10-07 16:49:52.000000000 +0200
+@@ -67,10 +67,15 @@
+ abs_curr_dir=`pwd`
+ abs_ft2_dir=`cd "$ft2_dir" && pwd`
+
+-# build a dummy Makefile if we are not building in the source tree
++# build a dummy Makefile if we are not building in the source tree;
++# we use inodes to avoid issues with symbolic links
++inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'`
++inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'`
+
+-if test "$abs_curr_dir" != "$abs_ft2_dir"; then
+- mkdir reference
++if test $inode_src -ne $inode_dst; then
++ if test ! -d reference; then
++ mkdir reference
++ fi
+ echo "Copying \`modules.cfg'"
+ cp $abs_ft2_dir/modules.cfg $abs_curr_dir
+ echo "Generating \`Makefile'"
diff -Nur openembedded.orig/recipes/freetype/freetype_2.3.6.bb openembedded/recipes/freetype/freetype_2.3.6.bb
--- openembedded.orig/recipes/freetype/freetype_2.3.6.bb 2010-10-07 16:30:26.000000000 +0200
+++ openembedded/recipes/freetype/freetype_2.3.6.bb 2010-10-07 17:03:41.000000000 +0200
@@ -8,6 +8,7 @@
file://no-hardcode.patch \
file://fix-configure.patch \
file://libtool-tag.patch \
+ file://configure-using-inodes.patch \
"
S = "${WORKDIR}/freetype-${PV}"
next reply other threads:[~2010-10-07 15:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 15:27 Alexander Stohr [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-10-05 17:08 [patch] fix for building freetype-native on a symlinked build environment Alexander Stohr
2010-09-30 12:30 Alexander Stohr
2010-10-06 21:25 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101007152755.298000@gmx.net \
--to=alexander.stohr@gmx.de \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox