Skip to content

Commit

Permalink
databases/grass7: unbreak on i386
Browse files Browse the repository at this point in the history 
It needs GCC to configure and build grass7 on i386.
The v.in.pdal module is not available as some documentation pages.

PR:		256055
Reported by:	chris@crvintel.com
Tested by:	chris@crvintel.com
  • Loading branch information
@lbartoletti
lbartoletti committed Jun 19, 2021
1 parent 8f23336 commit d7eac4e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 20 deletions.
12 changes: 5 additions & 7 deletions databases/grass7/Makefile
View file
Expand Up @@ -25,7 +25,6 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL.TXT

BROKEN_sparc64= Does not configure on sparc64
BROKEN_i386= Does not configure on i386: Could not determine External PROJ major version

BUILD_DEPENDS= ${PY_NUMPY} \
${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
Expand Down Expand Up @@ -135,12 +134,11 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd

.include <bsd.port.pre.mk>

.if ${ARCH} == "i386" && ${OSVERSION} < 1200000
# clang 7.x and 8.x do not build properly on 11i386
CPP= clang-cpp${LLVM_DEFAULT}
CC= clang${LLVM_DEFAULT}
CXX= clang++${LLVM_DEFAULT}
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
.if ${ARCH} == "i386"
USE_GCC= yes
PLIST_SUB+= NOTONI386="@comment "
.else
PLIST_SUB+= NOTONI386=""
.endif

.if !defined (GRASS_INST_DIR)
Expand Down
26 changes: 13 additions & 13 deletions databases/grass7/pkg-plist
View file
Expand Up @@ -318,7 +318,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/bin/v.in.dxf
%%LAS%%%%GRASS_INST_DIR%%/bin/v.in.lidar
%%GRASS_INST_DIR%%/bin/v.in.ogr
%%GRASS_INST_DIR%%/bin/v.in.pdal
%%NOTONI386%%%%GRASS_INST_DIR%%/bin/v.in.pdal
%%GRASS_INST_DIR%%/bin/v.in.region
%%GRASS_INST_DIR%%/bin/v.info
%%GRASS_INST_DIR%%/bin/v.kcv
Expand Down Expand Up @@ -750,7 +750,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/html/htmldriver.html
%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat5.png
%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat7.png
%%GRASS_INST_DIR%%/docs/html/i.atcorr.html
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/i.atcorr.html
%%GRASS_INST_DIR%%/docs/html/i_atcorr_B02_atcorr.png
%%GRASS_INST_DIR%%/docs/html/i_cluster_landsat_clustering.png
%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_corrected.jpg
Expand Down Expand Up @@ -1259,7 +1259,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/html/r.surf.gauss.html
%%GRASS_INST_DIR%%/docs/html/r.surf.idw.html
%%GRASS_INST_DIR%%/docs/html/r.surf.random.html
%%GRASS_INST_DIR%%/docs/html/r.terraflow.html
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/r.terraflow.html
%%GRASS_INST_DIR%%/docs/html/r.texture.html
%%GRASS_INST_DIR%%/docs/html/r.thin.html
%%GRASS_INST_DIR%%/docs/html/r.tile.html
Expand All @@ -1277,7 +1277,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/html/r.unpack.html
%%GRASS_INST_DIR%%/docs/html/r.uslek.html
%%GRASS_INST_DIR%%/docs/html/r.usler.html
%%GRASS_INST_DIR%%/docs/html/r.viewshed.html
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/r.viewshed.html
%%GRASS_INST_DIR%%/docs/html/r.viewshed.png
%%GRASS_INST_DIR%%/docs/html/r.volume.html
%%GRASS_INST_DIR%%/docs/html/r.walk.html
Expand Down Expand Up @@ -1408,7 +1408,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/html/topic_aggregation.html
%%GRASS_INST_DIR%%/docs/html/topic_albedo.html
%%GRASS_INST_DIR%%/docs/html/topic_algebra.html
%%GRASS_INST_DIR%%/docs/html/topic_atmospheric_correction.html
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/topic_atmospheric_correction.html
%%GRASS_INST_DIR%%/docs/html/topic_attribute_table.html
%%GRASS_INST_DIR%%/docs/html/topic_biomass.html
%%GRASS_INST_DIR%%/docs/html/topic_buffer.html
Expand Down Expand Up @@ -1500,7 +1500,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/html/topic_unit_test.html
%%GRASS_INST_DIR%%/docs/html/topic_vector.html
%%GRASS_INST_DIR%%/docs/html/topic_vegetation_index.html
%%GRASS_INST_DIR%%/docs/html/topic_viewshed.html
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/topic_viewshed.html
%%GRASS_INST_DIR%%/docs/html/topic_visualization.html
%%GRASS_INST_DIR%%/docs/html/topic_volume.html
%%GRASS_INST_DIR%%/docs/html/topic_voxel.html
Expand Down Expand Up @@ -1630,7 +1630,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/html/v.in.lines.html
%%GRASS_INST_DIR%%/docs/html/v.in.mapgen.html
%%GRASS_INST_DIR%%/docs/html/v.in.ogr.html
%%GRASS_INST_DIR%%/docs/html/v.in.pdal.html
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/v.in.pdal.html
%%GRASS_INST_DIR%%/docs/html/v.in.region.html
%%GRASS_INST_DIR%%/docs/html/v.in.wfs.html
%%GRASS_INST_DIR%%/docs/html/v.info.html
Expand Down Expand Up @@ -1911,7 +1911,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/man/man1/htmldriver.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/i.albedo.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/i.aster.toar.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/i.atcorr.1.gz
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/i.atcorr.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/i.biomass.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/i.cca.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/i.cluster.1.gz
Expand Down Expand Up @@ -2125,7 +2125,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/man/man1/r.surf.gauss.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.surf.idw.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.surf.random.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.terraflow.1.gz
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/r.terraflow.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.texture.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.thin.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.tile.1.gz
Expand All @@ -2141,7 +2141,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/man/man1/r.unpack.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.uslek.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.usler.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.viewshed.1.gz
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/r.viewshed.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.volume.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.walk.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/r.water.outlet.1.gz
Expand Down Expand Up @@ -2242,7 +2242,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/man/man1/topic_aggregation.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_albedo.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_algebra.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_atmospheric_correction.1.gz
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/topic_atmospheric_correction.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_attribute_table.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_biomass.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_buffer.1.gz
Expand Down Expand Up @@ -2334,7 +2334,7 @@ bin/grass%%VER%%
%%GRASS_INST_DIR%%/docs/man/man1/topic_unit_test.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_vector.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_vegetation_index.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_viewshed.1.gz
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/topic_viewshed.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_visualization.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_volume.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/topic_voxel.1.gz
Expand Down Expand Up @@ -2385,7 +2385,7 @@ bin/grass%%VER%%
%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.lidar.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/v.in.mapgen.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/v.in.ogr.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/v.in.pdal.1.gz
%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.pdal.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/v.in.region.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/v.in.wfs.1.gz
%%GRASS_INST_DIR%%/docs/man/man1/v.info.1.gz
Expand Down

0 comments on commit d7eac4e

Please sign in to comment.