Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.17/190-dirent-include.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 --- strace-orig/file.c	2008/05/20 04:56:18	1.92

     2 +++ strace/file.c	2008/08/01 01:13:10	1.93

     3 @@ -28,21 +28,22 @@

     4   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

     5   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

     6   *

     7 - *	$Id: file.c,v 1.92 2008/05/20 04:56:18 roland Exp $

     8 + *	$Id: file.c,v 1.93 2008/08/01 01:13:10 roland Exp $

     9   */

    10  

    11  #include "defs.h"

    12  

    13  #include <dirent.h>

    14 +

    15  #ifdef LINUX

    16 -#define dirent kernel_dirent

    17 -#define dirent64 kernel_dirent64

    18 -#include <linux/types.h>

    19 -#include <linux/dirent.h>

    20 -#undef dirent

    21 -#undef dirent64

    22 +struct kernel_dirent {

    23 +	unsigned long   d_ino;

    24 +	unsigned long   d_off;

    25 +	unsigned short  d_reclen;

    26 +	char            d_name[1];

    27 +};

    28  #else

    29 -#define kernel_dirent dirent

    30 +# define kernel_dirent dirent

    31  #endif

    32  

    33  #ifdef LINUX
crosstool-ng