diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-09-11 22:34:47 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-09-12 10:32:51 +0200 |
| commit | c29e68f808c2a8fd88722f82c3b8dd6901bfe80b (patch) | |
| tree | 162ab2dc31d6f9a823bd57b3cdedf9477ca03818 | |
| parent | 9c31063b0fe4e73ade03d0d02d8d90cffc1bc191 (diff) | |
| download | buildroot-c29e68f808c2a8fd88722f82c3b8dd6901bfe80b.tar.gz buildroot-c29e68f808c2a8fd88722f82c3b8dd6901bfe80b.zip | |
feh: libcurl is optional not mandatory
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>
| -rw-r--r-- | package/feh/Config.in | 1 | ||||
| -rw-r--r-- | 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 403485c550..a192bfbdb0 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -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)) |
