kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/x11/Xfixes/buildlink3.mk

21 lines
543 B
Makefile
Raw Normal View History

Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly by moving the inclusion of buildlink3.mk files outside of the protected region. This bug would be seen by users that have set PREFER_PKGSRC or PREFER_NATIVE to non-default values. BUILDLINK_PACKAGES should be ordered so that for any package in the list, that package doesn't depend on any packages to the left of it in the list. This ordering property is used to check for builtin packages in the correct order. The problem was that including a buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed from BUILDLINK_PACKAGES and appended to the end. However, since the inclusion of any other buildlink3.mk files within that buildlink3.mk was in a region that was protected against multiple inclusion, those dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 10:12:08 +01:00
# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
add buildlink3.mks
2004-02-15 10:45:30 +01:00
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= Xfixes
.endif
Reorder location and setting of BUILDLINK_PACKAGES to match template buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 20:25:06 +01:00
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXfixes}
BUILDLINK_PACKAGES+= Xfixes
add buildlink3.mks
2004-02-15 10:45:30 +01:00
.if !empty(XFIXES_BUILDLINK3_MK:M+)
Reorder location and setting of BUILDLINK_PACKAGES to match template buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 20:25:06 +01:00
BUILDLINK_DEPENDS.Xfixes+= Xfixes>=2.0.0
BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes
Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly by moving the inclusion of buildlink3.mk files outside of the protected region. This bug would be seen by users that have set PREFER_PKGSRC or PREFER_NATIVE to non-default values. BUILDLINK_PACKAGES should be ordered so that for any package in the list, that package doesn't depend on any packages to the left of it in the list. This ordering property is used to check for builtin packages in the correct order. The problem was that including a buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed from BUILDLINK_PACKAGES and appended to the end. However, since the inclusion of any other buildlink3.mk files within that buildlink3.mk was in a region that was protected against multiple inclusion, those dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 10:12:08 +01:00
.endif # XFIXES_BUILDLINK3_MK
add buildlink3.mks
2004-02-15 10:45:30 +01:00
.include "../../x11/fixesext/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
Reference in a new issue Copy permalink