Hi,
in current CVS, both the libstdc++ and libpthread .so libraries are
created by
./buildtool build root
but libcstc++ is not packaged at all, and libpthread is packaged in a
separate empty package which builds nothing. That doesn't make sense,
so here is my updated patch which removes the empty libpthread package
(lpthread.lrp) and lets
./buildpacket.pl --package=root --all
create these packages:
root.lrp
with the very same content as today
libcxx.lrp
contains libgcc_s.so* and libstdc++.so*
lpthread.lrp
contains libpthread.so*
When applying the patch, you can also remove the files from
src/bering-uclibc/apps/libpthread/
I have verified this patch by running the two lines given above, and
then comparing
src/bering-uclibc/buildtool/packages/lpthread.lrp
with
bin/packages/uclibc-0.9/20/lpthread.lrp
and finding that the contents match.
For lack of commit priviledges, I cannot commit the patch but have to
nerve the BU developers here :-)
Index: src/bering-uclibc/apps/root/buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/root/buildtool.cfg,v
retrieving revision 1.14
diff -u -3 -p -r1.14 buildtool.cfg
--- src/bering-uclibc/apps/root/buildtool.cfg 18 Oct 2004 20:00:42 -0000
1.14
+++ src/bering-uclibc/apps/root/buildtool.cfg 9 Mar 2005 22:17:32 -0000
@@ -502,6 +502,97 @@
</Contents>
</root>
+ <libcxx>
+ Help <<EOF
+ libcxx - C++ runtime libraries
+ Requires: root.lrp
+ LEAF package
+
+ This package contains the C++ runtime corresponding to the
+ root.lrp package.
+ EOF
+
+ <Permissions>
+ Files = 644
+ Directories = 755
+ </Permissions>
+ <Owner>
+ Files = root:root
+ Directories = root:root
+ </Owner>
+ <Contents>
+ <File>
+ Filename = lib/libgcc_s.so.0.9.9
+ Source = lib/libgcc_s.so.0.9.9
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ # We would like to write
+ #Filename = lib/libstdc++.so.5.0.5
+ #Source = lib/libstdc++.so.5.0.5
+ # but buildpacket.pl barfs on the ++.
+ # So we use this instead:
+ Filename = lib/
+ Source = lib/libstdc??.so.5.0.5
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = lib/libstdc++.so.5
+ Target = lib/libstdc++.so.5.0.5
+ Type = link
+ Permissions = 755
+ </File>
+ <File>
+ Filename = var/lib/lrpkg/libcxx.version
+ Target = var/lib/lrpkg/root.version
+ Type = link
+ Permissions = 755
+ </File>
+ </Contents>
+ </libcxx>
+ <lpthread>
+ Help <<EOF
+ lpthread - The libpthread library
+ Requires: root.lrp
+ Homepage: http://www.uclibc.org
+ LEAF package by __PACKAGER__, __BUILDDATE__.
+
+ This package contains libpthread corresponding to the root.lrp
+ package.
+ EOF
+
+ <Permissions>
+ Files = 644
+ Directories = 755
+ </Permissions>
+
+ <Owner>
+ Files = root:root
+ Directories = root:root
+ </Owner>
+
+ <Contents>
+ <File>
+ Filename = lib/libpthread-0.9.20.so
+ Source = lib/libpthread-0.9.20.so
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = lib/libpthread.so.0
+ Target = lib/libpthread-0.9.20.so
+ Type = link
+ Permissions = 755
+ </File>
+ <File>
+ Filename = var/lib/lrpkg/lpthread.version
+ Target = var/lib/lrpkg/root.version
+ Type = link
+ Permissions = 755
+ </File>
+ </Contents>
+ </lpthread>
</Package>
-
Index: src/bering-uclibc/buildtool/conf/sources.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/buildtool/conf/sources.cfg,v
retrieving revision 1.60
diff -u -3 -p -r1.60 sources.cfg
--- src/bering-uclibc/buildtool/conf/sources.cfg 6 Mar 2005 20:53:32
-0000 1.60
+++ src/bering-uclibc/buildtool/conf/sources.cfg 9 Mar 2005 22:17:32
-0000
@@ -335,17 +335,7 @@
</Requires>
</Package>
-<Package lpthread>
- Server = cvs-sourceforge
- Revision = HEAD
- Directory = libpthread
- Description = libpthread package
- <Requires>
- Name = buildenv
- </Requires>
-</Package>
-
<Package mawk>
Server = cvs-sourceforge
Revision = HEAD
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
leaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-devel
