--Multipart_Tue_May_27_02:54:01_2003-1
Content-Type: text/plain; charset=US-ASCII


>>>>> On Mon, 26 May 2003 11:58:11 +0200, Anders Andersen <aa@computer.org> said:

 > Any ideas?  I did a "cvs co" of the pkgsrc this morning.  I also
 > installed the following pkgsrc bootstrap stuff (and did the magic
 > explained in the different README files):

	I'm not sure what the real problem is, but it seems that:
	  - config.{guess,sub} are old 
	  - pthread.buildlink2.mk does not work with darwin
	  - something wrong in libtool 
	at devel/glib.
	
	If you are in a hurry to build glib, please try this:
	0: cd pkgsrc/devel/glib/
	1: patch -p0 < top.diff
	2: bmake extract
	3: cp /usr/share/libtool/config.{guess,sub} ./work/glib-1.2.10/
        4: bmake configure
	5: ln -s /usr/pkg/include/dlfcn.h  ./work/.buildlink/include/
	6: cp /usr/pkg/bin/libtool  /tmp/
	7: (cd /tmp; patch -p0 < libtool-tmp.diff)
	8: (cd ./work/.buildlink/bin; patch -p0 < libtool-bl.diff)
	9: bmake

masahiro

--Multipart_Tue_May_27_02:54:01_2003-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="libtool-tmp.diff"
Content-Transfer-Encoding: 7bit

--- /usr/pkg/bin/libtool	Sun Mar  9 13:04:42 2003
+++ ./libtool	Tue May 27 02:00:46 2003
@@ -202,7 +202,7 @@
 old_archive_from_expsyms_cmds=""
 
 # Commands used to build and install a shared archive.
-archive_cmds="\$CC \$(if test .\$module = .yes; then echo -bundle; else echo -dynamiclib; fi) \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$linkopts -install_name \$rpath/\$soname \$verstring"
+archive_cmds="\$CC \$(if test .\$module = .yes; then echo -bundle; else echo -dynamiclib; fi) \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$linkopts \$(if test .\$module = .yes; then echo ; else echo -install_name \$rpath/\$soname \$verstring; fi)"
 archive_expsym_cmds=""
 postinstall_cmds=""
 postuninstall_cmds=""

--Multipart_Tue_May_27_02:54:01_2003-1
Content-Type: text/plain; charset=US-ASCII


--Multipart_Tue_May_27_02:54:01_2003-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="libtool-bl.diff"

--- libtool.bak	Tue May 27 02:03:19 2003
+++ libtool	Tue May 27 02:03:30 2003
@@ -33,7 +33,7 @@
 WRKDIR="/Volumes/UFS/pkgsrc/devel/glib/work"
 WRKSRC="/Volumes/UFS/pkgsrc/devel/glib/work/glib-1.2.10"
 
-cmd="/usr/pkg/bin/libtool"
+cmd="/tmp/libtool"
 lafile=
 case "$1" in
 *install|*cp|*install-sh|*install.sh)

--Multipart_Tue_May_27_02:54:01_2003-1
Content-Type: text/plain; charset=US-ASCII



--Multipart_Tue_May_27_02:54:01_2003-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="top.diff"
Content-Transfer-Encoding: 7bit

? README.html
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile	2003/05/02 11:54:27	1.55
+++ Makefile	2003/05/26 17:28:08
@@ -87,6 +87,6 @@
 	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
 		tee ${WRKDIR}/check.log
 
-.include "../../mk/pthread.buildlink2.mk"
+#.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib/buildlink2.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink2.mk
--- buildlink2.mk	2003/05/02 13:18:53	1.6
+++ buildlink2.mk	2003/05/26 17:28:09
@@ -18,7 +18,7 @@
 
 PTHREAD_OPTS+=		require
 
-.include "../../mk/pthread.buildlink2.mk"
+#.include "../../mk/pthread.buildlink2.mk"
 
 BUILDLINK_TARGETS+=	glib-buildlink
 

--Multipart_Tue_May_27_02:54:01_2003-1--