Subject: [PATCH] bsd.buildlink3.mk + xorg + Linux == breakage
To: None <tech-pkg@netbsd.org>
From: Eric Gillespie <epg@netbsd.org>
List: tech-pkg
Date: 05/09/2005 21:27:28
Currently, bsd.builtin.mk is included before the X11
buildlink3.mk file, so the BUILDLINK_PACKAGES list it loops over
is missing the packages x11/xorg-libs/buildlink3.mk adds.
Particularly, iconv is missing, leading to the dreaded

  ===> libiconv-1.9.2nb1 is not needed for Linux; it is included in GNU libc.

message when trying to install anything with USE_X11 (emacs,
ghostscript-gnu, ...).

This patch just moves bsd.builtin.mk inclusion after USE_X11
processing, solving the problem.  Any objection?

Index: mk/buildlink3/bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.169
diff -a -u -r1.169 bsd.buildlink3.mk
--- mk/buildlink3/bsd.buildlink3.mk	9 May 2005 05:06:55 -0000	1.169
+++ mk/buildlink3/bsd.buildlink3.mk	10 May 2005 01:20:38 -0000
@@ -101,11 +101,6 @@
 #
 BUILDLINK_DEPENDS?=	# empty
 
-# For each package we use, check whether we are using the built-in
-# version of the package or if we are using the pkgsrc version.
-#
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
 # Check whether we should include the X11 buildlink3.mk file here since
 # USE_X11 may have been set indirectly by bsd.builtin.mk.
 #
@@ -126,6 +121,11 @@
 .  endif
 .endif
 
+# For each package we use, check whether we are using the built-in
+# version of the package or if we are using the pkgsrc version.
+#
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
 # Set IGNORE_PKG.<pkg> if <pkg> is the current package we're building.  
 # We can then check for this value to avoid build loops.
 #