Wed Feb 4 14:16:24 2015 UTC ()
Support the override libgcc specs for the cwrappers case.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/lang/gcc46-libs/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/lang/gcc47-libs/buildlink3.mk
diff -r1.9 -r1.10 pkgsrc/lang/gcc48-libs/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/lang/gcc49-libs/buildlink3.mk
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc46-libs/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc46-libs/Attic/buildlink3.mk 2015/01/01 01:31:52 1.1
+++ pkgsrc/lang/gcc46-libs/Attic/buildlink3.mk 2015/02/04 14:16:23 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.1 2015/01/01 01:31:52 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2015/02/04 14:16:23 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc46-libs 3BUILDLINK_TREE+= gcc46-libs
4 4
5.if !defined(GCC46_LIBS_BUILDLINK3_MK) 5.if !defined(GCC46_LIBS_BUILDLINK3_MK)
6GCC46_LIBS_BUILDLINK3_MK:= 6GCC46_LIBS_BUILDLINK3_MK:=
7 7
8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) 8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
9BUILDLINK_API_DEPENDS.gcc46-libs+= gcc46-libs>=4.6.0 9BUILDLINK_API_DEPENDS.gcc46-libs+= gcc46-libs>=4.6.0
10.else 10.else
11BUILDLINK_API_DEPENDS.gcc46-libs+= {gcc46,gcc46-libs}>=4.6.0 11BUILDLINK_API_DEPENDS.gcc46-libs+= {gcc46,gcc46-libs}>=4.6.0
12.endif 12.endif
13BUILDLINK_PKGSRCDIR.gcc46-libs= ../../lang/gcc46-libs 13BUILDLINK_PKGSRCDIR.gcc46-libs= ../../lang/gcc46-libs
14BUILDLINK_DEPMETHOD.gcc46-libs?= full 14BUILDLINK_DEPMETHOD.gcc46-libs?= full
@@ -25,19 +25,22 @@ WRAPPER_TARGETS+= ${SPECS_LIBGCC} @@ -25,19 +25,22 @@ WRAPPER_TARGETS+= ${SPECS_LIBGCC}
25 25
26LIBGCC_SUBPREFIX= gcc46 26LIBGCC_SUBPREFIX= gcc46
27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc46-libs}/${LIBGCC_SUBPREFIX} 27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc46-libs}/${LIBGCC_SUBPREFIX}
28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
29 29
30# XXX: Using %M requires patched version of gcc (e.g. lang/gcc46) 30# XXX: Using %M requires patched version of gcc (e.g. lang/gcc46)
31${SPECS_LIBGCC}: 31${SPECS_LIBGCC}:
32 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC} 32 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
33 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC} 33 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
34 34
35_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC} 35_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC}
36_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC} 36_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}
37_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC} 37_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC}
 38CWRAPPERS_APPEND.cc+= -specs=${SPECS_LIBGCC}
 39CWRAPPERS_APPEND.cxx+= -specs=${SPECS_LIBGCC}
 40CWRAPPERS_APPEND.f77+= -specs=${SPECS_LIBGCC}
38.endif 41.endif
39 42
40.include "../../mk/dlopen.buildlink3.mk" 43.include "../../mk/dlopen.buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
42.endif # GCC46_LIBS_BUILDLINK3_MK 45.endif # GCC46_LIBS_BUILDLINK3_MK
43BUILDLINK_TREE+= -gcc46-libs 46BUILDLINK_TREE+= -gcc46-libs
cvs diff -r1.10 -r1.11 pkgsrc/lang/gcc47-libs/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc47-libs/Attic/buildlink3.mk 2013/08/15 06:49:54 1.10
+++ pkgsrc/lang/gcc47-libs/Attic/buildlink3.mk 2015/02/04 14:16:24 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.10 2013/08/15 06:49:54 richard Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2015/02/04 14:16:24 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc47-libs 3BUILDLINK_TREE+= gcc47-libs
4 4
5.if !defined(GCC47_LIBS_BUILDLINK3_MK) 5.if !defined(GCC47_LIBS_BUILDLINK3_MK)
6GCC47_LIBS_BUILDLINK3_MK:= 6GCC47_LIBS_BUILDLINK3_MK:=
7 7
8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) 8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
9BUILDLINK_API_DEPENDS.gcc47-libs+= gcc47-libs>=4.7.0 9BUILDLINK_API_DEPENDS.gcc47-libs+= gcc47-libs>=4.7.0
10.else 10.else
11BUILDLINK_API_DEPENDS.gcc47-libs+= {gcc47,gcc47-libs}>=4.7.0 11BUILDLINK_API_DEPENDS.gcc47-libs+= {gcc47,gcc47-libs}>=4.7.0
12.endif 12.endif
13BUILDLINK_PKGSRCDIR.gcc47-libs= ../../lang/gcc47-libs 13BUILDLINK_PKGSRCDIR.gcc47-libs= ../../lang/gcc47-libs
14BUILDLINK_DEPMETHOD.gcc47-libs?= full 14BUILDLINK_DEPMETHOD.gcc47-libs?= full
@@ -25,19 +25,22 @@ WRAPPER_TARGETS+= ${SPECS_LIBGCC} @@ -25,19 +25,22 @@ WRAPPER_TARGETS+= ${SPECS_LIBGCC}
25 25
26LIBGCC_SUBPREFIX= gcc47 26LIBGCC_SUBPREFIX= gcc47
27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc47-libs}/${LIBGCC_SUBPREFIX} 27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc47-libs}/${LIBGCC_SUBPREFIX}
28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
29 29
30# XXX: Using %M requires patched version of gcc (e.g. lang/gcc47) 30# XXX: Using %M requires patched version of gcc (e.g. lang/gcc47)
31${SPECS_LIBGCC}: 31${SPECS_LIBGCC}:
32 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC} 32 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
33 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC} 33 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
34 34
35_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC} 35_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC}
36_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC} 36_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}
37_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC} 37_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC}
 38CWRAPPERS_APPEND.cc+= -specs=${SPECS_LIBGCC}
 39CWRAPPERS_APPEND.cxx+= -specs=${SPECS_LIBGCC}
 40CWRAPPERS_APPEND.f77+= -specs=${SPECS_LIBGCC}
38.endif 41.endif
39 42
40.include "../../mk/dlopen.buildlink3.mk" 43.include "../../mk/dlopen.buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
42.endif # GCC47_LIBS_BUILDLINK3_MK 45.endif # GCC47_LIBS_BUILDLINK3_MK
43BUILDLINK_TREE+= -gcc47-libs 46BUILDLINK_TREE+= -gcc47-libs
cvs diff -r1.9 -r1.10 pkgsrc/lang/gcc48-libs/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc48-libs/Attic/buildlink3.mk 2014/10/31 14:22:20 1.9
+++ pkgsrc/lang/gcc48-libs/Attic/buildlink3.mk 2015/02/04 14:16:24 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.9 2014/10/31 14:22:20 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2015/02/04 14:16:24 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc48-libs 3BUILDLINK_TREE+= gcc48-libs
4 4
5.if !defined(GCC48_LIBS_BUILDLINK3_MK) 5.if !defined(GCC48_LIBS_BUILDLINK3_MK)
6GCC48_LIBS_BUILDLINK3_MK:= 6GCC48_LIBS_BUILDLINK3_MK:=
7 7
8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) 8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
9BUILDLINK_API_DEPENDS.gcc48-libs+= gcc48-libs>=4.8.0 9BUILDLINK_API_DEPENDS.gcc48-libs+= gcc48-libs>=4.8.0
10.else 10.else
11BUILDLINK_API_DEPENDS.gcc48-libs+= {gcc48,gcc48-libs}>=4.8.0 11BUILDLINK_API_DEPENDS.gcc48-libs+= {gcc48,gcc48-libs}>=4.8.0
12.endif 12.endif
13BUILDLINK_PKGSRCDIR.gcc48-libs= ../../lang/gcc48-libs 13BUILDLINK_PKGSRCDIR.gcc48-libs= ../../lang/gcc48-libs
14BUILDLINK_DEPMETHOD.gcc48-libs?= full 14BUILDLINK_DEPMETHOD.gcc48-libs?= full
@@ -25,20 +25,23 @@ WRAPPER_TARGETS+= ${SPECS_LIBGCC} @@ -25,20 +25,23 @@ WRAPPER_TARGETS+= ${SPECS_LIBGCC}
25 25
26LIBGCC_SUBPREFIX= gcc48 26LIBGCC_SUBPREFIX= gcc48
27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc48-libs}/${LIBGCC_SUBPREFIX} 27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc48-libs}/${LIBGCC_SUBPREFIX}
28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
29 29
30# XXX: Using %M requires patched version of gcc (e.g. lang/gcc48) 30# XXX: Using %M requires patched version of gcc (e.g. lang/gcc48)
31${SPECS_LIBGCC}: 31${SPECS_LIBGCC}:
32 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC} 32 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
33 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC} 33 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
34 34
35_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC} 35_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC}
36_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC} 36_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}
37_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC} 37_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC}
 38CWRAPPERS_APPEND.cc+= -specs=${SPECS_LIBGCC}
 39CWRAPPERS_APPEND.cxx+= -specs=${SPECS_LIBGCC}
 40CWRAPPERS_APPEND.f77+= -specs=${SPECS_LIBGCC}
38.endif 41.endif
39 42
40.include "../../mk/dlopen.buildlink3.mk" 43.include "../../mk/dlopen.buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
42.endif # GCC48_LIBS_BUILDLINK3_MK 45.endif # GCC48_LIBS_BUILDLINK3_MK
43 46
44BUILDLINK_TREE+= -gcc48-libs 47BUILDLINK_TREE+= -gcc48-libs
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc49-libs/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc49-libs/Attic/buildlink3.mk 2014/09/04 18:49:10 1.1
+++ pkgsrc/lang/gcc49-libs/Attic/buildlink3.mk 2015/02/04 14:16:24 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.1 2014/09/04 18:49:10 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2015/02/04 14:16:24 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc49-libs 3BUILDLINK_TREE+= gcc49-libs
4 4
5.if !defined(GCC49_LIBS_BUILDLINK3_MK) 5.if !defined(GCC49_LIBS_BUILDLINK3_MK)
6GCC49_LIBS_BUILDLINK3_MK:= 6GCC49_LIBS_BUILDLINK3_MK:=
7 7
8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) 8.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
9BUILDLINK_API_DEPENDS.gcc49-libs+= gcc49-libs>=4.9.1 9BUILDLINK_API_DEPENDS.gcc49-libs+= gcc49-libs>=4.9.1
10.else 10.else
11BUILDLINK_API_DEPENDS.gcc49-libs+= {gcc49,gcc49-libs}>=4.9.1 11BUILDLINK_API_DEPENDS.gcc49-libs+= {gcc49,gcc49-libs}>=4.9.1
12.endif 12.endif
13BUILDLINK_PKGSRCDIR.gcc49-libs= ../../lang/gcc49-libs 13BUILDLINK_PKGSRCDIR.gcc49-libs= ../../lang/gcc49-libs
14BUILDLINK_DEPMETHOD.gcc49-libs?= full 14BUILDLINK_DEPMETHOD.gcc49-libs?= full
@@ -24,20 +24,23 @@ SPECS_LIBGCC= ${WRAPPER_DIR}/specs.libg @@ -24,20 +24,23 @@ SPECS_LIBGCC= ${WRAPPER_DIR}/specs.libg
24WRAPPER_TARGETS+= ${SPECS_LIBGCC} 24WRAPPER_TARGETS+= ${SPECS_LIBGCC}
25 25
26LIBGCC_SUBPREFIX= gcc49 26LIBGCC_SUBPREFIX= gcc49
27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc49-libs}/${LIBGCC_SUBPREFIX} 27LIBGCC_PREFIX= ${BUILDLINK_PREFIX.gcc49-libs}/${LIBGCC_SUBPREFIX}
28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 28GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
29 29
30${SPECS_LIBGCC}: 30${SPECS_LIBGCC}:
31 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC} 31 @${ECHO} "*link_libgcc:" >${SPECS_LIBGCC}
32 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC} 32 @${ECHO} "%D $(LINKER_RPATH_FLAG)${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib/%M" >>${SPECS_LIBGCC}
33 33
34_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC} 34_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_LIBGCC}
35_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC} 35_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_LIBGCC}
36_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC} 36_WRAP_EXTRA_ARGS.FC+= -specs=${SPECS_LIBGCC}
 37CWRAPPERS_APPEND.cc+= -specs=${SPECS_LIBGCC}
 38CWRAPPERS_APPEND.cxx+= -specs=${SPECS_LIBGCC}
 39CWRAPPERS_APPEND.f77+= -specs=${SPECS_LIBGCC}
37.endif 40.endif
38 41
39.include "../../mk/dlopen.buildlink3.mk" 42.include "../../mk/dlopen.buildlink3.mk"
40.include "../../mk/pthread.buildlink3.mk" 43.include "../../mk/pthread.buildlink3.mk"
41.endif # GCC49_LIBS_BUILDLINK3_MK 44.endif # GCC49_LIBS_BUILDLINK3_MK
42 45
43BUILDLINK_TREE+= -gcc49-libs 46BUILDLINK_TREE+= -gcc49-libs