code.ossystems Code Review - openembedded-core.git/blob

   1 From 26e98beb8a987cdc69699aaffc5599926fb1b293 Mon Sep 17 00:00:00 2001
   2 From: Andre McCurdy <armccurdy@gmail.com>
   3 Date: Fri, 17 Aug 2018 20:33:44 -0700
   4 Subject: [PATCH] allow OPENSSLDIR and ENGINESDIR CFLAGS to be controlled
   5
   6 Upstream-Status: Inappropriate [OE Specific]
   7
   8 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
   9 ---
  10  Configurations/unix-Makefile.tmpl | 6 +++++-
  11  1 file changed, 5 insertions(+), 1 deletion(-)
  12
  13 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
  14 index 034d93e..2310d12 100644
  15 --- a/Configurations/unix-Makefile.tmpl
  16 +++ b/Configurations/unix-Makefile.tmpl
  17 @@ -156,6 +156,10 @@ LIBDIR={- #
  18  ENGINESDIR={- use File::Spec::Functions;
  19                catdir($prefix,$libdir,"engines-$sover") -}
  20
  21 +# Intermediate variables so the values defined via CFLAGS can be controlled.
  22 +OE_DOPENSSLDIR=$(OPENSSLDIR)
  23 +OE_DENGINESDIR=$(ENGINESDIR)
  24 +
  25  # Convenience variable for those who want to set the rpath in shared
  26  # libraries and applications
  27  LIBRPATH=$(INSTALLTOP)/$(LIBDIR)
  28 @@ -174,7 +178,7 @@ HTMLSUFFIX=html
  29
  30  CROSS_COMPILE= {- $config{cross_compile_prefix} -}
  31  CC= $(CROSS_COMPILE){- $target{cc} -}
  32 -CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -}
  33 +CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OE_DOPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(OE_DENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -}
  34  CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}
  35  LDFLAGS= {- $target{lflags}." ".$ENV{'LDFLAGS'} -}
  36  PLIB_LDFLAGS= {- $target{plib_lflags} -}
  37 --
  38 1.9.1
  39