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

41 lines
1.1 KiB
Makefile
Raw Normal View History

Xaw3d worked more or less accidently for most packages as they continued to use include/X11/Xaw/* and not the versions provided by Xaw3d. Many packages also incorrectly linked against libXaw and not libXaw3d, effectively making the dependency a nop. Address this problem in two steps: (a) Transform -lXaw to -lXaw3d. This magically fixes the packages which got it wrong before. I haven't checked a list of packages affected by this, so no revision bumps here. (b) Link include/X11/Xaw3d to include/X11/Xaw for modular Xorg, so that the dependency on Xaw3d actually works without pulling in libXaw as well. This should be extended to the other Xaw packages, but I don't use them nor do I have any interest in them. Discussed with and not objected by: jlam
2007-02-08 01:08:20 +01:00
# $NetBSD: buildlink3.mk,v 1.11 2007/02/08 00:08:20 joerg Exp $
bl3ify
2004-04-12 01:29:49 +02:00
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XAW3D_BUILDLINK3_MK:= ${XAW3D_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= Xaw3d
.endif
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXaw3d}
BUILDLINK_PACKAGES+= Xaw3d
Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto
2006-07-09 01:10:35 +02:00
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xaw3d
bl3ify
2004-04-12 01:29:49 +02:00
.if !empty(XAW3D_BUILDLINK3_MK:M+)
Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day).
2006-04-06 08:21:32 +02:00
BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5
BUILDLINK_ABI_DEPENDS.Xaw3d?= Xaw3d>=1.5Enb1
bl3ify
2004-04-12 01:29:49 +02:00
BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d
Xaw3d worked more or less accidently for most packages as they continued to use include/X11/Xaw/* and not the versions provided by Xaw3d. Many packages also incorrectly linked against libXaw and not libXaw3d, effectively making the dependency a nop. Address this problem in two steps: (a) Transform -lXaw to -lXaw3d. This magically fixes the packages which got it wrong before. I haven't checked a list of packages affected by this, so no revision bumps here. (b) Link include/X11/Xaw3d to include/X11/Xaw for modular Xorg, so that the dependency on Xaw3d actually works without pulling in libXaw as well. This should be extended to the other Xaw packages, but I don't use them nor do I have any interest in them. Discussed with and not objected by: jlam
2007-02-08 01:08:20 +01:00
BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d
bl3ify
2004-04-12 01:29:49 +02:00
Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes. The redundant parsing of bsd.prefs.mk is mostly avoided now and parse time e.g. for x11/kdebase3 gets reduced by up to 10%.
2006-12-12 22:52:34 +01:00
.include "../../mk/bsd.fast.prefs.mk"
Xaw3d worked more or less accidently for most packages as they continued to use include/X11/Xaw/* and not the versions provided by Xaw3d. Many packages also incorrectly linked against libXaw and not libXaw3d, effectively making the dependency a nop. Address this problem in two steps: (a) Transform -lXaw to -lXaw3d. This magically fixes the packages which got it wrong before. I haven't checked a list of packages affected by this, so no revision bumps here. (b) Link include/X11/Xaw3d to include/X11/Xaw for modular Xorg, so that the dependency on Xaw3d actually works without pulling in libXaw as well. This should be extended to the other Xaw packages, but I don't use them nor do I have any interest in them. Discussed with and not objected by: jlam
2007-02-08 01:08:20 +01:00
.if ${X11_TYPE} == "modular"
.PHONY: buildlink-Xaw3d-inc-hack
buildlink-Xaw3d-cookie: buildlink-Xaw3d-inc-hack
buildlink-Xaw3d-inc-hack: buildlink-directories
[ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
.endif
.endif # XAW3D_BUILDLINK3_MK
Fix recursive dependencies for modular Xorg.
2007-01-24 04:46:59 +01:00
.include "../../x11/libXmu/buildlink3.mk"
bl3ify
2004-04-12 01:29:49 +02:00
Convert to use {COMPILER,LINKER}_RPATH_FLAG.
2004-08-27 20:52:00 +02:00
LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib \
bl3ify
2004-04-12 01:29:49 +02:00
-lXaw3d
Aligned the last line of the buildlink3.mk files with the first line, so that they look nicer.
2006-04-12 12:26:59 +02:00
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
Reference in a new issue Copy permalink