OpenPKG Specs: perl-net/perl-net.patch@4a34d7a82eab (annotated)

perl-net/perl-net.patch@4a34d7a82eab (annotated)

perl-net/perl-net.patch

Tue, 29 Mar 2011 20:04:34 +0200

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Tue, 29 Mar 2011 20:04:34 +0200
changeset 334: 4a34d7a82eab
child 372: 442a711da911
permissions: -rw-r--r--

Rework package yet again, correcting and introducing new buildconf logic:
Conditionally disable bootstrap stage comparison correctly, correct
english grammar, better find system as(1) and ld(1), indotruce detailed
optimization option messages, more completely guess cpu types, allow
profiled bootstrapping without a preinstalled GCC because many other
compilers have long since implemented 64-bit arithmetic, instruct make
to build sequentially (not in sparallel) when building a profiled
bootstrap as GCC online documents recommend, and generally improve
comment blocks.

The single most important correction in this changeset relates to the
GCC changed optimization policy since at least GCC 4.5, in which -march
is always passed and not always correctly guessed. In the case of this
package, allowing GCC to guess the architecture leads to wild build
errors at various subcomponents (zlib, libgcc, libiberty...) and
bootstrap stages. It seems quite platform specific, and the safest
approach to correcting this seems to be explicitly always specifying the
-march argument when bootstrapping GCC. Because the best choice 'native'
is not available when bootstrapping using a foreign (non GCC) compiler,
a guess is made according to rpmmacros l_platform in that case.

It is questionable as to whether these recent optimization changes
on the part of GCC or this package are compatible with each other,
or if either are complete or correct at all. At least applying these
corrections allows this package to build again in most cases test.

 Index: Net-Packet-3.26/Makefile.PL
 --- Net-Packet-3.26/Makefile.PL.orig	2006-12-16 16:26:26 +0100
 +++ Net-Packet-3.26/Makefile.PL	2008-01-01 22:05:18 +0100
@@ -14,7 +14,6 @@
        Net::Libdnet  => 0,
        Time::HiRes   => 0,
        Net::IPv6Addr => 0,
 -      Socket6       => 0,
        Bit::Vector   => 0,
     },
     ABSTRACT_FROM => 'lib/Net/Packet.pm',
 Index: Net-Patricia-1.014/libpatricia/patricia.c
 --- Net-Patricia-1.014/libpatricia/patricia.c.orig	2005-12-07 21:55:39 +0100
 +++ Net-Patricia-1.014/libpatricia/patricia.c	2008-01-01 22:05:18 +0100
@@ -38,24 +38,24 @@
  /* prefix_tochar
   * convert prefix information to bytes
   */
 -u_char *
 +unsigned char *
  prefix_tochar (prefix_t * prefix)
  {
      if (prefix == NULL)
  	return (NULL);
 -    return ((u_char *) & prefix->add.sin);
 +    return ((unsigned char *) & prefix->add.sin);
  }
  int
 -comp_with_mask (void *addr, void *dest, u_int mask)
 +comp_with_mask (void *addr, void *dest, unsigned int mask)
  {
      if ( /* mask/8 == 0 || */ memcmp (addr, dest, mask / 8) == 0) {
  	int n = mask / 8;
  	int m = ((-1) << (8 - (mask % 8)));
 -	if (mask % 8 == 0 || (((u_char *)addr)[n] & m) == (((u_char *)dest)[n] & m))
 +	if (mask % 8 == 0 || (((unsigned char *)addr)[n] & m) == (((unsigned char *)dest)[n] & m))
  	    return (1);
      }
      return (0);
@@ -70,7 +70,7 @@
  int
  inet_pton (int af, const char *src, void *dst)
  {
 -    u_long result;
 +    unsigned long result;
      if (af == AF_INET) {
  	result = inet_addr(src);
@@ -104,7 +104,7 @@
  {
      if (af == AF_INET) {
          int i, c, val;
 -        u_char xp[4] = {0, 0, 0, 0};
 +        unsigned char xp[4] = {0, 0, 0, 0};
          for (i = 0; ; i++) {
  	    c = *src++;
@@ -153,7 +153,7 @@
          struct buffer {
              char buffs[16][48+5];
 -            u_int i;
 +            unsigned int i;
          } *buffp;
  #    if 0
@@ -172,7 +172,7 @@
  	buff = buffp->buffs[buffp->i++%16];
      }
      if (prefix->family == AF_INET) {
 -	u_char *a;
 +	unsigned char *a;
  	assert (prefix->bitlen <= 32);
  	a = prefix_touchar (prefix);
  	if (with_len) {
@@ -272,7 +272,7 @@
  prefix_t *
  ascii2prefix (int family, char *string)
  {
 -    u_long bitlen, maxbitlen = 0;
 +    unsigned long bitlen, maxbitlen = 0;
      char *cp;
      struct in_addr sin;
  #ifdef HAVE_IPV6
@@ -491,8 +491,8 @@
  patricia_search_exact (patricia_tree_t *patricia, prefix_t *prefix)
  {
      patricia_node_t *node;
 -    u_char *addr;
 -    u_int bitlen;
 +    unsigned char *addr;
 +    unsigned int bitlen;
      assert (patricia);
      assert (prefix);
@@ -563,8 +563,8 @@
  {
      patricia_node_t *node;
      patricia_node_t *stack[PATRICIA_MAXBITS + 1];
 -    u_char *addr;
 -    u_int bitlen;
 +    unsigned char *addr;
 +    unsigned int bitlen;
      int cnt = 0;
      assert (patricia);
@@ -662,8 +662,8 @@
  patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
  {
      patricia_node_t *node, *new_node, *parent, *glue;
 -    u_char *addr, *test_addr;
 -    u_int bitlen, check_bit, differ_bit;
 +    unsigned char *addr, *test_addr;
 +    unsigned int bitlen, check_bit, differ_bit;
      int i, j, r;
      assert (patricia);
 Index: Net-Patricia-1.014/libpatricia/patricia.h
 --- Net-Patricia-1.014/libpatricia/patricia.h.orig	2005-12-07 21:54:52 +0100
 +++ Net-Patricia-1.014/libpatricia/patricia.h	2008-01-01 22:05:18 +0100
@@ -15,10 +15,10 @@
  #ifndef _PATRICIA_H
  #define _PATRICIA_H
 -/* typedef unsigned int u_int; */
 +/* typedef unsigned int unsigned int; */
  typedef void (*void_fn_t)();
  /* { from defs.h */
 -#define prefix_touchar(prefix) ((u_char *)&(prefix)->add.sin)
 +#define prefix_touchar(prefix) ((unsigned char *)&(prefix)->add.sin)
  #define MAXLINE 1024
  #define BIT_TEST(f, b)  ((f) & (b))
  /* } */
@@ -40,15 +40,15 @@
  /* { from mrt.h */
  typedef struct _prefix4_t {
 -    u_short family;		/* AF_INET | AF_INET6 */
 -    u_short bitlen;		/* same as mask? */
 +    unsigned short family;		/* AF_INET | AF_INET6 */
 +    unsigned short bitlen;		/* same as mask? */
      int ref_count;		/* reference count */
      struct in_addr sin;
  } prefix4_t;
  typedef struct _prefix_t {
 -    u_short family;		/* AF_INET | AF_INET6 */
 -    u_short bitlen;		/* same as mask? */
 +    unsigned short family;		/* AF_INET | AF_INET6 */
 +    unsigned short bitlen;		/* same as mask? */
      int ref_count;		/* reference count */
      union {
  		struct in_addr sin;
@@ -61,7 +61,7 @@
  /* } */
  typedef struct _patricia_node_t {
 -   u_int bit;			/* flag if this node used */
 +   unsigned int bit;			/* flag if this node used */
     prefix_t *prefix;		/* who we are in patricia tree */
     struct _patricia_node_t *l, *r;	/* left and right children */
     struct _patricia_node_t *parent;/* may be used */
@@ -71,7 +71,7 @@
  typedef struct _patricia_tree_t {
     patricia_node_t 	*head;
 -   u_int		maxbits;	/* for IP, 32 bit addresses */
 +   unsigned int		maxbits;	/* for IP, 32 bit addresses */
     int num_active_node;		/* for debug purpose */
  } patricia_tree_t;
 Index: Net-Pcap-0.16/Makefile.PL
 --- Net-Pcap-0.16/Makefile.PL.orig	2007-12-24 00:06:15 +0100
 +++ Net-Pcap-0.16/Makefile.PL	2008-01-01 22:08:20 +0100
@@ -23,7 +23,8 @@
  }
  else {
      $options{CCFLAGS} = '-Wall -Wwrite-strings' if $Config{ccname} eq 'gcc' and $] >= 5.006;
 -    $options{LIBS}    = '-lpcap';
 +    $options{INC}     = '-I@l_prefix@/include';
 +    $options{LIBS}    = '-L@l_prefix@/lib -lpcap';
  }
  for my $arg (@ARGV) {
 Index: Net-Pcap-0.16/Pcap.xs
 --- Net-Pcap-0.16/Pcap.xs.orig	2008-01-01 05:22:22 +0100
 +++ Net-Pcap-0.16/Pcap.xs	2008-01-01 22:05:18 +0100
@@ -33,7 +33,7 @@
  #define NEED_sv_2pv_nolen 1
  #include "ppport.h"
 -#include <pcap.h>
 +#include "pcap.h"
  #ifdef _CYGWIN
  #include <Win32-Extensions.h>

OpenPKG Specs / annotate

perl-net/perl-net.patch@4a34d7a82eab (annotated)

perl-net/perl-net.patch