Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 7e2af4de19be58bc9d551c41ce2750396d357f34 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 27 Nov 2018 13:25:15 +0800 |
| 4 | Subject: [PATCH] PATCH] not check libperl under cross compiling |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | |
| 8 | libperl ldflags returned by PGAC_CHECK_PERL_EMBED_LDFLAGS are native, |
| 9 | can not be used to check target library. |
| 10 | |
| 11 | postpresql has the dependency on perl, so not need to check libperl |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 12 | again, like in postgresql-9.2.4 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 13 | |
| 14 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 15 | |
| 16 | update patch to version 11.1 |
| 17 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | --- |
| 19 | configure.in | 2 +- |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 21 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | diff --git a/configure.in b/configure.in |
| 23 | index b98b9bb..8584677 100644 |
| 24 | --- a/configure.in |
| 25 | +++ b/configure.in |
| 26 | @@ -2211,7 +2211,7 @@ Use --without-tcl to disable building PL/Tcl.]) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 27 | fi |
| 28 | |
| 29 | # check for <perl.h> |
| 30 | -if test "$with_perl" = yes; then |
| 31 | +if test "$with_perl" = yes && test "$cross_compiling" = no; then |
| 32 | ac_save_CPPFLAGS=$CPPFLAGS |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 33 | CPPFLAGS="$CPPFLAGS $perl_includespec" |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 34 | AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 35 | -- |
| 36 | 2.7.4 |
| 37 | |