[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ - gentoo-commits

From:	Sergei Trofimovich <slyfox@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/
Date:	Sat, 16 Nov 2019 21:42:15
Message-Id:	`1573940513.8045956db286fac4cf3e6e0a03d5464d7049f889.slyfox@gentoo`

1

commit:     8045956db286fac4cf3e6e0a03d5464d7049f889

2

Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>

3

AuthorDate: Sat Nov 16 21:41:53 2019 +0000

4

Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>

5

CommitDate: Sat Nov 16 21:41:53 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8045956d

7

8

sys-libs/glibc: expose errors in sync primitives checks

9

10

In bug #700232 CFLAGS_x86 mis-detects unsupported sync

11

primitives. That triggers accidental -march=* filter-out.

12

13

This change should expose actual built failure.

14

15

Bug: https://bugs.gentoo.org/700232

16

Package-Manager: Portage-2.3.79, Repoman-2.3.18

17

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

18

19

 sys-libs/glibc/glibc-2.30-r2.ebuild | 6 +++---

20

 sys-libs/glibc/glibc-9999.ebuild    | 6 +++---

21

 2 files changed, 6 insertions(+), 6 deletions(-)

22

23

diff --git a/sys-libs/glibc/glibc-2.30-r2.ebuild b/sys-libs/glibc/glibc-2.30-r2.ebuild

24

index f3282ba8a07..910396913f2 100644

25

--- a/sys-libs/glibc/glibc-2.30-r2.ebuild

26

+++ b/sys-libs/glibc/glibc-2.30-r2.ebuild

27

@@ -198,7 +198,7 @@ do_compile_test() {

28

 	rm -f glibc-test*

29

 	printf '%b' "$*" > glibc-test.c

30

31

-	nonfatal emake -s glibc-test

32

+	nonfatal emake glibc-test

33

 	ret=$?

34

35

 	popd >/dev/null

36

@@ -246,7 +246,7 @@ setup_target_flags() {

37

 			# We could change main to _start and pass -nostdlib here so that we

38

 			# only test the gcc code compilation.  Or we could do a compile and

39

 			# then look for the symbol via scanelf.

40

-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then

41

+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then

42

 				local t=${CTARGET_OPT:-${CTARGET}}

43

 				t=${t%%-*}

44

 				filter-flags '-march=*'

45

@@ -259,7 +259,7 @@ setup_target_flags() {

46

 			# Note: This test only matters when the x86 ABI is enabled, so we could

47

 			# optimize a bit and elide it.

48

 			# TODO: See cross-compile issues listed above for x86.

49

-			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then

50

+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then

51

 				local t=${CTARGET_OPT:-${CTARGET}}

52

 				t=${t%%-*}

53

 				# Normally the target is x86_64-xxx, so turn that into the -march that

54

55

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild

56

index 9971df60979..f1b57d70806 100644

57

--- a/sys-libs/glibc/glibc-9999.ebuild

58

+++ b/sys-libs/glibc/glibc-9999.ebuild

59

@@ -199,7 +199,7 @@ do_compile_test() {

60

 	rm -f glibc-test*

61

 	printf '%b' "$*" > glibc-test.c

62

63

-	nonfatal emake -s glibc-test

64

+	nonfatal emake glibc-test

65

 	ret=$?

66

67

 	popd >/dev/null

68

@@ -247,7 +247,7 @@ setup_target_flags() {

69

 			# We could change main to _start and pass -nostdlib here so that we

70

 			# only test the gcc code compilation.  Or we could do a compile and

71

 			# then look for the symbol via scanelf.

72

-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then

73

+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then

74

 				local t=${CTARGET_OPT:-${CTARGET}}

75

 				t=${t%%-*}

76

 				filter-flags '-march=*'

77

@@ -260,7 +260,7 @@ setup_target_flags() {

78

 			# Note: This test only matters when the x86 ABI is enabled, so we could

79

 			# optimize a bit and elide it.

80

 			# TODO: See cross-compile issues listed above for x86.

81

-			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then

82

+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then

83

 				local t=${CTARGET_OPT:-${CTARGET}}

84

 				t=${t%%-*}

85

 				# Normally the target is x86_64-xxx, so turn that into the -march that

1	commit: 8045956db286fac4cf3e6e0a03d5464d7049f889
2	Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3	AuthorDate: Sat Nov 16 21:41:53 2019 +0000
4	Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5	CommitDate: Sat Nov 16 21:41:53 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8045956d
7
8	sys-libs/glibc: expose errors in sync primitives checks
9
10	In bug #700232 CFLAGS_x86 mis-detects unsupported sync
11	primitives. That triggers accidental -march=* filter-out.
12
13	This change should expose actual built failure.
14
15	Bug: https://bugs.gentoo.org/700232
16	Package-Manager: Portage-2.3.79, Repoman-2.3.18
17	Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
18
19	sys-libs/glibc/glibc-2.30-r2.ebuild \| 6 +++---
20	sys-libs/glibc/glibc-9999.ebuild \| 6 +++---
21	2 files changed, 6 insertions(+), 6 deletions(-)
22
23	diff --git a/sys-libs/glibc/glibc-2.30-r2.ebuild b/sys-libs/glibc/glibc-2.30-r2.ebuild
24	index f3282ba8a07..910396913f2 100644
25	--- a/sys-libs/glibc/glibc-2.30-r2.ebuild
26	+++ b/sys-libs/glibc/glibc-2.30-r2.ebuild
27	@@ -198,7 +198,7 @@ do_compile_test() {
28	rm -f glibc-test*
29	printf '%b' "$*" > glibc-test.c
30
31	- nonfatal emake -s glibc-test
32	+ nonfatal emake glibc-test
33	ret=$?
34
35	popd >/dev/null
36	@@ -246,7 +246,7 @@ setup_target_flags() {
37	# We could change main to _start and pass -nostdlib here so that we
38	# only test the gcc code compilation. Or we could do a compile and
39	# then look for the symbol via scanelf.
40	- if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
41	+ if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
42	local t=${CTARGET_OPT:-${CTARGET}}
43	t=${t%%-*}
44	filter-flags '-march=*'
45	@@ -259,7 +259,7 @@ setup_target_flags() {
46	# Note: This test only matters when the x86 ABI is enabled, so we could
47	# optimize a bit and elide it.
48	# TODO: See cross-compile issues listed above for x86.
49	- if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
50	+ if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
51	local t=${CTARGET_OPT:-${CTARGET}}
52	t=${t%%-*}
53	# Normally the target is x86_64-xxx, so turn that into the -march that
54
55	diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
56	index 9971df60979..f1b57d70806 100644
57	--- a/sys-libs/glibc/glibc-9999.ebuild
58	+++ b/sys-libs/glibc/glibc-9999.ebuild
59	@@ -199,7 +199,7 @@ do_compile_test() {
60	rm -f glibc-test*
61	printf '%b' "$*" > glibc-test.c
62
63	- nonfatal emake -s glibc-test
64	+ nonfatal emake glibc-test
65	ret=$?
66
67	popd >/dev/null
68	@@ -247,7 +247,7 @@ setup_target_flags() {
69	# We could change main to _start and pass -nostdlib here so that we
70	# only test the gcc code compilation. Or we could do a compile and
71	# then look for the symbol via scanelf.
72	- if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
73	+ if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
74	local t=${CTARGET_OPT:-${CTARGET}}
75	t=${t%%-*}
76	filter-flags '-march=*'
77	@@ -260,7 +260,7 @@ setup_target_flags() {
78	# Note: This test only matters when the x86 ABI is enabled, so we could
79	# optimize a bit and elide it.
80	# TODO: See cross-compile issues listed above for x86.
81	- if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
82	+ if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
83	local t=${CTARGET_OPT:-${CTARGET}}
84	t=${t%%-*}
85	# Normally the target is x86_64-xxx, so turn that into the -march that

Gentoo Archives: gentoo-commits