From 9864ef74b142a0ad92eff84d817262d569211f98 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 14 Feb 2020 23:04:14 +0300
Subject: Release version 12.1.0+2

Drop copyright notice from source code

Use adhoc value for libpqdll.map prerequisite-specific variable include

Minor cleanups
---
 libpq/libpq/buildfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libpq/libpq/buildfile')

diff --git a/libpq/libpq/buildfile b/libpq/libpq/buildfile
index d77ccf7..bf7f844 100644
--- a/libpq/libpq/buildfile
+++ b/libpq/libpq/buildfile
@@ -1,6 +1,5 @@
 # file      : libpq/buildfile
-# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
-# license   : PostgreSQL Licenes; see accompanying COPYRIGHT file
+# license   : PostgreSQL Licene; see accompanying COPYRIGHT file
 
 import imp_libs  = libssl%lib{ssl}
 import imp_libs += libcrypto%lib{crypto}
@@ -19,18 +18,19 @@ lib{pq}: {h   }{*                                     -version} \
   common/{   c}{*                                             } \
  include/{h   }{**                                            } \
          {def }{libpqdll                                      } \
-         {file}{libpqdll.map                                  } \
       pq/{file}{pg_service.conf.sample                        } \
          $imp_libs
 
 tclass = $c.target.class
 tsys   = $c.target.system
 
+linux   = ($tclass == 'linux')
 bsd     = ($tclass == 'bsd')
 macos   = ($tclass == 'macos')
 windows = ($tclass == 'windows')
 
-lib{pq}: port/c{strlcpy}: include = (!$bsd && !$macos)
+lib{pq}: file{libpqdll.map}: include = ($linux || $bsd ? adhoc : false)
+lib{pq}: port/c{strlcpy}:    include = (!$bsd && !$macos)
 
 lib{pq}: pq/{h c}{*win32*                        }                     \
        port/{h c}{*win32* +getaddrinfo +inet_aton}: include = $windows
@@ -49,8 +49,8 @@ h{version}: in{version} $src_root/manifest
 c.poptions += -DFRONTEND -DUNSAFE_STAT_OK -DSO_MAJOR_VERSION=$abi_major
 
 if! $windows
-  # Note that the upstream package uses -pthread compiler/linker option. It is
-  # currently unsupported by build2, so we use -D_REENTRANT and -lpthread
+  # Note that the upstream package uses the -pthread compiler/linker option.
+  # The option is unsupported by build2 so we pass -D_REENTRANT and -lpthread
   # preprocessor/linker options instead. We also omit -D_THREAD_SAFE (synonym
   # for -D_REENTRANT) and Solaris-specific -D_POSIX_PTHREAD_SEMANTICS.
   #
-- 
cgit v1.1