cuda-sdk/makefiles.patch

   1 --- pkg/sdk/C/common/common.mk.orig     2011-04-07 10:22:48.898804324 +0200
   2 +++ pkg/sdk/C/common/common.mk  2011-04-07 10:24:03.351932604 +0200
   3 @@ -23,7 +23,7 @@
   4  # Add new SM Versions here as devices with new Compute Capability are released
   5  SM_VERSIONS   := 10 11 12 13 20 21
   6
   7 -CUDA_INSTALL_PATH ?= /usr/local/cuda
   8 +CUDA_INSTALL_PATH ?= /usr
   9
  10  ifdef cuda-install
  11         CUDA_INSTALL_PATH := $(cuda-install)
  12 @@ -61,7 +61,7 @@
  13  LINK       := g++ -fPIC
  14
  15  # Includes
  16 -INCLUDES  += -I. -I$(CUDA_INSTALL_PATH)/include -I$(COMMONDIR)/inc -I$(SHAREDDIR)/inc
  17 +INCLUDES  += -I. -I$(CUDA_INSTALL_PATH)/include/cuda -I$(COMMONDIR)/inc -I$(SHAREDDIR)/inc
  18
  19  # Warning flags
  20  CXXWARN_FLAGS := \
  21 @@ -89,7 +89,7 @@
  22  # architecture flag for nvcc and gcc compilers build
  23  CUBIN_ARCH_FLAG :=
  24  CXX_ARCH_FLAGS  :=
  25 -NVCCFLAGS       :=
  26 +NVCCFLAGS       := --compiler-bindir=/opt/gcc-4.4
  27  LIB_ARCH        := $(OSARCH)
  28
  29  # Determining the necessary Cross-Compilation Flags
  30 --- pkg/sdk/CUDALibraries/common/UtilNPP/defines.mk.orig        2011-04-07 10:25:38.788336773 +0200
  31 +++ pkg/sdk/CUDALibraries/common/UtilNPP/defines.mk     2011-04-07 10:26:14.034906592 +0200
  32 @@ -38,7 +38,7 @@
  33  # Add new SM Versions here as devices with new Compute Capability are released
  34  SM_VERSIONS := sm_10 sm_11 sm_12 sm_13 sm_20 sm_21
  35
  36 -CUDA_INSTALL_PATH ?= /usr/local/cuda
  37 +CUDA_INSTALL_PATH ?= /usr
  38  NPP_INSTALL_PATH  ?= ../../../npp
  39  NPP_INCLUDE_PATH  ?= ../../common/npp/include
  40
  41 @@ -82,7 +82,7 @@
  42  LINK       := g++ -fPIC
  43
  44  # Includes
  45 -INCLUDES  += -I. -I$(CUDA_INSTALL_PATH)/include -I$(ROOTDIR)/inc -I$(NPP_INCLUDE_PATH) -I../FreeImage/include
  46 +INCLUDES  += -I. -I$(CUDA_INSTALL_PATH)/include/cuda -I$(ROOTDIR)/inc -I$(NPP_INCLUDE_PATH) -I../FreeImage/include
  47
  48  ifneq ($(DARWIN),)
  49      CXXWARN_FLAGS :=
  50 --- pkg/sdk/CUDALibraries/common/common.mk.orig 2011-04-07 10:25:38.791670097 +0200
  51 +++ pkg/sdk/CUDALibraries/common/common.mk      2011-04-07 10:27:59.771282822 +0200
  52 @@ -23,7 +23,7 @@
  53  # Add new SM Versions here as devices with new Compute Capability are released
  54  SM_VERSIONS   := 10 11 12 13 20 21
  55
  56 -CUDA_INSTALL_PATH ?= /usr/local/cuda
  57 +CUDA_INSTALL_PATH ?= /usr
  58
  59  ifdef cuda-install
  60         CUDA_INSTALL_PATH := $(cuda-install)
  61 @@ -61,7 +61,7 @@
  62  LINK       := g++ -fPIC
  63
  64  # Includes
  65 -INCLUDES  += -I. -I$(CUDA_INSTALL_PATH)/include -I$(COMMONDIR)/inc -I$(SHAREDDIR)/inc
  66 +INCLUDES  += -I. -I$(CUDA_INSTALL_PATH)/include/cuda -I$(COMMONDIR)/inc -I$(SHAREDDIR)/inc
  67
  68  # Warning flags
  69  CXXWARN_FLAGS := \
  70 @@ -89,7 +89,7 @@
  71  # architecture flag for nvcc and gcc compilers build
  72  CUBIN_ARCH_FLAG :=
  73  CXX_ARCH_FLAGS  :=
  74 -NVCCFLAGS       :=
  75 +NVCCFLAGS       := --compiler-bindir=/opt/gcc-4.4
  76  LIB_ARCH        := $(OSARCH)
  77
  78  # Determining the necessary Cross-Compilation Flags
  79 --- pkg/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile.orig        2011-04-07 10:25:38.791670097 +0200
  80 +++ pkg/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile     2011-04-07 10:29:11.924416209 +0200
  81 @@ -29,7 +29,7 @@
  82  #
  83  ################################################################################
  84
  85 -CUDA_INSTALL_PATH ?= /usr/local/cuda
  86 +CUDA_INSTALL_PATH ?= /usr
  87
  88  ifdef cuda-install
  89         CUDA_INSTALL_PATH := $(cuda-install)
  90 @@ -107,7 +107,7 @@
  91  endif
  92
  93  CXX := g++ -fPIC $(CXX_ARCH_FLAGS)
  94 -INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc/ -I$(CUDA_INSTALL_PATH)/include/
  95 +INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc/ -I$(CUDA_INSTALL_PATH)/include/cuda
  96
  97  LIB := -L$(SDK_INSTALL_PATH)/common/lib/ -lnpp -L$(CUDA_INSTALL_PATH)/lib$(CUDALIBARCH)/ -L$(CUDA_INSTALL_PATH)/lib/ -lcudart
  98  LIB += -L$(SDK_INSTALL_PATH)/common/FreeImage/lib/$(OSLOWER)
  99 --- pkg/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile.orig 2011-04-07 10:25:38.791670097 +0200
 100 +++ pkg/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile      2011-04-07 10:29:04.237770832 +0200
 101 @@ -29,7 +29,7 @@
 102  #
 103  ################################################################################
 104
 105 -CUDA_INSTALL_PATH ?= /usr/local/cuda
 106 +CUDA_INSTALL_PATH ?= /usr
 107
 108  ifdef cuda-install
 109         CUDA_INSTALL_PATH := $(cuda-install)
 110 @@ -103,7 +103,7 @@
 111  endif
 112
 113  CXX := g++ -fPIC $(CXX_ARCH_FLAGS)
 114 -INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc -I../../common/FreeImage/include -I$(CUDA_INSTALL_PATH)/include/
 115 +INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc -I../../common/FreeImage/include -I$(CUDA_INSTALL_PATH)/include/cuda
 116
 117  LIB := -L$(SDK_INSTALL_PATH)/common/lib -L$(CUDA_INSTALL_PATH)/lib$(CUDALIBARCH) -lcudart -lnpp
 118  LIB += -L$(SDK_INSTALL_PATH)/common/FreeImage/lib/$(OSLOWER)
 119 --- pkg/sdk/CUDALibraries/src/histEqualizationNPP/Makefile.orig 2011-04-07 10:25:38.795003421 +0200
 120 +++ pkg/sdk/CUDALibraries/src/histEqualizationNPP/Makefile      2011-04-07 10:28:46.857818980 +0200
 121 @@ -29,7 +29,7 @@
 122  #
 123  ################################################################################
 124
 125 -CUDA_INSTALL_PATH ?= /usr/local/cuda
 126 +CUDA_INSTALL_PATH ?= /usr
 127
 128  ifdef cuda-install
 129         CUDA_INSTALL_PATH := $(cuda-install)
 130 @@ -103,7 +103,7 @@
 131  endif
 132
 133  CXX := g++ -fPIC $(CXX_ARCH_FLAGS)
 134 -INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc -I$(CUDA_INSTALL_PATH)/include/
 135 +INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc -I$(CUDA_INSTALL_PATH)/include/cuda
 136
 137  LIB := -L$(SDK_INSTALL_PATH)/common/lib/ -lnpp -L$(CUDA_INSTALL_PATH)/lib$(CUDALIBARCH)/ -L$(CUDA_INSTALL_PATH)/lib/ -lcudart
 138  LIB += -L$(SDK_INSTALL_PATH)/common/FreeImage/lib/$(OSLOWER)
 139 --- pkg/sdk/CUDALibraries/src/boxFilterNPP/Makefile.orig        2011-04-07 10:25:38.795003421 +0200
 140 +++ pkg/sdk/CUDALibraries/src/boxFilterNPP/Makefile     2011-04-07 10:28:31.921193700 +0200
 141 @@ -29,7 +29,7 @@
 142  #
 143  ################################################################################
 144
 145 -CUDA_INSTALL_PATH ?= /usr/local/cuda
 146 +CUDA_INSTALL_PATH ?= /usr
 147
 148  ifdef cuda-install
 149         CUDA_INSTALL_PATH := $(cuda-install)
 150 @@ -104,7 +104,7 @@
 151  endif
 152
 153  CXX := g++ -fPIC $(CXX_ARCH_FLAGS)
 154 -INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc -I$(CUDA_INSTALL_PATH)/include/
 155 +INC := -I. -I../../common/UtilNPP/ -I../../../shared/inc -I$(CUDA_INSTALL_PATH)/include/cuda
 156
 157  LIB := -L$(SDK_INSTALL_PATH)/common/lib -L$(CUDA_INSTALL_PATH)/lib$(CUDALIBARCH) -lnpp -lcudart
 158  LIB += -L$(SDK_INSTALL_PATH)/common/FreeImage/lib/$(OSLOWER)