libgd: fix building with freetype support
authorW. Michael Petullo <redacted>
Sat, 4 Jan 2020 15:07:04 +0000 (10:07 -0500)
committerW. Michael Petullo <redacted>
Sun, 5 Jan 2020 00:12:43 +0000 (19:12 -0500)
Freetype support is required for php7-mod-gd as of commit 0f10c8c8,
which causes the PHP7 package to build using this external libgd library.
This commit adds FREETYPE_INCLUDE_DIRS to the definition of CMAKE_OPTIONS.
Without this, libgd does not build freetype support as shown by
this message:

....
Build libgd:
-- Could NOT find Freetype (missing:  FREETYPE_INCLUDE_DIRS)
-- Configuring done
-- Generating done
....

Signed-off-by: W. Michael Petullo <redacted>
libs/libgd/Makefile

index 6dfe81df41fa61a62863a536b4ad85f65ab33d59..67c22105b3ff4a41d1f76995287cda5c6acf6f16 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgd
 PKG_VERSION:=2.2.5
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/
@@ -79,6 +79,7 @@ endif
 
 ifdef CONFIG_LIBGD_FREETYPE
        CMAKE_OPTIONS += \
+               -DFREETYPE_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/freetype2/ \
                -DENABLE_FREETYPE=ON
 else
        CMAKE_OPTIONS += \
git clone https://git.99rst.org/PROJECT