SPECS: klibc.spec - updated to 1.1.1. - /%{_lib}/klibc-*.so loader...

pluto pluto at pld-linux.org
Thu Sep 29 13:43:29 CEST 2005


Author: pluto                        Date: Thu Sep 29 11:43:29 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.1.1.
- /%{_lib}/klibc-*.so loader added (shared binaries works fine now).
- nfy...

---- Files affected:
SPECS:
   klibc.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/klibc.spec
diff -u SPECS/klibc.spec:1.37 SPECS/klibc.spec:1.38
--- SPECS/klibc.spec:1.37	Sun Jul 24 11:36:29 2005
+++ SPECS/klibc.spec	Thu Sep 29 13:43:24 2005
@@ -6,12 +6,12 @@
 Summary:	Minimalistic libc subset for use with initramfs
 Summary(pl):	Zminimalizowany podzbiór biblioteki C do używania z initramfs
 Name:		klibc
-Version:	1.0.14
-Release:	1
+Version:	1.1.1
+Release:	0.1
 License:	BSD/GPL
 Group:		Libraries
 Source0:	http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
-# Source0-md5:	882492395506ffb5f4cdbfca11eeb3d6
+# Source0-md5:	baa1f6e0b6acbf9576bb28cca5c32c89
 Patch0:		%{name}-ksh-quotation.patch
 Patch1:		%{name}-klcc.patch
 URL:		http://www.zytor.com/mailman/listinfo/klibc/
@@ -64,35 +64,37 @@
 %patch1 -p1
 
 %build
-rm -rf include/{asm,asm-generic,linux}
-ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-ln -sf %{_kernelsrcdir}/include/asm-generic include/asm-generic
-cp -ar %{_kernelsrcdir}/include/linux include/linux
-%{?with_dist_kernel:ln -sf %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h}
+cd include
+rm -rf asm asm-generic linux
+cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch} .
+ln -sf asm-%{_target_base_arch} asm
+cp -a %{_kernelsrcdir}/include/asm-generic .
+cp -a %{_kernelsrcdir}/include/linux .
+%{?with_dist_kernel:cp -a %{_kernelsrcdir}/include/linux/autoconf-up.h linux/autoconf.h}
+cd ..
 
 %{__make} \
-%if 0
 	ARCH=%{_target_base_arch} \
-	CROSS=%{_target_base_arch}-pld-linux- \
-%else
 	CC="%{__cc}" \
-%endif
+	prefix=%{_prefix} \
 	bindir=%{_bindir} \
 	includedir=%{_includedir}/klibc \
 	libdir=%{_libdir} \
-	prefix=%{_prefix} \
 	OPTFLAGS="%{rpmcflags} -Os -fomit-frame-pointer -falign-functions=0 \
 		-falign-jumps=0 -falign-loops=0 -ffreestanding"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/%{_lib}
 install -d $RPM_BUILD_ROOT%{_includedir}/klibc
 install -d $RPM_BUILD_ROOT%{_libdir}/klibc/bin-{shared,static}
 
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/klibc
+
 install klcc -D $RPM_BUILD_ROOT%{_bindir}/klcc
 install klcc.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/klcc.1
 install klibc/libc.* klibc/crt0.o klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc
+install klibc/klibc-*.so $RPM_BUILD_ROOT/%{_lib}
 install utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
 install utils/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 
@@ -101,10 +103,12 @@
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/klibc*.so
 %attr(755,root,root) %{_bindir}/klcc
 %{_includedir}/klibc
 %dir %{_libdir}/klibc
 %attr(755,root,root) %{_libdir}/klibc/*.so
+%{_libdir}/klibc/*.so.hash
 %{_libdir}/klibc/*.[ao]
 %{_mandir}/man1/*
 
@@ -124,6 +128,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2005/09/29 11:43:24  pluto
+- updated to 1.1.1.
+- /%{_lib}/klibc-*.so loader added (shared binaries works fine now).
+- nfy...
+
 Revision 1.37  2005/07/24 09:36:29  qboosh
 - don't overwrite autoconf.h if without dist_kernel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/klibc.spec?r1=1.37&r2=1.38&f=u




More information about the pld-cvs-commit mailing list