[Buildroot] [PATCH 1/1] feh: libcurl is optional not mandatory
Fabrice Fontaine
fontaine.fabrice at gmail.com
Tue Sep 11 20:34:47 UTC 2018
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
---
package/feh/Config.in | 1 -
package/feh/feh.mk | 14 +++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/package/feh/Config.in b/package/feh/Config.in
index 19b4abe0e3..277ec891b3 100644
--- a/package/feh/Config.in
+++ b/package/feh/Config.in
@@ -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.
diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 0bbec23111..c611c39ddc 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -7,17 +7,25 @@
FEH_VERSION = 2.26
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))
--
2.17.1
More information about the buildroot
mailing list