NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feh: libcurl is optional not mandatory

Browse Source 
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Acked-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2018-09-11 22:34:47 +02:00 committed by Thomas Petazzoni
parent 9c31063b0f
commit c29e68f808
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/feh/Config.in
View File

@ -8,7 +8,6 @@ config BR2_PACKAGE_FEH
select BR2_PACKAGE_IMLIB2_PNG
select BR2_PACKAGE_IMLIB2_JPEG
select BR2_PACKAGE_IMLIB2_X
select BR2_PACKAGE_LIBCURL
help
feh is an X11 image viewer aimed mostly at console users.

14
package/feh/feh.mk
View File

@ -7,17 +7,25 @@
FEH_VERSION = 2.27.1
FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
FEH_SITE = http://feh.finalrewind.org
FEH_DEPENDENCIES = libcurl imlib2 libpng xlib_libXinerama xlib_libXt
FEH_DEPENDENCIES = imlib2 libpng xlib_libXinerama xlib_libXt
FEH_LICENSE = MIT
FEH_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBCURL),y)
FEH_DEPENDENCIES += libcurl
FEH_MAKE_OPTS += curl=1
else
FEH_MAKE_OPTS += curl=0
endif
define FEH_BUILD_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
$(MAKE) -C $(@D) all
$(MAKE) $(FEH_MAKE_OPTS) -C $(@D) all
endef
define FEH_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
$(TARGET_MAKE_ENV) $(MAKE) $(FEH_MAKE_OPTS) PREFIX=/usr \
DESTDIR=$(TARGET_DIR) -C $(@D) install
endef
$(eval $(generic-package))