commit: a2df5bcead58163828cde20535e4b4f4204f4ecf Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 9 20:38:45 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 9 20:43:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2df5bce
sci-libs/gdal: respect libdir To be upstreamed. Unfortunately, we can't do *everything* required in Gentoo in the patch, as there's a --with-local argument which I'd prefer to get rid of, but is a bit too invasive of a change for me to want to push upstream for now. So, we settle on a single sed in the ebuild, which is an improvement! Closes: https://bugs.gentoo.org/696106 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 407 ++++++++++++++++++++++++++++ sci-libs/gdal/gdal-3.2.1-r1.ebuild | 11 +- 2 files changed, 416 insertions(+), 2 deletions(-) diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch new file mode 100644 index 00000000000..89bc87489e9 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch @@ -0,0 +1,407 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1133,11 +1133,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ; + + elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then + +- LIBS="-L$with_libz -L$with_libz/lib $LIBS" ++ LIBS="-L$with_libz -L$with_libz/${libdir} $LIBS" + +- AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz) ++ AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz) + if test "$LIBZ_SETTING" = "external" ; then +- AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz) ++ AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz) + if test "$LIBZ_SETTING" = "external" ; then + AC_MSG_RESULT([using libz library from $with_libz]) + else +@@ -1178,7 +1178,7 @@ AC_ARG_WITH(libdeflate, + if test "$with_libdeflate" != "no" ; then + + if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then +- AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/lib) ++ AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/${libdir}) + else + AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no]) + fi +@@ -1209,7 +1209,7 @@ fi + if test "$LIBDEFLATE_SETTING" = "yes" ; then + if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then + EXTRA_INCLUDES="-I$with_libdeflate/include $EXTRA_INCLUDES" +- LIBS="-L$with_libdeflate/lib -ldeflate $LIBS" ++ LIBS="-L$with_libdeflate/${libdir} -ldeflate $LIBS" + else + LIBS="-ldeflate $LIBS" + fi +@@ -1302,7 +1302,7 @@ else + LIBS="-L$with_libtiff -ltiff $LIBS" + EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES" + else +- LIBS="-L$with_libtiff/lib -ltiff $LIBS" ++ LIBS="-L$with_libtiff/${libdir} -ltiff $LIBS" + EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES" + fi + +@@ -1426,19 +1426,12 @@ else + fi + else + ORIG_LIBS="$LIBS" +- LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS" ++ LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS" + AC_LANG_PUSH([C++]) + AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) + AC_LANG_POP([C++]) + if test "$PROJ_FOUND" = "no"; then +- LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS" +- unset ac_cv_lib_proj_proj_create_from_wkt +- AC_LANG_PUSH([C++]) +- AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) +- AC_LANG_POP([C++]) +- fi +- if test "$PROJ_FOUND" = "no"; then +- LIBS="-L$with_proj/lib64 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS" ++ LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS" + unset ac_cv_lib_proj_proj_create_from_wkt + AC_LANG_PUSH([C++]) + AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) +@@ -1460,22 +1453,6 @@ else + PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS" + fi + fi +- if test "$PROJ_FOUND" = "no"; then +- LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS" +- AC_LANG_PUSH([C++]) +- AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) +- AC_LANG_POP([C++]) +- if test "$PROJ_FOUND" = "no"; then +- LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS" +- unset ac_cv_lib_internal_proj_internal_proj_create_from_wkt +- AC_LANG_PUSH([C++]) +- AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) +- AC_LANG_POP([C++]) +- fi +- if test "$PROJ_FOUND" = "yes"; then +- PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS" +- fi +- fi + if test "$PROJ_FOUND" = "no"; then + AC_MSG_ERROR([PROJ 6 symbols not found]) + fi +@@ -1535,7 +1512,7 @@ elif test "$with_spatialite" = "dlopen"; then + SPATIALITE_SONAME="spatialite.so" + fi + else +- AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/lib -lspatialite) ++ AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/${libdir} -lspatialite) + + if test -f "$with_spatialite/include/spatialite.h" -a \ + "$SPATIALITE_INIT_FOUND" = "yes"; then +@@ -1543,7 +1520,7 @@ else + if test "$HAVE_SQLITE3" = "yes"; then + SPATIALITE_INC="-I$with_spatialite/include" + HAVE_SPATIALITE=yes +- SPATIALITE_LIBS="-L$with_spatialite/lib -lspatialite" ++ SPATIALITE_LIBS="-L$with_spatialite/${libdir} -lspatialite" + LIBS="$SQLITE3_LDFLAGS $LIBS $SPATIALITE_LIBS" + AC_MSG_RESULT(spatialite enabled) + else +@@ -1605,10 +1582,10 @@ if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then + fi + elif test "$with_zstd" != "" -a "$with_zstd" != "no"; then + +- AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/lib) ++ AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/${libdir}) + + if test "$ZSTD_SETTING" = "yes" -a -f "$with_zstd/include/zstd.h" ; then +- LIBS="-L$with_zstd/lib -lzstd $LIBS" ++ LIBS="-L$with_zstd/${libdir} -lzstd $LIBS" + EXTRA_INCLUDES="-I$with_zstd/include $EXTRA_INCLUDES" + else + AC_MSG_ERROR([libzstd not found]) +@@ -1931,20 +1908,20 @@ fi + # TODO: separate libs for rasters and vectors + if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then + +- AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) ++ AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime) + if test "$GRASS_SETTING" = "no" ; then +- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) ++ AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime) + fi + + if test "$GRASS_SETTING" != "no" ; then + if test "$GRASS_SETTING" = "grass70+" ; then + G_RASTLIBS="-lgrass_raster -lgrass_imagery" + G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" +- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" ++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" + else + G_RASTLIBS="-lgrass_I" + G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" +- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" ++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" + fi + GRASS_INCLUDE="-I$with_grass/include" + GRASS_GISBASE="$with_grass" +@@ -1968,10 +1945,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then + + else + +- AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/lib) ++ AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/${libdir}) + + if test "$GRASS_SETTING" = "libgrass" ; then +- LIBS="-L$with_libgrass -L$with_libgrass/lib -lgrass5 $LIBS" ++ LIBS="-L$with_libgrass -L$with_libgrass/${libdir} -lgrass5 $LIBS" + GRASS_INCLUDE="-I$with_libgrass -I$with_libgrass/include $EXTRA_INCLUDES" + else + AC_MSG_ERROR([--with-libgrass=$with_grass requested, but libgrass5 not found!]) +@@ -2018,7 +1995,7 @@ dnl Fedora has cfitsio headers in ""/usr/include/cfitsio + else + + FITS_SETTING=external +- LIBS="-L$with_cfitsio -L$with_cfitsio/lib -lcfitsio $LIBS" ++ LIBS="-L$with_cfitsio -L$with_cfitsio/${libdir} -lcfitsio $LIBS" + EXTRA_INCLUDES="-I$with_cfitsio -I$with_cfitsio/include $EXTRA_INCLUDES" + + echo "using libcfitsio from $with_cfitsio." +@@ -2067,7 +2044,7 @@ elif test "$with_pcraster" = "internal" ; then + else + + PCRASTER_SETTING=external +- LIBS="-L$with_pcraster/lib -lcsf $LIBS" ++ LIBS="-L$with_pcraster/${libdir} -lcsf $LIBS" + EXTRA_INCLUDES="-I$with_pcraster/include $EXTRA_INCLUDES" + + echo "using libcsf from $with_pcraster." +@@ -2118,7 +2095,7 @@ elif test "$with_png" = "internal" ; then + else + + PNG_SETTING=external +- LIBS="-L$with_png -L$with_png/lib -lpng $LIBS" ++ LIBS="-L$with_png -L$with_png/${libdir} -lpng $LIBS" + EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES" + + echo "using libpng from $with_png." +@@ -2153,7 +2130,7 @@ else + + DDS_SETTING=yes + CRUNCHDIR="$with_dds" +- LIBS="-L$with_dds/lib/ -lcrunch $LIBS" ++ LIBS="-L$with_dds/${libdir}/ -lcrunch $LIBS" + echo "using libcrunch from $with_dds." + + fi +@@ -2191,7 +2168,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then + else + + GTA_SETTING=yes +- LIBS="-L$with_gta -L$with_gta/lib -lgta $LIBS" ++ LIBS="-L$with_gta -L$with_gta/${libdir} -lgta $LIBS" + EXTRA_INCLUDES="-I$with_gta -I$with_gta/include $EXTRA_INCLUDES" + + echo "using libgta from $with_gta." +@@ -2229,7 +2206,7 @@ elif test "$with_pcidsk" = "" -o "$with_pcidsk" = "yes" -o "$with_pcidsk" = "int + else + + PCIDSK_SETTING=external +- PCIDSK_LIB="-L$with_pcidsk/lib -lpcidsk" ++ PCIDSK_LIB="-L$with_pcidsk/${libdir} -lpcidsk" + PCIDSK_INCLUDE="-I$with_pcidsk/include -I$with_pcidsk/include/pcidsk" + + echo "using libpcidsk from $with_pcidsk." +@@ -2304,10 +2281,10 @@ else + + dnl We now require libgeotiff 1.5.0 + dnl first check if $with_geotiff/lib has the library: +- AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/lib) ++ AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/${libdir}) + + if test $GEOTIFF_SETTING = "external" ; then +- LIBS="-L$with_geotiff/lib -lgeotiff $LIBS" ++ LIBS="-L$with_geotiff/${libdir} -lgeotiff $LIBS" + if test -d $with_geotiff/include ; then + EXTRA_INCLUDES="-I$with_geotiff/include $EXTRA_INCLUDES" + fi +@@ -2379,7 +2356,7 @@ elif test "$with_jpeg" = "internal" ; then + else + + JPEG_SETTING=external +- LIBS="-L$with_jpeg -L$with_jpeg/lib -ljpeg $LIBS" ++ LIBS="-L$with_jpeg -L$with_jpeg/${libdir} -ljpeg $LIBS" + EXTRA_INCLUDES="-I$with_jpeg -I$with_jpeg/include $EXTRA_INCLUDES" + + echo "using libjpeg from $with_jpeg." +@@ -2530,7 +2507,7 @@ elif test "$with_gif" = "internal" ; then + else + + GIF_SETTING=external +- LIBS="-L$with_gif -L$with_gif/lib -lgif $LIBS" ++ LIBS="-L$with_gif -L$with_gif/${libdir} -lgif $LIBS" + EXTRA_INCLUDES="-I$with_gif -I$with_gif/include $EXTRA_INCLUDES" + + echo "using libgif from $with_gif." +@@ -2596,10 +2573,10 @@ elif test "$with_ogdi" = "yes" -o "$with_ogdi" = "" ; then + + else + +- AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi) ++ AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi) + if test "$HAVE_OGDI" = "yes" ; then + if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then +- LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi $LIBS" ++ LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi $LIBS" + OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include" + + echo "using libogdi from $with_ogdi." +@@ -2609,10 +2586,10 @@ else + fi + else + dnl For backward compatibility. Retry with ogdi31 as a name +- AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi31) ++ AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi31) + if test "$HAVE_OGDI" = "yes" ; then + if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then +- LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS" ++ LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi31 $LIBS" + OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include" + + echo "using libogdi31 from $with_ogdi." +@@ -2730,10 +2707,10 @@ elif test "$with_sosi" = "yes" ; then + rm -f testfyba + else + +- AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/lib]) +- if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/lib/libfyut.a ; then ++ AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/${libdir}]) ++ if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/${libdir}/libfyut.a ; then + AC_MSG_RESULT([found.]) +- SOSI_LIB="$with_sosi/lib/libfyba.a $with_sosi/lib/libfygm.a $with_sosi/lib/libfyut.a" ++ SOSI_LIB="$with_sosi/${libdir}/libfyba.a $with_sosi/${libdir}/libfygm.a $with_sosi/${libdir}/libfyut.a" + SOSI_ENABLED=yes + else + AC_MSG_ERROR([not found.]) +@@ -2794,14 +2771,14 @@ else + AC_ARG_WITH(boost-lib-path, + [ --with-boost-lib-path=ARG Path to boost libraries for mongocxx client],,,) + +- AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/lib]) ++ AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/${libdir}]) + MONGODB_ENABLED=yes +- if test -r $with_mongocxx/lib/libmongoclient.so; then ++ if test -r $with_mongocxx/${libdir}/libmongoclient.so; then + AC_MSG_RESULT([found.]) +- MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient" +- elif test -r $with_mongocxx/lib/libmongoclient.dylib; then ++ MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient" ++ elif test -r $with_mongocxx/${libdir}/libmongoclient.dylib; then + AC_MSG_RESULT([found.]) +- MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient" ++ MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient" + else + AC_MSG_ERROR([not found.]) + fi +diff --git a/frmts/grass/pkg/configure.in b/frmts/grass/pkg/configure.in +index 25602bd..0765333 100644 +--- a/frmts/grass/pkg/configure.in ++++ b/frmts/grass/pkg/configure.in +@@ -99,7 +99,7 @@ else + if $GDAL_CONFIG --autoload > /dev/null 2>&1 ; then + AUTOLOAD_DIR=`$GDAL_CONFIG --autoload` + else +- AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/lib/gdalplugins ++ AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/${libdir}/gdalplugins + fi + fi + +@@ -123,11 +123,11 @@ fi + + if test "$with_grass" != "yes" ; then + +- AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) ++ AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime) + if test "$GRASS_SETTING" = "no" ; then +- AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) ++ AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime) + if test "$GRASS_SETTING" = "no" ; then +- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) ++ AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime) + fi + fi + +@@ -135,15 +135,15 @@ if test "$with_grass" != "yes" ; then + if test "$GRASS_SETTING" = "grass72+" ; then + G_RASTLIBS="-lgrass_raster -lgrass_imagery" + G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" +- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS" ++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS" + elif test "$GRASS_SETTING" = "grass70+" ; then + G_RASTLIBS="-lgrass_raster -lgrass_imagery" + G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" +- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" ++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" + else + G_RASTLIBS="-lgrass_I" + G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" +- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" ++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" + fi + GRASS_INCLUDE="-I$with_grass/include" + GRASS_GISBASE="$with_grass" +diff --git a/m4/ax_lib_expat.m4 b/m4/ax_lib_expat.m4 +index d1fb22c..32caf45 100644 +--- a/m4/ax_lib_expat.m4 ++++ b/m4/ax_lib_expat.m4 +@@ -119,9 +119,9 @@ AC_DEFUN([AX_LIB_EXPAT], + expat_lib_flags="-lexpat" + fi + else +- AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/lib) ++ AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/${libdir}) + if test "$run_expat_test" = "yes"; then +- expat_lib_flags="-L$expat_prefix/lib -lexpat" ++ expat_lib_flags="-L$expat_prefix/${libdir} -lexpat" + fi + fi + fi +diff --git a/m4/ax_lib_libkml.m4 b/m4/ax_lib_libkml.m4 +index 16af436..f542c2e 100644 +--- a/m4/ax_lib_libkml.m4 ++++ b/m4/ax_lib_libkml.m4 +@@ -172,7 +172,7 @@ kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory(); + if test "$libkml_prefix" = "/usr"; then + libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser" + else +- libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser" ++ libkml_lib_flags="-L$libkml_prefix/${libdir} -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser" + fi + run_libkml_test="yes" + elif test "$libkml_requested" = "yes"; then +diff --git a/m4/ax_lib_xerces.m4 b/m4/ax_lib_xerces.m4 +index fdd0e79..6ef7af0 100644 +--- a/m4/ax_lib_xerces.m4 ++++ b/m4/ax_lib_xerces.m4 +@@ -100,7 +100,7 @@ AC_DEFUN([AX_LIB_XERCES], + if test "$xerces_prefix" = "/usr"; then + xerces_lib_flags="-lxerces-c -lpthread" + else +- xerces_lib_flags="-L$xerces_prefix/lib -lxerces-c -lpthread" ++ xerces_lib_flags="-L$xerces_prefix/${libdir} -lxerces-c -lpthread" + fi + run_xerces_test="yes" + elif test "$xerces_requested" = "yes"; then +diff --git a/configure.ac b/configure.ac +index 020b249..ffad6ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4794,8 +4794,8 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs + elif test "$with_libjson_c" = "internal" ; then + LIBJSONC_SETTING=internal + elif test "$with_libjson_c" != "no"; then +- LIBS="-L$with_libjson_c/lib $LIBS" +- AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib) ++ LIBS="-L$with_libjson_c/${libdir} $LIBS" ++ AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/${libdir}) + else + AC_MSG_ERROR([libjson-c (internal or external) is required]) + fi diff --git a/sci-libs/gdal/gdal-3.2.1-r1.ebuild b/sci-libs/gdal/gdal-3.2.1-r1.ebuild index 5eb32d7fbfb..ebac034babc 100644 --- a/sci-libs/gdal/gdal-3.2.1-r1.ebuild +++ b/sci-libs/gdal/gdal-3.2.1-r1.ebuild @@ -88,11 +88,18 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-2.2.3-soname.patch" "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 + "${FILESDIR}/${PN}-3.2.1-libdir.patch" ) src_prepare() { default + # Drop a --prefix hack in the upstream build system + # We don't want the line at all, so let's just drop it rather than + # trying to put in the right libdir value. + sed -e '/\$ADD_PREFIX\/lib/d' \ + -i configure.ac || die + sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \ -i configure.ac || die @@ -131,10 +138,10 @@ src_configure() { --with-geotiff --with-gnm --with-hide-internal-symbols - --with-libjson-c="${EPREFIX}"/usr/ + --with-libjson-c="${EPREFIX}"/usr --with-libtiff --with-libtool - --with-libz="${EPREFIX}"/usr/ + --with-libz="${EPREFIX}"/usr --without-charls --without-dods-root --without-ecw
