Wed Feb 1 21:17:05 2012 UTC ()
Remove old BUILDLINK_FNAME_TRANSFORM, which seems to have been
cargo-culted from an older gcc package directly installing into
/usr/pkg. Add include/ to buildlinked files.


(hans)
diff -r1.6 -r1.7 pkgsrc/lang/gcc44/buildlink3.mk
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc44/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/buildlink3.mk 2011/07/14 19:54:55 1.6
+++ pkgsrc/lang/gcc44/Attic/buildlink3.mk 2012/02/01 21:17:05 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.6 2011/07/14 19:54:55 hans Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2012/02/01 21:17:05 hans Exp $
2 2
3BUILDLINK_TREE+= gcc44 3BUILDLINK_TREE+= gcc44
4 4
5.if !defined(GCC44_BUILDLINK3_MK) 5.if !defined(GCC44_BUILDLINK3_MK)
6GCC44_BUILDLINK3_MK:= 6GCC44_BUILDLINK3_MK:=
7 7
8FIND_PREFIX:= BUILDLINK_PREFIX.gcc44=gcc44 8FIND_PREFIX:= BUILDLINK_PREFIX.gcc44=gcc44
9.include "../../mk/find-prefix.mk" 9.include "../../mk/find-prefix.mk"
10 10
11_GCC44_SUBDIR= gcc44 11_GCC44_SUBDIR= gcc44
12_GCC44_PREFIX= ${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR} 12_GCC44_PREFIX= ${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR}
13 13
14BUILDLINK_API_DEPENDS.gcc44+= gcc44>=${_GCC_REQD} 14BUILDLINK_API_DEPENDS.gcc44+= gcc44>=${_GCC_REQD}
@@ -36,28 +36,27 @@ BUILDLINK_LIBDIRS.gcc44+= ${gcc44_GCC_AR @@ -36,28 +36,27 @@ BUILDLINK_LIBDIRS.gcc44+= ${gcc44_GCC_AR
36 36
37# add the ada libraries (not yet supported) 37# add the ada libraries (not yet supported)
38#. if exists(${gcc44_GNAT1}) 38#. if exists(${gcc44_GNAT1})
39#BUILDLINK_LIBDIRS.gcc44+= ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/adalib 39#BUILDLINK_LIBDIRS.gcc44+= ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/adalib
40#. endif 40#. endif
41 41
42# add the header files 42# add the header files
43BUILDLINK_INCDIRS.gcc44+= ${_GCC44_SUBDIR}/include ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/include 43BUILDLINK_INCDIRS.gcc44+= ${_GCC44_SUBDIR}/include ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/include
44. endif 44. endif
45.endif 45.endif
46 46
47BUILDLINK_FILES_CMD.gcc44= \ 47BUILDLINK_FILES_CMD.gcc44= \
48 (cd ${BUILDLINK_PREFIX.gcc44} && \ 48 (cd ${BUILDLINK_PREFIX.gcc44} && \
49 ${FIND} ${_GCC44_SUBDIR}/bin ${_GCC44_SUBDIR}/libexec ${_GCC44_SUBDIR}/lib \( -type f -o -type l \) -print) 49 ${FIND} ${_GCC44_SUBDIR}/bin ${_GCC44_SUBDIR}/include ${_GCC44_SUBDIR}/libexec ${_GCC44_SUBDIR}/lib \( -type f -o -type l \) -print)
50BUILDLINK_FNAME_TRANSFORM.gcc44= -e s:buildlink:buildlink/gcc44: 
51 50
52# When not using the GNU linker, gcc will always link shared libraries 51# When not using the GNU linker, gcc will always link shared libraries
53# against the shared version of libgcc. Always enable _USE_GCC_SHILB on 52# against the shared version of libgcc. Always enable _USE_GCC_SHILB on
54# platforms that don't use the GNU linker, such as SunOS. 53# platforms that don't use the GNU linker, such as SunOS.
55.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
56.if ${OPSYS} == "SunOS" 55.if ${OPSYS} == "SunOS"
57_USE_GCC_SHLIB= yes 56_USE_GCC_SHLIB= yes
58.endif 57.endif
59 58
60# Packages that link against shared libraries need a full dependency. 59# Packages that link against shared libraries need a full dependency.
61.if defined(_USE_GCC_SHLIB) 60.if defined(_USE_GCC_SHLIB)
62BUILDLINK_DEPMETHOD.gcc44+= full 61BUILDLINK_DEPMETHOD.gcc44+= full
63.else 62.else