Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/uClibc/0.9.32/110-nptl-Makefile.in-Fix-the-build-break-caused-by-UCLIBC_CTOR_DTOR-enabling.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 commit fc643f77a3abc8743620445f47b1bade9862d45a

     2 Author: Khem Raj <raj.khem@gmail.com>

     3 Date:   Fri Jun 10 13:05:34 2011 -0700

     4 

     5     nptl/Makefile.in: Fix the build break caused by UCLIBC_CTOR_DTOR enabling

     6     

     7     Extra / somehow does not match the target and complains that

     8     $(top_builddir)libpthread/nptl/sysdeps/pthread/crti.o has no rules to

     9     build

    10     

    11     Signed-off-by: Khem Raj <raj.khem@gmail.com>

    12     Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

    13 

    14 diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in

    15 index 70616a1..92d72a6 100644

    16 --- a/libpthread/nptl/Makefile.in

    17 +++ b/libpthread/nptl/Makefile.in

    18 @@ -64,8 +64,8 @@ endif

    19  librt-so-y += $(librt_OBJS:.o=.oS) $(librt-pt-shared-only-routines-y:.o=.oS)

    20  

    21  ifeq ($(UCLIBC_CTOR_DTOR),y)

    22 -START_FILE-libpthread.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crti.o

    23 -END_FILE-libpthread.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crtn.o

    24 +START_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/crti.o

    25 +END_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/crtn.o

    26  LDFLAGS-libpthread.so += -nostartfiles

    27  $(top_builddir)lib/libpthread.so: | $(START_FILE-libpthread.so) $(END_FILE-libpthread.so)

    28  endif
crosstool-ng