jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/lcdproc: remove freetype installation prefixes

Browse Source 
Since [1] (freetype 2.8), freetype-config is now a wrapper of
pkg-config. So we don't need  to pass the freetype installation
prefixes on the configure command line anymore.

Setting freetype prefixes on the command line append the result
returned by pkg-config and the one provided on the command line.

FT2_CFLAGS='-I[...]/sysroot/usr/[...]/sysroot/usr/include/freetype2 -I[...]/usr/include'

This revert commit 3bdbe9abb90de0262832d5d545f239fa41fb0e91.

Fixes:
http://autobuild.buildroot.net/results/9c3/9c3f77e18ae244a2abb9ea70b6adebe215f143a6

[1] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=1c513fbb8872bfac5631964963b6a751169a1ce6

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Romain Naour 2017-06-03 18:36:26 +02:00 committed by Thomas Petazzoni
parent 1f2272ea62
commit ce2e622dfe
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lcdproc/lcdproc.mk
View File

@ -10,9 +10,7 @@ LCDPROC_LICENSE = GPL-2.0+
LCDPROC_LICENSE_FILES = COPYING LCDPROC_LICENSE_FILES = COPYING
LCDPROC_MAKE = $(MAKE1) LCDPROC_MAKE = $(MAKE1)
LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \ LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
--with-ft-prefix="$(STAGING_DIR)/usr" \
--with-ft-exec-prefix="$(STAGING_DIR)/usr"
ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y) ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
LCDPROC_CONF_OPTS += --enable-lcdproc-menus LCDPROC_CONF_OPTS += --enable-lcdproc-menus