Author: qboosh Date: Sun Jun 12 09:27:40 2011 GMT Module: packages Tag: DEVEL ---- Log message: - dropped gasp from toolchain (updated toolchain-wrapper,targetcpu patches) - added nptl bcond (experimental, not on i386), updated newsoname patch to cover nptl libpthread
---- Files affected: packages/uClibc: uClibc-newsoname.patch (1.5.4.1 -> 1.5.4.2) , uClibc-targetcpu.patch (1.5.2.3 -> 1.5.2.4) , uClibc-toolchain-wrapper.patch (1.14.4.1 -> 1.14.4.2) , uClibc.spec (1.195.4.3 -> 1.195.4.4) ---- Diffs: ================================================================ Index: packages/uClibc/uClibc-newsoname.patch diff -u packages/uClibc/uClibc-newsoname.patch:1.5.4.1 packages/uClibc/uClibc-newsoname.patch:1.5.4.2 --- packages/uClibc/uClibc-newsoname.patch:1.5.4.1 Sun Jun 12 10:23:37 2011 +++ packages/uClibc/uClibc-newsoname.patch Sun Jun 12 11:27:34 2011 @@ -102,3 +102,60 @@ ifeq ($(PTHREADS_DEBUG_SUPPORT),y) $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug) endif +--- uClibc-0.9.32/libpthread/nptl/Makefile.in.orig 2011-06-08 21:35:20.000000000 +0200 ++++ uClibc-0.9.32/libpthread/nptl/Makefile.in 2011-06-12 10:54:46.594236173 +0200 +@@ -64,17 +64,17 @@ + librt-so-y += $(librt_OBJS:.o=.oS) $(librt-pt-shared-only-routines-y:.o=.oS) + + ifeq ($(UCLIBC_CTOR_DTOR),y) +-START_FILE-libpthread.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crti.o +-END_FILE-libpthread.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crtn.o +-LDFLAGS-libpthread.so += -nostartfiles +-$(top_builddir)lib/libpthread.so: | $(START_FILE-libpthread.so) $(END_FILE-libpthread.so) ++START_FILE-libpthread-uclibc.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crti.o ++END_FILE-libpthread-uclibc.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crtn.o ++LDFLAGS-libpthread-uclibc.so += -nostartfiles ++$(top_builddir)lib/libpthread-uclibc.so: | $(START_FILE-libpthread-uclibc.so) $(END_FILE-libpthread-uclibc.so) + endif + + libpthread_FULL_NAME := libpthread-$(VERSION).so + lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a +-lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so ++lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread-uclibc.so + +-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(libdl.depend) $(top_builddir)lib/libpthread_nonshared.a ++$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(libdl.depend) $(top_builddir)lib/libpthread_nonshared.a + $(call link.so,$(libpthread_FULL_NAME),$(ABI_VERSION)) + $(Q)cat $(top_srcdir)extra/scripts/format.lds > [email protected] + $(Q)echo "GROUP ( $(notdir $@).$(ABI_VERSION) libpthread_nonshared.a )" >> [email protected] +@@ -92,6 +92,10 @@ + $(Q)$(RM) $@ + $(do_ar) + ++$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so ++ $(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION) ++ $(LN) -sf $(notdir $<) $@ ++ + # + # Create 'pthread-errnos.h' header file. + # +@@ -139,15 +143,15 @@ + $(do_rm) $(addprefix $(libpthread_OUT)/*., o os oS a) + + ifeq ($(PTHREADS_DEBUG_SUPPORT),y) +-LDFLAGS-libpthread.so += $(LDFLAGS_NOSTRIP) -Wl,-z,defs ++LDFLAGS-libpthread-uclibc.so += $(LDFLAGS_NOSTRIP) -Wl,-z,defs + else +-LDFLAGS-libpthread.so += $(LDFLAGS) ++LDFLAGS-libpthread-uclibc.so += $(LDFLAGS) + endif + +-LDFLAGS-libpthread.so += $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so $(top_builddir)lib/libdl-$(VERSION).so \ ++LDFLAGS-libpthread-uclibc.so += $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so $(top_builddir)lib/libdl-$(VERSION).so \ + -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal + +-LIBS-libpthread.so := $(LIBS) ++LIBS-libpthread-uclibc.so := $(LIBS) + + CFLAGS-nptl = -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS) + ================================================================ Index: packages/uClibc/uClibc-targetcpu.patch diff -u packages/uClibc/uClibc-targetcpu.patch:1.5.2.3 packages/uClibc/uClibc-targetcpu.patch:1.5.2.4 --- packages/uClibc/uClibc-targetcpu.patch:1.5.2.3 Sun Nov 5 21:19:08 2006 +++ packages/uClibc/uClibc-targetcpu.patch Sun Jun 12 11:27:34 2011 @@ -64,7 +64,7 @@ + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++ + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++ endif - for app in addr2line ar as cpp gasp nm objcopy \ + for app in addr2line ar as cpp nm objcopy \ objdump ranlib size strings strip; do \ APPNAME=`which $(CROSS)$${app}`; \ if [ -x "$$APPNAME" ] ; then \ ================================================================ Index: packages/uClibc/uClibc-toolchain-wrapper.patch diff -u packages/uClibc/uClibc-toolchain-wrapper.patch:1.14.4.1 packages/uClibc/uClibc-toolchain-wrapper.patch:1.14.4.2 --- packages/uClibc/uClibc-toolchain-wrapper.patch:1.14.4.1 Sun Jun 12 10:23:37 2011 +++ packages/uClibc/uClibc-toolchain-wrapper.patch Sun Jun 12 11:27:34 2011 @@ -758,7 +758,7 @@ + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++ + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++ +endif -+ for app in addr2line ar as cpp gasp nm objcopy \ ++ for app in addr2line ar as cpp nm objcopy \ + objdump ranlib size strings strip; do \ + APPNAME=`which $(CROSS)$${app}`; \ + if [ -x "$$APPNAME" ] ; then \ ================================================================ Index: packages/uClibc/uClibc.spec diff -u packages/uClibc/uClibc.spec:1.195.4.3 packages/uClibc/uClibc.spec:1.195.4.4 --- packages/uClibc/uClibc.spec:1.195.4.3 Sun Jun 12 10:23:37 2011 +++ packages/uClibc/uClibc.spec Sun Jun 12 11:27:34 2011 @@ -2,6 +2,7 @@ # # Conditional build: %bcond_without shared # don't build shared lib support +%bcond_with nptl # libpthread: NPTL instead of LinuxThreads (experimental; no i386) %bcond_with verbose # verbose mode # %ifarch alpha @@ -25,9 +26,13 @@ Patch4: %{name}-stdio-unhide.patch Patch5: %{name}-epoll.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 +%endif BuildRequires: linux-libc-headers >= 7:2.6.27 BuildRequires: make >= 3.80 BuildRequires: ncurses-devel @@ -36,7 +41,10 @@ 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) %if "%{cc_version}" >= "4.2" @@ -56,7 +64,6 @@ Summary(pl.UTF-8): Pliki dla programistów uClibc Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: binutils-gasp Requires: linux-libc-headers >= 7:2.6.27 %requires_eq gcc @@ -131,7 +138,8 @@ cat <<'EOF' >> $defconfig # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y +%{!?with_nptl:LINUXTHREADS_OLD=y} +%{?with_nptl:UCLIBC_HAS_THREADS_NATIVE=y} UCLIBC_HAS_IPV6=y DO_C99_MATH=y UCLIBC_HAS_RPC=y @@ -196,8 +204,10 @@ 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-%{version}.so $RPM_BUILD_ROOT%{uclibc_root}/lib/libpthread.so.0 +%endif chmod a+rx $RPM_BUILD_ROOT%{uclibc_root}/lib/*.so %endif @@ -273,7 +283,6 @@ %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-gasp %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 @@ -293,7 +302,6 @@ %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/gasp %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 @@ -322,6 +330,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.195.4.4 2011/06/12 09:27:34 qboosh +- dropped gasp from toolchain (updated toolchain-wrapper,targetcpu patches) +- added nptl bcond (experimental, not on i386), updated newsoname patch to cover nptl libpthread + Revision 1.195.4.3 2011/06/12 08:23:37 qboosh - updated to 0.9.32 - updated newsoname,toolchain-wrapper,debug,stdio-unhide patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-newsoname.patch?r1=1.5.4.1&r2=1.5.4.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-targetcpu.patch?r1=1.5.2.3&r2=1.5.2.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-toolchain-wrapper.patch?r1=1.14.4.1&r2=1.14.4.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc.spec?r1=1.195.4.3&r2=1.195.4.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
