sources/aiccu/100-cross_compile.patch

   1 --- aiccu/unix-console/Makefile.orig    2007-01-15 11:04:27.000000000 +0000
   2 +++ aiccu/unix-console/Makefile 2008-08-21 21:05:37.639630401 +0000
   3 @@ -25,7 +25,8 @@
   4  # CWARNS += -Wpacked
   5
   6  #CFLAGS        += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
   7 -CFLAGS += $(CWARNS) -D_GNU_SOURCE
   8 +CFLAGS += $(CWARNS) $(EXTRA_CFLAGS) -D_GNU_SOURCE
   9 +LDFLAGS += $(EXTRA_LDFLAGS)
  10  CC      = @gcc
  11  RM      = rm
  12
  13 @@ -40,25 +41,25 @@
  14  # GnuTLS Support ?
  15  # Used by TIC to secure that communication
  16  # Currently defaultly builds only on Linux, but other platforms might easily also support it
  17 -ifeq ($(shell uname | grep -c "Linux"),1)
  18 +ifneq ($(HAVE_GNUTLS),)
  19  CFLAGS += -D AICCU_GNUTLS
  20  LDFLAGS += -lgnutls
  21  endif
  22
  23  # Linux
  24 -ifeq ($(shell uname | grep -c "Linux"),1)
  25 +ifeq ($(OS_NAME),Linux)
  26  CFLAGS  += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
  27  SRCS   += ../common/aiccu_linux.c
  28  OBJS   += ../common/aiccu_linux.o
  29 -LDFLAGS        += -lpthread -lresolv
  30 +LDFLAGS        += -pthread -lresolv
  31  endif
  32
  33  # FreeBSD
  34 -ifeq ($(shell uname | grep -c "FreeBSD"),1)
  35 +ifeq ($(OS_NAME),FreeBSD)
  36  CFLAGS += -D_FREEBSD
  37
  38  # FreeBSD 4.x
  39 -ifeq ($(shell uname -r | cut -c 1),4)
  40 +ifeq ($(shell echo $(OS_VERSION) | cut -c 1),4)
  41  CFLAGS += -D AICCU_TYPE="\"freebsd4\""
  42  SRCS   += ../common/aiccu_freebsd4.c
  43  OBJS   += ../common/aiccu_freebsd4.o
  44 @@ -71,7 +72,7 @@
  45  endif
  46
  47  # DragonFlyBSD
  48 -ifeq ($(shell uname | grep -c "DragonFly"),1)
  49 +ifeq ($(OS_NAME),DragonFly)
  50  CFLAGS += -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
  51  SRCS   += ../common/aiccu_freebsd4.c
  52  OBJS   += ../common/aiccu_freebsd4.o
  53 @@ -79,7 +80,7 @@
  54  endif
  55
  56  # NetBSD
  57 -ifeq ($(shell uname | grep -c "NetBSD"),1)
  58 +ifeq ($(OS_NAME),NetBSD)
  59  CFLAGS += -D_NETBSD -D AICCU_TYPE="\"kame\""
  60
  61  # Check if net/if_tun.h has TUNSIFHEAD and enable support for it
  62 @@ -97,10 +98,10 @@
  63  endif
  64
  65  # OpenBSD
  66 -ifeq ($(shell uname | grep -c "OpenBSD"),1)
  67 +ifeq ($(OS_NAME),OpenBSD)
  68  CFLAGS += -D_OPENBSD -D HAS_IFHEAD
  69  # 2.7-2.9
  70 -ifeq ($(shell uname -r | cut -c 1),2)
  71 +ifeq ($(shell echo $(OS_VERSION) | cut -c 1),2)
  72  CFLAGS += -D AICCU_TYPE="\"openbsd2\""
  73  SRCS   += ../common/aiccu_openbsd2.c
  74  OBJS   += ../common/aiccu_openbsd2.o
  75 @@ -114,7 +115,7 @@
  76  endif
  77
  78  # Darwin
  79 -ifeq ($(shell uname | grep -c "Darwin"),1)
  80 +ifeq ($(OS_NAME),Darwin)
  81  CFLAGS += -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
  82  SRCS   += ../common/aiccu_darwin.c
  83  OBJS   += ../common/aiccu_darwin.o
  84 @@ -122,7 +123,7 @@
  85  endif
  86
  87  # SunOS / Solaris
  88 -ifeq ($(shell uname | grep -c "SunOS"),1)
  89 +ifeq ($(OS_NAME),SunOS)
  90  CFLAGS += -D_SUNOS -D AICCU_TYPE="\"sunos\""
  91  SRCS   += ../common/aiccu_sunos.c
  92  OBJS   += ../common/aiccu_sunos.o
  93 @@ -130,7 +131,7 @@
  94  endif
  95
  96  # AIX
  97 -ifeq ($(shell uname | grep -c "AIX"),1)
  98 +ifeq ($(OS_NAME),AIX)
  99  CC     = @/usr/vac/bin/xlc_r
 100  CFLAGS = -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
 101  CFLAGS += -D AICCU_CONSOLE
 102 @@ -147,7 +148,7 @@
 103         $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
 104  ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
 105  ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
 106 -       strip $@
 107 +       $(STRIP) $@
 108  endif
 109  endif
 110