]> git.pld-linux.org Git - packages/uClibc.git/blobdiff - uClibc.spec
- rediff patches
[packages/uClibc.git] / uClibc.spec
index 5f5477ed7840db2eb64de647470eb3c8a1431764..e3d5655e620fc96406b1725a7dcab75ef7a3e2d7 100644 (file)
@@ -1,52 +1,59 @@
-# TODO
-# - unpackaged list:
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-addr2line
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-ar
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-as
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-c++
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-cc
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-cpp
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-g++
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-gasp
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-gcc
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-ld
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-nm
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-objcopy
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-objdump
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-ranlib
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-size
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-strings
-#   /usr/x86_64-linux-uclibc/bin/x86_64-uclibc-strip
+#
+# Conditional build:
+%bcond_without shared          # don't build shared lib support
+%bcond_with    nptl            # libpthread: NPTL instead of LinuxThreads (experimental; no i386)
+%bcond_without verbose         # verbose mode
+#
+%ifarch alpha
+%undefine      with_shared
+%endif
+#
 Summary:       C library optimized for size
 Summary(pl.UTF-8):     Biblioteka C zoptymalizowana na rozmiar
 Name:          uClibc
-Version:       0.9.29
-Release:       11
-Epoch:         2
+Version:       0.9.33.2
+Release:       34
+Epoch:         4
 License:       LGPL v2.1
 Group:         Libraries
-Source0:       http://uclibc.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 61dc55f43b17a38a074f347e74095b20
+Source0:       http://uclibc.org/downloads/%{name}-%{version}.tar.xz
+# Source0-md5: 73e6fe215648d02246f4d195b25fb17e
 Patch0:                %{name}-newsoname.patch
 Patch1:                %{name}-toolchain-wrapper.patch
 Patch2:                %{name}-targetcpu.patch
 Patch3:                %{name}-debug.patch
 Patch4:                %{name}-stdio-unhide.patch
-Patch5:                %{name}-sparc.patch
+Patch5:                %{name}-kernel-types.patch
+Patch6:                %{name}-features.patch
 URL:           http://uclibc.org/
-BuildRequires: binutils-gasp
+BuildRequires: binutils >= 2.16
+BuildRequires: cpp
+%if %{with nptl}
+BuildRequires: gcc >= 5:4.1
+%else
 BuildRequires: gcc >= 5:3.0
-BuildRequires: linux-libc-headers >= 7:2.6.24
+%endif
+BuildRequires: linux-libc-headers >= 7:2.6.27
+BuildRequires: make >= 3.80
+BuildRequires: ncurses-devel
+BuildRequires: rpmbuild(macros) >= 1.453
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
 BuildRequires: which
+BuildRequires: xz
+%{?with_nptl:Requires: uname(version) >= 2.6}
+# only these supported by this .spec; uClibc code supports some more
 ExclusiveArch: alpha %{ix86} ppc sparc sparcv9 %{x8664}
+%{?with_nptl:ExcludeArch:      i386}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                uclibc_root     /usr/%{_target_cpu}-linux-uclibc
-# note: the 2nd '\' is needed (some shell expansions?)
-%define                TARGET_ARCH     %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/')
-
+%if "%{cc_version}" >= "4.2"
 %define                specflags       -fgnu89-inline
+%endif
+
+%define                filterout       -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4
+
+%define                uclibc_root     /usr/%{_target_cpu}-linux-uclibc
 
 %description
 Small libc for building embedded applications.
@@ -59,8 +66,7 @@ Summary:      Development files for uClibc
 Summary(pl.UTF-8):     Pliki dla programistów uClibc
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      binutils
-Requires:      linux-libc-headers >= 7:2.6.24
+Requires:      linux-libc-headers >= 7:2.6.27
 %requires_eq   gcc
 
 %description devel
@@ -89,94 +95,183 @@ Biblioteki statyczne uClibc.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-# check if it's needed now... ldso is broken on sparc anyway
-#%patch5 -p1
+%patch5 -p1
+%patch6 -p1
 
-sed -i -e '
-%ifarch sparc sparcv9
-       s/default TARGET_i386/default TARGET_sparc/
+# ARCH is already determined by uname -m
+%ifarch %{ix86}
+defconfig=extra/Configs/defconfigs/i386/defconfig
+%ifarch i386
+echo 'CONFIG_386=y' >> $defconfig
 %endif
-%ifarch alpha
-       s/default TARGET_i386/default TARGET_alpha/
+%ifarch i486
+echo 'CONFIG_486=y' >> $defconfig
+%endif
+%ifarch i586
+echo 'CONFIG_586=y' >> $defconfig
+%endif
+%ifarch i686
+echo 'CONFIG_686=y' >> $defconfig
+%endif
+%ifarch pentium3
+echo 'CONFIG_PENTIUMIII=y' >> $defconfig
+%endif
+%ifarch pentium4
+echo 'CONFIG_PENTIUM4=y' >> $defconfig
+%endif
+%ifarch athlon
+echo 'CONFIG_K7=y' >> $defconfig
 %endif
-%ifarch ppc ppc64
-       s/default TARGET_i386/default TARGET_powerpc/
 %endif
 %ifarch %{x8664}
-       s/default TARGET_i386/default TARGET_x86_64/
+defconfig=extra/Configs/defconfigs/x86_64/defconfig
+%endif
+%ifarch alpha
+defconfig=extra/Configs/defconfigs/alpha/defconfig
+%endif
+%ifarch sparc sparcv9
+defconfig=extra/Configs/defconfigs/sparc/defconfig
+%endif
+%ifarch ppc
+defconfig=extra/Configs/defconfigs/powerpc/defconfig
+%endif
+%ifarch ia64
+defconfig=extra/Configs/defconfigs/ia64/defconfig
 %endif
-       ' extra/Configs/Config.in
+
+cat <<'EOF' >> $defconfig
+# HAS_NO_THREADS is not set
+%{!?with_nptl:LINUXTHREADS_OLD=y}
+%{?with_nptl:UCLIBC_HAS_THREADS_NATIVE=y}
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+DO_C99_MATH=y
+UCLIBC_HAS_RPC=y
+# UCLIBC_HAS_FULL_RPC is not set
+# UCLIBC_HAS_REENTRANT_RPC is not set
+UCLIBC_HAS_SYS_SIGLIST=y
+SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)/lib"
+LDSO_GNU_HASH_SUPPORT=y
+%if %{without shared}
+HAVE_NO_SHARED=y
+# HAVE_SHARED is not set
+%endif
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_SUSV4_LEGACY=y
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_COMPAT_RES_STATE=y
+UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y
+# DOSTRIP is not set
+%{?debug:DODEBUG=y}
+%{?debug:SUPPORT_LD_DEBUG=y}
+%{?debug:SUPPORT_LD_DEBUG_EARLY=y}
+EOF
 
 %build
+# use ld.bfd; gold doesn't work well for now
+install -d our-ld
+ln -s %{_bindir}/ld.bfd our-ld/ld
+PATH=$(pwd)/our-ld:$PATH; export PATH
+
+# NOTE: 'defconfig' and 'all' must be run in separate make process because of macros
 %{__make} -j1 defconfig \
-       TARGET_ARCH="%{TARGET_ARCH}" \
+       %{?with_verbose:VERBOSE=1} \
        TARGET_CPU="%{_target_cpu}" \
-       KERNEL_SOURCE=%{_prefix} \
+       GCC_BIN=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
        HOSTCC="%{__cc}" \
+       CC="%{__cc}" \
        HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \
-       OPTIMIZATION="%{rpmcflags} -Os" \
-       CC="%{__cc}"
-
-sed -i -e '
-       s/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/;
-       s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/;
-       s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set\n# UCLIBC_HAS_REENTRANT_RPC is not set/;
-       s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/;
-       s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)/lib",
-       s/^.*UCLIBC_HAS_PRINTF_M_SPEC.*$/UCLIBC_HAS_PRINTF_M_SPEC=y/;
-       s/^.*UCLIBC_SUSV3_LEGACY.*$/UCLIBC_SUSV3_LEGACY=y\nUCLIBC_SUSV3_LEGACY_MACROS=y/;
-       s/^.*\<DOSTRIP\>.*$/# DOSTRIP is not set/;
-%{?debug:s/^.*\<DODEBUG\>.*$/DODEBUG=y/;s/^.*SUPPORT_LD_DEBUG\>.*$/SUPPORT_LD_DEBUG=y/;s/^.*SUPPORT_LD_DEBUG_EARLY.*$/SUPPORT_LD_DEBUG_EARLY=y/;}
-' .config
-
-# force regeneration after .config changes
-rm -f include/bits/uClibc_config.h
-
-# note: defconfig and all must be run in separate make process because of macros
+       OPTIMIZATION="%{rpmcflags} -Os"
+
+# The Makefile includes .config and later tries to assign same variable,
+# eventually it gets lost and sets wrong value for TARGET_ARCH and bad value
+# for UCLIBC_LDSO in extra/gcc-uClibc.
+# So we pass it as make arg to be sure it's proper!
+target_arch=$(grep -s '^TARGET_ARCH' .config | sed -e 's/^TARGET_ARCH=//' -e 's/"//g')
+
 %{__make} -j1 \
-       TARGET_ARCH="%{TARGET_ARCH}" \
+       %{?with_verbose:VERBOSE=1} \
        TARGET_CPU="%{_target_cpu}" \
-       KERNEL_SOURCE=%{_prefix} \
+       TARGET_ARCH=$target_arch \
+       GCC_BIN=%{_host_cpu}-%{_vendor}-%{_os}-gcc \
        HOSTCC="%{__cc}" \
+       CC="%{__cc}" \
        HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \
-       OPTIMIZATION="%{rpmcflags} -Os" \
-       CC="%{__cc}"
+       OPTIMIZATION="%{rpmcflags} -Os"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} -j1 install \
-       NATIVE_CC="%{__cc}" \
-       NATIVE_CFLAGS="%{rpmcflags} %{rpmldflags}" \
-       TARGET_ARCH="%{TARGET_ARCH}" \
+       %{?with_verbose:VERBOSE=1} \
        TARGET_CPU="%{_target_cpu}" \
+       HOSTCC="%{__cc}" \
+       HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \
        CC="%{__cc}" \
-       PREFIX=$RPM_BUILD_ROOT
+       OPTIMIZATION="%{rpmcflags} -Os" \
+       DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with shared}
+%if %{without nptl}
 mv -f $RPM_BUILD_ROOT%{uclibc_root}/usr/lib/{libpthread-uclibc,libpthread}.so
-ln -sf libpthread-0.9.29.so $RPM_BUILD_ROOT%{uclibc_root}/lib/libpthread.so.0
+ln -sf libpthread-%{version}.so $RPM_BUILD_ROOT%{uclibc_root}/lib/libpthread.so.0
+%endif
+chmod a+rx $RPM_BUILD_ROOT%{uclibc_root}/lib/*.so
+%endif
 
 # these links are *needed* (by stuff in bin/)
 for f in $RPM_BUILD_ROOT%{uclibc_root}/bin/*; do
-       mv -f $f $RPM_BUILD_ROOT%{_bindir}
-       ln -sf ../../bin/`basename $f` $f
+       if [ -L $f ]; then
+               l=$(readlink $f)
+               a=${l##*/}
+               d=${l%/*}
+               case "$d" in
+               %{_bindir})
+                       ln -sf ${l#%{_bindir}/} $RPM_BUILD_ROOT%{_bindir}/${f##*/}
+                       rm -f $f
+                       ;;
+               $a)
+                       mv -f $f $RPM_BUILD_ROOT%{_bindir}
+                       ;;
+               *)
+                       exit 1
+                       ;;
+               esac
+       else
+               a=${f#*/%{_target_cpu}-uclibc-}
+               ln -sf %{_bindir}/$(basename $f) $RPM_BUILD_ROOT%{uclibc_root}/usr/bin/$a
+               mv -f $f $RPM_BUILD_ROOT%{_bindir}
+       fi
 done
 
-for f in c++ cc g++ gcc ld; do
-       ln -sf /usr/bin/%{_target_cpu}-uclibc-$f \
-               $RPM_BUILD_ROOT%{uclibc_root}/usr/bin/$f
+for f in $RPM_BUILD_ROOT%{uclibc_root}/usr/bin/*; do
+       if [ -L $f ]; then
+               l=$(readlink $f)
+               case "${l%/*}" in
+               %{uclibc_root}/bin)
+                       a=${l#*/%{_target_cpu}-uclibc-}
+                       ln -sf %{_bindir}/$a $f
+                       ;;
+               %{_bindir})
+                       :
+                       ;;
+               *)
+                       exit 2
+                       ;;
+               esac
+       fi
 done
 
-rm -rf $RPM_BUILD_ROOT%{uclibc_root}/usr/include/{linux,asm*}
-ln -sf /usr/include/asm $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm
-ln -sf /usr/include/asm-generic $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm-generic
-# for future use
-%ifarch sparc64
-ln -sf /usr/include/asm-sparc $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm-sparc
-ln -sf /usr/include/asm-sparc64 $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm-sparc64
-%endif
-ln -sf /usr/include/linux $RPM_BUILD_ROOT%{uclibc_root}/usr/include/linux
+# rpm -ql linux-libc-headers | awk -F/ ' /^\/usr\/include\// { print "/usr/include/" $4 } ' | sort -u
+for dir in asm asm-generic linux mtd rdma sound video xen; do
+       ln -sf /usr/include/${dir} $RPM_BUILD_ROOT%{uclibc_root}/usr/include/${dir}
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -186,23 +281,57 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO
 %dir %{uclibc_root}
 %ifarch %{ix86} %{x8664} ppc sparc sparcv9
+%if %{with shared}
 %dir %{uclibc_root}/lib
 %attr(755,root,root) %{uclibc_root}/lib/*.so*
 %endif
+%endif
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs/*.txt
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-addr2line
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-ar
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-as
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-c++
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-cc
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-cpp
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-g++
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-gcc
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-ld
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-nm
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-objcopy
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-objdump
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-ranlib
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-size
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-strings
+%attr(755,root,root) %{_bindir}/%{_target_cpu}-uclibc-strip
 %{uclibc_root}/usr/lib/*.o
 %dir %{uclibc_root}/usr
 %dir %{uclibc_root}/usr/bin
-%attr(755,root,root) %{uclibc_root}/usr/bin/*
+%attr(755,root,root) %{uclibc_root}/usr/bin/addr2line
+%attr(755,root,root) %{uclibc_root}/usr/bin/ar
+%attr(755,root,root) %{uclibc_root}/usr/bin/as
+%attr(755,root,root) %{uclibc_root}/usr/bin/c++
+%attr(755,root,root) %{uclibc_root}/usr/bin/cc
+%attr(755,root,root) %{uclibc_root}/usr/bin/cpp
+%attr(755,root,root) %{uclibc_root}/usr/bin/g++
+%attr(755,root,root) %{uclibc_root}/usr/bin/gcc
+%attr(755,root,root) %{uclibc_root}/usr/bin/ld
+%attr(755,root,root) %{uclibc_root}/usr/bin/nm
+%attr(755,root,root) %{uclibc_root}/usr/bin/objcopy
+%attr(755,root,root) %{uclibc_root}/usr/bin/objdump
+%attr(755,root,root) %{uclibc_root}/usr/bin/ranlib
+%attr(755,root,root) %{uclibc_root}/usr/bin/size
+%attr(755,root,root) %{uclibc_root}/usr/bin/strings
+%attr(755,root,root) %{uclibc_root}/usr/bin/strip
 %dir %{uclibc_root}/usr/lib
+%if %{with shared}
 %{uclibc_root}/usr/lib/uclibc_nonshared.a
 %ifarch %{ix86} %{x8664} ppc sparc sparcv9
 %attr(755,root,root) %{uclibc_root}/usr/lib/*.so
 %endif
+%endif
 %{uclibc_root}/usr/include
 
 %files static
This page took 0.172903 seconds and 4 git commands to generate.