components/library/FreeImage/patches/04-Makefile.fip.patch

   1 --- FreeImage/Makefile.fip      Tue Mar 10 09:03:56 2015
   2 +++ FreeImage/Makefile_.fip     Tue May 24 00:33:23 2022
   3 @@ -17,20 +17,22 @@
   4  MODULES := $(MODULES:.cpp=.o)
   5  CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
   6  # OpenJPEG
   7 -CFLAGS += -DOPJ_STATIC
   8 +override CFLAGS += -DOPJ_STATIC
   9  # LibRaw
  10 -CFLAGS += -DNO_LCMS
  11 +override CFLAGS += -DNO_LCMS
  12  # LibJXR
  13 -CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
  14 -CFLAGS += $(INCLUDE)
  15 +override CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
  16 +override CFLAGS += $(INCLUDE)
  17  CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
  18  # LibJXR
  19 -CXXFLAGS += -D__ANSI__
  20 -CXXFLAGS += $(INCLUDE)
  21 +override CXXFLAGS += -D__ANSI__
  22 +override CXXFLAGS += $(INCLUDE)
  23 +LDFLAGS ?=
  24 +override LDFLAGS += -LDist -lfreeimage-$(VER_MAJOR).$(VER_MINOR)
  25
  26  ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
  27 -       CFLAGS += -fPIC
  28 -       CXXFLAGS += -fPIC
  29 +       override CFLAGS += -fPIC
  30 +       override CXXFLAGS += -fPIC
  31  endif
  32
  33  TARGET  = freeimageplus
  34 @@ -68,7 +70,7 @@
  35         $(AR) r $@ $(MODULES)
  36
  37  $(SHAREDLIB): $(MODULES)
  38 -       $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
  39 +       $(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) $(LDFLAGS)
  40
  41  install:
  42         install -d $(INCDIR) $(INSTALLDIR)