Author: kosmo Date: Tue Apr 3 14:26:27 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated:
uClibc: 0.9.27
Kernel: 2.4.32-uc0
---- Files affected:
SPECS:
crossm68k-uClibc.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/crossm68k-uClibc.spec
diff -u SPECS/crossm68k-uClibc.spec:1.4 SPECS/crossm68k-uClibc.spec:1.5
--- SPECS/crossm68k-uClibc.spec:1.4 Mon Feb 12 22:23:51 2007
+++ SPECS/crossm68k-uClibc.spec Tue Apr 3 16:26:22 2007
@@ -3,26 +3,25 @@
%bcond_with bootstrap # Build only headers
#
# TODO:
-# - compile for m5307
-# - add support for flat shared libraries (-mid-shared-library)
-# - make less ugly ?
-
-%define llh_version 2.4.31
+#
+%define kernel_version 2.4.32-uc0
Summary: C library optimized for size (m68k version)
Summary(pl.UTF-8): Biblioteka C zoptymalizowana na rozmiar (dla m68k)
Name: crossm68k-uClibc
-Version: 0.9.28
+Version: 0.9.27
Release: 1
Epoch: 0
License: LGPL
Group: Libraries
Source0: http://www.uclibc.org/downloads/uClibc-%{version}.tar.bz2
-# Source0-md5: 1ada58d919a82561061e4741fb6abd29
-Source1:
http://www.uclibc.org/downloads/toolchain/linux-libc-headers-%{llh_version}.tar.bz2
-# Source1-md5: 997d36627baf6825c712431dee4d79d3
+# Source0-md5: 6250bd6524283bd8e7bc976d43a46ec0
+Source1: linux-%{kernel_version}.tar.bz2
+# Source1-md5: bf6e3843ca122e3ad9ad28b94f4b8ed5
Source2: %{name}.config
+Source3: %{name}-kernel.config
Patch0: %{name}-clone.patch
+Patch1: %{name}-uCLinux.patch
URL: http://www.uclibc.org/
%{?!with_bootstrap:BuildRequires: crossm68k-gcc}
BuildRequires: sed >= 4.0
@@ -45,18 +44,22 @@
%prep
%setup -q -n uClibc-%{version} -a1
%patch0 -p1
+%patch1 -p1
-install %{SOURCE2} .config
+install -m 600 %{SOURCE2} .config
-sed -i "[EMAIL
PROTECTED]@KERNEL_SOURCE=\"$PWD/linux-libc-headers-%{llh_version}\"@" \
+sed -i "[EMAIL PROTECTED]@KERNEL_SOURCE=\"$PWD/linux-%{kernel_version}\"@"
\
.config
-cd linux-libc-headers-%{llh_version}/include/asm-m68knommu
-grep '#include[[:space:]]\+<asm-m68k/.\+\.h>' * | cut -f1 -d: | while read
file; do
- cat "../asm-m68k/$file" > "$file"
-done
+cd linux-%{kernel_version}
+install -m 600 %{SOURCE3} .config
+make ARCH=m68knommu oldconfig
+make ARCH=m68knommu dep
+cd ..
%build
+rm -rf $RPM_BUILD_ROOT-obj && install -d $RPM_BUILD_ROOT-obj
+
%if %{with bootstrap}
%{__make} headers < /dev/null
%else
@@ -65,46 +68,72 @@
local PIC_CODE=$2
local COMPILE_FLAGS=$3
- cat .config | grep -v "HAVE_SHARED" > .config.tmp
- cat .config.tmp | grep -v "BUILD_UCLIBC_LDSO" > .config
-
if [ $PIC_CODE -ne 0 ]; then
sed -i 's/^.*DOPIC.*$/DOPIC=y/' .config
- echo "HAVE_SHARED=n" >> .config
else
sed -i 's/^.*DOPIC.*$/# DOPIC is not set/' .config
fi
%{__make} clean || exit
1
- %{__make} all ARCH_CFLAGS="$COMPILE_FLAGS" </dev/null || exit 1
+ %{__make} all \
+ CROSS=m68k-elf- \
+ ARCH_CFLAGS="$COMPILE_FLAGS" </dev/null || exit 1
- install -d $RPM_BUILD_ROOT%{arch}/lib/$MULTILIB_SUBDIR
- install lib/*.[ao] $RPM_BUILD_ROOT%{arch}/lib/$MULTILIB_SUBDIR
+ install -d $RPM_BUILD_ROOT-obj/$MULTILIB_SUBDIR
+ install -m 600 lib/*.[ao] $RPM_BUILD_ROOT-obj/$MULTILIB_SUBDIR
%{target}-strip --strip-debug -R.comment -R.note \
-
$RPM_BUILD_ROOT%{arch}/lib/$MULTILIB_SUBDIR/*.[ao]
+
$RPM_BUILD_ROOT-obj/$MULTILIB_SUBDIR/*.[ao]
}
- rm -rf $RPM_BUILD_ROOT
+ _build "m5200" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5200 -Wa,-m5200"
+ _build "m5200/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5200 -Wa,-m5200 -msep-data"
+
+ _build "m5206e" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5206e -Wa,-m5206e"
+ _build "m5206e/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5206e -Wa,-m5206e -msep-data"
+
+ _build "m528x" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m528x -Wa,-m528x"
+ _build "m528x/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m528x -Wa,-m528x -msep-data"
+
+ _build "m5307" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5307 -Wa,-m5307"
+ _build "m5307/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5307 -Wa,-m5307 -msep-data"
+
+ _build "m5407" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5407 -Wa,-m5407"
+ _build "m5407/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m5407 -Wa,-m5407 -msep-data"
+
+ _build "m68040" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m68040 -Wa,-m68040"
+ _build "m68040/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m68040 -Wa,-m68040 -msep-data"
- _build "m5200" 0 "-Wa,--bitwise-or
-D__linux__=1 -m5200 -Wa,-m5200"
- _build "m5200/msep-data" 1 "-Wa,--bitwise-or
-D__linux__=1 -m5200 -Wa,-m5200 -msep-data"
+ _build "m68060" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m68060 -Wa,-m68060"
+ _build "m68060/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m68060 -Wa,-m68060 -msep-data"
+
+ _build "mcpu32" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -mcpu32 -Wa,-mcpu32"
+ _build "mcpu32/msep-data" 1 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -mcpu32 -Wa,-mcpu32 -msep-data"
+
+ _build "m68000" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -m68000 -Wa,-m68000"
+
+ _build "msoft-float" 0 "-ffunction-sections
-fdata-sections -Wa,--bitwise-or -D__linux__=1 -msoft-float"
- _build "m68000" 0 "-Wa,--bitwise-or
-D__linux__=1 -m68000 -Wa,-m68000"
- _build "m68000/msep-data" 1 "-Wa,--bitwise-or
-D__linux__=1 -m68000 -Wa,-m68000 -msep-data"
%endif
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/include
-cp -RL include/* $RPM_BUILD_ROOT%{arch}/include
-ln -s include $RPM_BUILD_ROOT%{arch}/sys-include
+install -d $RPM_BUILD_ROOT%{arch}/include
+cp -RL include/* $RPM_BUILD_ROOT%{arch}/include
+ln -s include $RPM_BUILD_ROOT%{arch}/sys-include
+
+install -d $RPM_BUILD_ROOT%{arch}/lib
+
+%if %{without bootstrap}
+cp -R $RPM_BUILD_ROOT-obj/* $RPM_BUILD_ROOT%{arch}/lib
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT-obj
%files
%defattr(644,root,root,755)
-%doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO docs/threads.txt
+%doc Changelog* DEDICATION.mjn3 README TODO docs/threads.txt
%{arch}/include
%{arch}/lib
%{arch}/sys-include
@@ -115,11 +144,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.4 2007/02/12 21:23:51 glen
-- tabs in preamble
-
-Revision 1.3 2007/02/12 00:48:43 baggins
-- converted to UTF-8
+Revision 1.5 2007/04/03 14:26:22 kosmo
+- updated:
+ uClibc: 0.9.27
+ Kernel: 2.4.32-uc0
Revision 1.2 2006/02/28 23:37:25 glen
- adapterized (killed trailing spaces/tabs)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/crossm68k-uClibc.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
