Attachment 183796 Details for Bug 220182 – patch to change from gcc to clang

[patch] patch to change from gcc to clang

patch-saga_4.1.0-4.1.0_1.diff (text/plain), 2.68 KB, created by Rainer Hurling on 2017-06-26 06:37:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2017-06-26 06:37:53 UTC

Size: 2.68 KB

patch

obsolete

>diff -urN saga.orig/Makefile saga/Makefile
>--- saga.orig/Makefile	2017-06-21 16:25:30.868005000 +0200
>+++ saga/Makefile	2017-06-24 18:44:13.862889000 +0200
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	saga
> PORTVERSION=	4.1.0
>+PORTREVISION=	1
> CATEGORIES=	math
> MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
> #DISTNAME=	${PORTNAME}_${PORTVERSION}
>@@ -29,13 +30,13 @@
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
>-		--enable-python
>+		--enable-python --with-system-svm
> CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USE_CXXSTD=	c++11
>+#USE_CXXSTD=	c++11
> USE_WX=		3.0
>-USES=		autoreconf desktop-file-utils libtool localbase compiler:gcc-c++11-lib \
>+USES=		autoreconf desktop-file-utils libtool localbase compiler:c++11-lib \
> 		iconv:wchar_t dos2unix pkgconfig python:2
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>@@ -64,6 +65,16 @@
> 
> SUB_FILES=	pkg-message
> 
>+.if ${PORT_OPTIONS:MOPENMP} && ${ARCH} == amd64 && ${COMPILER_TYPE} == clang
>+BUILD_DEPENDS+=	clang40:devel/llvm40
>+LIB_DEPENDS+=	libomp.so.0:devel/openmp
>+CPP=		clang-cpp40
>+CC=		clang40
>+CXX=		clang++40
>+OPENMP_FLAGS+=	-L${LOCALBASE}/lib -lm -lomp
>+LDFLAGS+=	${OPENMP_FLAGS}
>+.endif
>+
> post-extract:
> 	@${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \
> 		${WRKSRC}/configure.ac \
>@@ -82,6 +93,11 @@
> 		${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am
> 	@${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \
> 		${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am
>+	@${REINPLACE_CMD} -e 's|libsvm/svm.h|svm.h|' \
>+		${WRKSRC}/configure \
>+		${WRKSRC}/configure.ac \
>+		${WRKSRC}/src/tools/imagery/imagery_svm/MLB_Interface.cpp \
>+		${WRKSRC}/src/tools/imagery/imagery_svm/svm_grids.h
> 
> post-patch:
> .if ${ARCH} == "powerpc"
>diff -urN saga.orig/files/patch-configure.ac saga/files/patch-configure.ac
>--- saga.orig/files/patch-configure.ac	2017-01-24 17:04:32.176831000 +0100
>+++ saga/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- configure.ac.orig	2016-08-23 13:23:41 UTC
>-+++ configure.ac
>-@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU
>- AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
>- AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
>- AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
>--AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
>-+AC_CHECK_HEADER([svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
>- PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
>- PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
>- 
>-

Actions: View | Diff

Attachments on bug 220182: 183796