CVS commit: pkgsrc/meta-pkgs/boost

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 10 08:23:06 UTC 2019

Modified Files:
        pkgsrc/meta-pkgs/boost: distinfo
        pkgsrc/meta-pkgs/boost/patches: patch-tools_build_src_engine_build.jam

Log Message:
boost: pass LDFLAGS to clang.

Fixes relro build with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/meta-pkgs/boost/patches/patch-tools_build_src_engine_build.jam

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.123 pkgsrc/meta-pkgs/boost/distinfo:1.124
--- pkgsrc/meta-pkgs/boost/distinfo:1.123       Fri Dec 14 11:56:48 2018
+++ pkgsrc/meta-pkgs/boost/distinfo     Thu Jan 10 08:23:06 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.123 2018/12/14 11:56:48 jperkin Exp $
+$NetBSD: distinfo,v 1.124 2019/01/10 08:23:06 wiz Exp $
 
 SHA1 (boost_1_69_0.tar.bz2) = ea6eee4b5999f9c02105386850f63a53f0250eaa
 RMD160 (boost_1_69_0.tar.bz2) = 308544f184f04e4f192ac6a1118f6db787558ee6
@@ -29,6 +29,6 @@ SHA1 (patch-libs_config_test_boost__no__
 SHA1 (patch-libs_context_src_asm_jump_arm_aapcs_elf_gas.S) = daaa70c31f2ebc2c357e467585e0b5c6f70963cc
 SHA1 (patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas.S) = f4e9912a3101f10a3f7ac0151aac957f80fdc9cc
 SHA1 (patch-libs_fiber_build_Jamfile.v2) = 28c1aba2d074f2db7104e37cd900d33f5fcffb09
-SHA1 (patch-tools_build_src_engine_build.jam) = dc59422ade217aa49eb5d6928f02f7bc4734aa43
+SHA1 (patch-tools_build_src_engine_build.jam) = 4bdf4aee184741a72f25b4cf42980f920be85894
 SHA1 (patch-tools_build_src_engine_build.sh) = ed5e29d049f04e8a1e055844e66c549e5cd4bb01
 SHA1 (patch-tools_build_src_tools_gcc.jam) = 4d895f14965ee29e328dda15e9975ccc1c14673f

Index: pkgsrc/meta-pkgs/boost/patches/patch-tools_build_src_engine_build.jam
diff -u pkgsrc/meta-pkgs/boost/patches/patch-tools_build_src_engine_build.jam:1.1 pkgsrc/meta-pkgs/boost/patches/patch-tools_build_src_engine_build.jam:1.2
--- pkgsrc/meta-pkgs/boost/patches/patch-tools_build_src_engine_build.jam:1.1   Thu Aug 24 19:31:32 2017
+++ pkgsrc/meta-pkgs/boost/patches/patch-tools_build_src_engine_build.jam       Thu Jan 10 08:23:06 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_build_src_engine_build.jam,v 1.1 2017/08/24 19:31:32 adam Exp $
+$NetBSD: patch-tools_build_src_engine_build.jam,v 1.2 2019/01/10 08:23:06 wiz Exp $
 
-Pass CFLAGS to the compiler.
+Pass CFLAGS and LDFLAGS to the compiler.
 
---- tools/build/src/engine/build.jam.orig      2017-07-14 17:28:45.790581884 +0000
+--- tools/build/src/engine/build.jam.orig      2019-01-10 07:53:38.966228623 +0000
 +++ tools/build/src/engine/build.jam
-@@ -199,7 +199,7 @@ toolset como como : "-o " : -D
+@@ -199,12 +199,12 @@ toolset como como : "-o " : -D
      : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
  ## Clang Linux 2.8+
  toolset clang clang :  "-o " : -D
@@ -13,6 +13,12 @@ Pass CFLAGS to the compiler.
      [ opt --release : -Os ]
      [ opt --debug : -g -O0 -fno-inline ]
      [ opt --profile : -finline-functions -g ]
+     -I$(--python-include) -I$(--extra-include)
+-    : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
++    : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ ## MacOSX Darwin, using GCC 2.9.x, 3.x
+ toolset darwin cc :  "-o " : -D
+     :
 @@ -215,12 +215,12 @@ toolset darwin cc :  "-o " : -D
      : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
  ## GCC 2.x, 3.x, 4.x