Re: [E-devel] imlib2: fix CPPFLAGS order

Patch pushed, thanks :)

/Kim

On 2023-09-04 14:55, Omar Polo wrote:
> Hi,
> 
> while upgrading the OpenBSD package I've come across a weird issue.
> Due to the order of the flags, the heif module was loading the system'
> version of Imlib2_loader.h (in /usr/local/include) instead of the one
> from the tarball.  This caused failure since the previous version
> (1.11.0) didn't had IMLIB_LOADER_INEX.
> 
> Thanks,
> 
> Omar Polo
> 
> Index: src/modules/loaders/Makefile.am
> --- src/modules/loaders/Makefile.am.orig
> +++ src/modules/loaders/Makefile.am
> @@ -94,7 +94,7 @@ gif_la_LIBADD        = $(GIF_LIBS) $(top_builddir)/src
>   gif_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   heif_la_SOURCES      = loader_heif.c
> -heif_la_CPPFLAGS     = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
> +heif_la_CPPFLAGS     = $(AM_CPPFLAGS) $(HEIF_CFLAGS)
>   heif_la_LDFLAGS      = -module -avoid-version
>   heif_la_LIBADD       = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   heif_la_LIBTOOLFLAGS = --tag=disable-static
> @@ -105,19 +105,19 @@ ico_la_LIBADD        = $(top_builddir)/src/lib/libImli
>   ico_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   jpeg_la_SOURCES      = loader_jpeg.c exif.c exif.h
> -jpeg_la_CPPFLAGS     = $(JPEG_CFLAGS) $(AM_CPPFLAGS)
> +jpeg_la_CPPFLAGS     = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
>   jpeg_la_LDFLAGS      = -module -avoid-version
>   jpeg_la_LIBADD       = $(JPEG_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   jpeg_la_LIBTOOLFLAGS = --tag=disable-static
>   
>   j2k_la_SOURCES       = loader_j2k.c
> -j2k_la_CPPFLAGS      = $(J2K_CFLAGS) $(AM_CPPFLAGS)
> +j2k_la_CPPFLAGS      = $(AM_CPPFLAGS) $(J2K_CFLAGS)
>   j2k_la_LDFLAGS       = -module -avoid-version
>   j2k_la_LIBADD        = $(J2K_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   j2k_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   jxl_la_SOURCES       = loader_jxl.c
> -jxl_la_CPPFLAGS      = $(JXL_CFLAGS) $(AM_CPPFLAGS)
> +jxl_la_CPPFLAGS      = $(AM_CPPFLAGS) $(JXL_CFLAGS)
>   jxl_la_LDFLAGS       = -module -avoid-version
>   jxl_la_LIBADD        = $(JXL_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   jxl_la_LIBTOOLFLAGS  = --tag=disable-static
> @@ -128,7 +128,7 @@ lbm_la_LIBADD        = $(top_builddir)/src/lib/libImli
>   lbm_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   png_la_SOURCES       = loader_png.c
> -png_la_CPPFLAGS      = $(PNG_CFLAGS) $(AM_CPPFLAGS)
> +png_la_CPPFLAGS      = $(AM_CPPFLAGS) $(PNG_CFLAGS)
>   png_la_LDFLAGS       = -module -avoid-version
>   png_la_LIBADD        = $(PNG_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   png_la_LIBTOOLFLAGS  = --tag=disable-static
> @@ -139,13 +139,13 @@ pnm_la_LIBADD        = $(top_builddir)/src/lib/libImli
>   pnm_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   ps_la_SOURCES       = loader_ps.c
> -ps_la_CPPFLAGS      = $(PS_CFLAGS) $(AM_CPPFLAGS)
> +ps_la_CPPFLAGS      = $(AM_CPPFLAGS) $(PS_CFLAGS)
>   ps_la_LDFLAGS       = -module -avoid-version
>   ps_la_LIBADD        = $(PS_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   ps_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   raw_la_SOURCES       = loader_raw.c
> -raw_la_CPPFLAGS      = $(RAW_CFLAGS) $(AM_CPPFLAGS)
> +raw_la_CPPFLAGS      = $(AM_CPPFLAGS) $(RAW_CFLAGS)
>   raw_la_LDFLAGS       = -module -avoid-version
>   raw_la_LIBADD        = $(RAW_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   raw_la_LIBTOOLFLAGS  = --tag=disable-static
> @@ -156,7 +156,7 @@ qoi_la_LIBADD        = $(top_builddir)/src/lib/libImli
>   qoi_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   svg_la_SOURCES       = loader_svg.c
> -svg_la_CPPFLAGS      = $(SVG_CFLAGS) $(AM_CPPFLAGS)
> +svg_la_CPPFLAGS      = $(AM_CPPFLAGS) $(SVG_CFLAGS)
>   svg_la_LDFLAGS       = -module -avoid-version
>   svg_la_LIBADD        = $(SVG_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   svg_la_LIBTOOLFLAGS  = --tag=disable-static
> @@ -167,13 +167,13 @@ tga_la_LIBADD        = $(top_builddir)/src/lib/libImli
>   tga_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   tiff_la_SOURCES      = loader_tiff.c
> -tiff_la_CPPFLAGS     = $(TIFF_CFLAGS) $(AM_CPPFLAGS)
> +tiff_la_CPPFLAGS     = $(AM_CPPFLAGS) $(TIFF_CFLAGS)
>   tiff_la_LDFLAGS      = -module -avoid-version
>   tiff_la_LIBADD       = $(TIFF_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   tiff_la_LIBTOOLFLAGS = --tag=disable-static
>   
>   webp_la_SOURCES      = loader_webp.c
> -webp_la_CPPFLAGS     = $(WEBP_CFLAGS) $(AM_CPPFLAGS)
> +webp_la_CPPFLAGS     = $(AM_CPPFLAGS) $(WEBP_CFLAGS)
>   webp_la_LDFLAGS      = -module -avoid-version
>   webp_la_LIBADD       = $(WEBP_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   webp_la_LIBTOOLFLAGS = --tag=disable-static
> @@ -189,31 +189,31 @@ xpm_la_LIBADD        = $(top_builddir)/src/lib/libImli
>   xpm_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   y4m_la_SOURCES       = loader_y4m.c
> -y4m_la_CPPFLAGS      = $(Y4M_CFLAGS) $(AM_CPPFLAGS)
> +y4m_la_CPPFLAGS      = $(AM_CPPFLAGS) $(Y4M_CFLAGS)
>   y4m_la_LDFLAGS       = -module -avoid-version
>   y4m_la_LIBADD        = $(Y4M_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   y4m_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   bz2_la_SOURCES       = loader_bz2.c decompress_load.c compression.h
> -bz2_la_CPPFLAGS      = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
> +bz2_la_CPPFLAGS      = $(AM_CPPFLAGS) $(BZ2_CFLAGS)
>   bz2_la_LDFLAGS       = -module -avoid-version
>   bz2_la_LIBADD        = $(BZ2_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   bz2_la_LIBTOOLFLAGS  = --tag=disable-static
>   
>   lzma_la_SOURCES      = loader_lzma.c decompress_load.c compression.h
> -lzma_la_CPPFLAGS     = $(LZMA_CFLAGS) $(AM_CPPFLAGS)
> +lzma_la_CPPFLAGS     = $(AM_CPPFLAGS) $(LZMA_CFLAGS)
>   lzma_la_LDFLAGS      = -module -avoid-version
>   lzma_la_LIBADD       = $(LZMA_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   lzma_la_LIBTOOLFLAGS = --tag=disable-static
>   
>   zlib_la_SOURCES      = loader_zlib.c decompress_load.c compression.h
> -zlib_la_CPPFLAGS     = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
> +zlib_la_CPPFLAGS     = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
>   zlib_la_LDFLAGS      = -module -avoid-version
>   zlib_la_LIBADD       = $(ZLIB_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   zlib_la_LIBTOOLFLAGS = --tag=disable-static
>   
>   id3_la_SOURCES       = loader_id3.c
> -id3_la_CPPFLAGS      = $(ID3_CFLAGS) $(AM_CPPFLAGS)
> +id3_la_CPPFLAGS      = $(AM_CPPFLAGS) $(ID3_CFLAGS)
>   id3_la_LDFLAGS       = -module -avoid-version
>   id3_la_LIBADD        = $(ID3_LIBS) $(top_builddir)/src/lib/libImlib2.la
>   id3_la_LIBTOOLFLAGS  = --tag=disable-static
> 
> 
> _______________________________________________
> enlightenment-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel