Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Aug 2016 00:18:33 +0200
From:      Oliver Pinter <oliver.pinter@hardenedbsd.org>
To:        Konstantin Belousov <kib@freebsd.org>
Cc:        src-committers@freebsd.org, svn-src-all@freebsd.org,  svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   Re: svn commit: r304527 - in stable/10/lib: libc/include libc/stdlib libc/tests/stdlib libthr/thread
Message-ID:  <CAPQ4ffuJ4TmP5Sfge9JDux9FPqvtk1pTgb3debSxMuvuQbKY_g@mail.gmail.com>
In-Reply-To: <CAPQ4fft3L0w7Lpuw7knADvA1xqYQO=etNSzjMQK1Aw43q=2C5A@mail.gmail.com>
References:  <201608201226.u7KCQiV6044715@repo.freebsd.org> <CAPQ4fft3L0w7Lpuw7knADvA1xqYQO=etNSzjMQK1Aw43q=2C5A@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help

[-- Attachment #1 --]
On 8/21/16, Oliver Pinter <oliver.pinter@hardenedbsd.org> wrote:
> On 8/20/16, Konstantin Belousov <kib@freebsd.org> wrote:
>> Author: kib
>> Date: Sat Aug 20 12:26:44 2016
>> New Revision: 304527
>> URL: https://svnweb.freebsd.org/changeset/base/304527
>>
>> Log:
>>   MFC r303795:
>>   Add __cxa_thread_atexit(3) API implementation.
>>
>> Added:
>>   stable/10/lib/libc/stdlib/cxa_thread_atexit.c
>>      - copied unchanged from r303795,
>> head/lib/libc/stdlib/cxa_thread_atexit.c
>>   stable/10/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc
>>      - copied unchanged from r303795,
>> head/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc
>>   stable/10/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc
>>      - copied unchanged from r303795,
>> head/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc
>> Modified:
>>   stable/10/lib/libc/include/libc_private.h
>>   stable/10/lib/libc/stdlib/Makefile.inc
>>   stable/10/lib/libc/stdlib/Symbol.map
>>   stable/10/lib/libc/stdlib/exit.c
>>   stable/10/lib/libc/tests/stdlib/Makefile
>>   stable/10/lib/libthr/thread/thr_exit.c
>> Directory Properties:
>>   stable/10/   (props changed)
>>
>
>
> make[6]:
> "/jenkins/workspace/HardenedBSD-stable-10-STABLE-master-amd64/lib/libc/tests/stdlib/Makefile"
> line 3: Could not find src.opts.mk
> make[6]:
> "/jenkins/workspace/HardenedBSD-stable-10-STABLE-master-amd64/lib/libc/tests/stdlib/Makefile"
> line 8: Malformed conditional (${COMPILER_FEATURES:Mc++11})
>

[-- Attachment #2 --]
From ff32c37be9812fa67a818d93ee300c043ad682c9 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.pinter@hardenedbsd.org>
Date: Sun, 21 Aug 2016 00:10:58 +0200
Subject: [PATCH] HBSD: fix build error after kib's
 8ef9c6fc5bcfe1b606229a8da024f76b2d5048c1 commit

--8<--
make[6]:
"/jenkins/workspace/HardenedBSD-stable-10-STABLE-master-amd64/lib/libc/tests/stdlib/Makefile"
line 3: Could not find src.opts.mk
make[6]:
"/jenkins/workspace/HardenedBSD-stable-10-STABLE-master-amd64/lib/libc/tests/stdlib/Makefile"
line 8: Malformed conditional (${COMPILER_FEATURES:Mc++11})
--8<--

Signed-off-by: Oliver Pinter <oliver.pinter@hardenedbsd.org>
---
 lib/libc/tests/stdlib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile
index df50572..bbb9b59 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.compiler.mk>
 
 ATF_TESTS_C+=		heapsort_test
 ATF_TESTS_C+=		mergesort_test
-- 
2.9.2


Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPQ4ffuJ4TmP5Sfge9JDux9FPqvtk1pTgb3debSxMuvuQbKY_g>