22.03.2016 13:31, Jiri B пишет:
>>>>> [...]
>>>>> CFLAGS=-ftrampolines -fno-stack-protector -fno-pie -nopie
>>>>>
>>>>> $ ls -l
>>>>> /home/jirib/openbsd/pobj/grub-2.02-beta3/fake-amd64/usr/local/lib/grub/i386-pc/lzma_decompress.im*
>>>>> -rwxr-xr-x 1 jirib wheel 3068 Mar 17 21:45
>>>>> /home/jirib/openbsd/pobj/grub-2.02-beta3/fake-amd64/usr/local/lib/grub/i386-pc/lzma_decompress.image*
>>>>> -rw-r--r-- 1 jirib wheel 2832 Mar 17 21:45
>>>>> /home/jirib/openbsd/pobj/grub-2.02-beta3/fake-amd64/usr/local/lib/grub/i386-pc/lzma_decompress.img
>>>>>
>>>>> [...]
>>>>>
>>
>> Good. Please test attached patch.
>>
>> [...]
>>
>> diff --git a/configure.ac b/configure.ac
>> index a85b134..57e1713 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1185,9 +1185,9 @@ CFLAGS="$TARGET_CFLAGS"
>> # Position independent executable.
>> grub_CHECK_PIE
>> [# Need that, because some distributions ship compilers that include
>> -# `-fPIE' in the default specs.
>> +# `-fPIE' or '-fpie' in the default specs.
>> if [ x"$pie_possible" = xyes ]; then
>> - TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
>> + TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
>> fi]
>>
>> CFLAGS="$TARGET_CFLAGS"
>
> Thx, builds find on OpenBSD.
>
OK, so we are left with -ipath. One possibility is something like
attached patch; another - to replace ipath with -path | grep -v. Latter
is probably more readable.
From: Andrei Borzenkov <arvidj...@gmail.com>
Subject: [PATCH] autogen.sh: avoid non-portable -ipath and -iname
OpenBSD 5.9 find does not have ipath, although it supports iname. For
consistency, also replace iname with suitable pattern.
Reported By: Jiri B <ji...@devio.us>
---
autogen.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 7537561..cd254d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,8 +8,9 @@ set -e
export LC_COLLATE=C
unset LC_ALL
-find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
-find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in
+# This avoids non-portable -iname and -ipath
+find . -name '*.[cC][hH]' ! -path './[gG][rR][uU][bB]-[cC][oO][rR][eE]/[lL][iI][bB]/[lL][iI][bB][gG][cC][rR][yY][pP][tT]-[gG][rR][uU][bB]/*' ! -path './[bB][uU][iI][lL][dD]-[aA][uU][xX]/*' ! -path './[gG][rR][uU][bB]-[cC][oO][rR][eE]/[lL][iI][bB]/[lL][iI][bB][gG][cC][rR][yY][pP][tT]/[sS][rR][cC]/[mM][iI][sS][cC].[cC]' ! -path './[gG][rR][uU][bB]-[cC][oO][rR][eE]/[lL][iI][bB]/[lL][iI][bB][gG][cC][rR][yY][pP][tT]/[sS][rR][cC]/[gG][lL][oO][bB][aA][lL].[cC]' ! -path './[gG][rR][uU][bB]-[cC][oO][rR][eE]/[lL][iI][bB]/[lL][iI][bB][gG][cC][rR][yY][pP][tT]/[sS][rR][cC]/[sS][eE][cC][mM][eE][mM].[cC]' ! -path './[uU][tT][iI][lL]/[gG][rR][uU][bB]-[gG][eE][nN]-[wW][iI][dD][tT][hH][sS][pP][eE][cC].[cC]' ! -path './[uU][tT][iI][lL]/[gG][rR][uU][bB]-[gG][eE][nN]-[aA][sS][cC][iI][iI][hH].[cC]' |sort > po/POTFILES.in
+find util -name '*.[iI][nN]' ! -name Makefile.in |sort > po/POTFILES-shell.in
echo "Importing unicode..."
${PYTHON} util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
--
tg: (f4d35d4..) u/autogen-find-ipath (depends on: master)
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
