diff options
| author |   Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org> | 2012-07-20 05:35:02 +0200 |
|---|---|---|
| committer | Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org> | 2012-07-20 05:35:02 +0200 |
| commit | f1ce55e8c2e63d8dd806a09a405d60cfc91a36ae (patch) | |
| tree | c9914bf78b4459019920f0b86f783c3636fbc652 | |
| parent | sci-libs/coinor-os: Initial import (diff) | |
| download | sci-f1ce55e8c2e63d8dd806a09a405d60cfc91a36ae.tar.gz sci-f1ce55e8c2e63d8dd806a09a405d60cfc91a36ae.tar.bz2 sci-f1ce55e8c2e63d8dd806a09a405d60cfc91a36ae.zip | |
[dev-util/nvidia-cuda-sdk] fix asneeded issues
| -rw-r--r-- | dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch | 89 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild | 8 |
2 files changed, 95 insertions, 2 deletions
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch new file mode 100644 index 000000000..f639b967b --- /dev/null +++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch @@ -0,0 +1,89 @@ +--- a/sdk/C/common/common.mk ++++ b/sdk/C/common/common.mk +@@ -268,18 +268,18 @@ endif + + # If dynamically linking to CUDA and CUDART, we exclude the libraries from the LIB + ifeq ($(USECUDADYNLIB),1) +- LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} -ldl -rdynamic ++ LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} -ldl -rdynamic + else + # static linking, we will statically link against CUDA and CUDART + ifeq ($(USEDRVAPI),1) +- LIB += -lcuda ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} ++ LIB += -lcuda $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} + else + ifeq ($(emu),1) + LIB += -lcudartemu + else + LIB += -lcudart + endif +- LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} ++ LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} + endif + endif + +--- a/sdk/CUDALibraries/common/common_cudalib.mk ++++ b/sdk/CUDALibraries/common/common_cudalib.mk +@@ -253,7 +253,7 @@ ifeq ($(USEPARAMGL),1) + endif + + ifeq ($(USERENDERCHECKGL),1) +- RENDERCHECKGLLIB := -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX) ++ RENDERCHECKGLLIB := -L../../../C/lib -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX) + endif + + ifeq ($(USENVCUVID), 1) +--- a/sdk/CUDALibraries/src/boxFilterNPP/Makefile ++++ b/sdk/CUDALibraries/src/boxFilterNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER)/ + mkdir -p ../../bin/$(OSLOWER)/debug +--- a/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile ++++ b/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER) + mkdir -p ../../bin/$(OSLOWER)/release +--- a/sdk/CUDALibraries/src/histEqualizationNPP/Makefile ++++ b/sdk/CUDALibraries/src/histEqualizationNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER) + mkdir -p ../../bin/$(OSLOWER)/release +--- a/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile ++++ b/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER) + mkdir -p ../../bin/$(OSLOWER)/release +--- a/sdk/CUDALibraries/src/randomFog/Makefile ++++ b/sdk/CUDALibraries/src/randomFog/Makefile +@@ -45,6 +45,7 @@ CCFILES := randomFog.cpp rng.cpp + USECURAND := 1 + USEGLLIB := 1 + USEGLUT := 1 ++USERENDERCHECKGL := 1 + + ################################################################################ + # Rules and targets diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild index 188cfcda5..e29737c41 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit unpacker toolchain-funcs versionator +inherit eutils unpacker toolchain-funcs versionator DESCRIPTION="NVIDIA CUDA Software Development Kit" HOMEPAGE="http://developer.nvidia.com/cuda" @@ -22,7 +22,7 @@ RDEPEND=">=dev-util/nvidia-cuda-toolkit-${PV} media-libs/freeglut" DEPEND="${RDEPEND}" -S="${WORKDIR}" +S=${WORKDIR} pkg_setup() { if use cuda || use opencl && [[ $(tc-getCXX) == *gcc* ]] && \ @@ -33,6 +33,10 @@ pkg_setup() { fi } +src_prepare() { + epatch "${FILESDIR}"/${P}-asneeded.patch +} + src_compile() { use examples || return local myopts="" |