Re: pkg/41297: Many packages fail under Linux (linkage, -ldb4)

[Aleksey Cheusov <cheusov%tut.by@localhost>]

The attached file contains a patch for this problem.  In order to test
it I removed python25 binary package and run a full bulk build
rebuilding all packages that depend on python25 and libgnome-desktop.

Difference with previous bulk build is available here

http://mova.org/~cheusov/pub/pkgsrc-distbb/Linux/current/logs/20090517.1016/META/report.html#old
 vs new

As you can see packages depending on libgnome-desktop that failed
previously (sysutils/nautilus, devel/eel, sysutils/gnome-settings-daemon
and others) now are built fine.

Previous discussion about this problem is here.
http://mail-index.netbsd.org/tech-pkg/2009/04/25/msg003168.html

This patch is a bit hackish and doesn't look "excellent".
So, I ask here. Can anybody look on this PR?

Index: lang/python/application.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/application.mk,v
retrieving revision 1.9
diff -u -r1.9 application.mk
--- lang/python/application.mk  20 Feb 2007 11:30:43 -0000      1.9
+++ lang/python/application.mk  18 May 2009 17:28:07 -0000
@@ -13,6 +13,8 @@
 # Keywords: python
 #
 
+COME_FROM_PYAPP:=1
+
 .include "../../lang/python/pyversion.mk"
 
 .if defined(PYTHON_PATCH_SCRIPTS) || defined(REPLACE_PYTHON)
@@ -21,3 +23,5 @@
 REPLACE.python.new=    ${PYTHONBIN}
 REPLACE_FILES.python=  ${PYTHON_PATCH_SCRIPTS} ${REPLACE_PYTHON}
 .endif
+
+.undef COME_FROM_PYAPP
Index: lang/python/pyversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/pyversion.mk,v
retrieving revision 1.70
diff -u -r1.70 pyversion.mk
--- lang/python/pyversion.mk    19 Apr 2009 15:14:19 -0000      1.70
+++ lang/python/pyversion.mk    18 May 2009 17:28:07 -0000
@@ -145,9 +145,6 @@
 PKG_FAIL_REASON+=   "No valid Python version"
 .endif
 
-PTHREAD_OPTS+= require
-.include "../../mk/pthread.buildlink3.mk"
-
 .if defined(PYTHON_FOR_BUILD_ONLY)
 BUILDLINK_DEPMETHOD.python?=   build
 .endif
@@ -183,3 +180,15 @@
 ALL_ENV+=      PYTHON=${PYTHONBIN}
 
 .endif # PYTHON_PYVERSION_MK
+
+.ifndef COME_FROM_PYAPP
+
+PTHREAD_OPTS+= require
+.include "../../mk/pthread.buildlink3.mk"
+
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "IRIX"
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
+
+.endif # COME_FROM_PYAPP
Index: lang/python25/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python25/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- lang/python25/buildlink3.mk 20 Mar 2009 19:24:52 -0000      1.3
+++ lang/python25/buildlink3.mk 18 May 2009 17:28:07 -0000
@@ -17,10 +17,10 @@
 BUILDLINK_LIBDIRS.python25+=   lib/python2.5/config
 BUILDLINK_TRANSFORM+=          l:python:python2.5
 
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} != "IRIX"
-.  include "../../mk/bdb.buildlink3.mk"
-.endif
+#.include "../../mk/bsd.fast.prefs.mk"
+#.if ${OPSYS} != "IRIX"
+#.  include "../../mk/bdb.buildlink3.mk"
+#.endif
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

P.S.
python24 and 23 were not patched because python25 is the default.

-- 
Best regards, Aleksey Cheusov.