Skip to contentSkip to conversation

feh: libcurl is optional not mandatory

PATCH New Fabrice Fontaine 3 participants 3 messages Sep 11, 2018 – Sep 12, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 feh: libcurl is optional not mandatory

---
 package/feh/Config.in |  1 -
 package/feh/feh.mk    | 14 +++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)
package/feh/Config.in +0 -1
index 19b4abe0e3..277ec891b3 100644
@@ -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.
 
package/feh/feh.mk +11 -3
index 0bbec23111..c611c39ddc 100644
@@ -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))
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 feh: libcurl is optional not mandatory

Hi Fabrice,

Quoted 1 line
Quoted 23 lines
---
 package/feh/Config.in |  1 -
 package/feh/feh.mk    | 14 +++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)
package/feh/Config.in +0 -1
index 19b4abe0e3..277ec891b3 100644
@@ -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.
 
package/feh/feh.mk +0 -0
index 0bbec23111..c611c39ddc 100644
@@ -7,17 +7,25 @@
 FEH_VERSION = 2.26

package/feh/feh.mk line 16

Quoted 10 lines
package/feh/feh.mk +4 -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

This is the default, so it could be omitted, but I suppose it's good to specify it (can change in the future).

package/feh/feh.mk line 19

Quoted 3 lines
package/feh/feh.mk +3 -0
+else
+FEH_MAKE_OPTS += curl=0
+endif

...

BTW the same applies to Xinerama/XRandR ? it's not
mandatory either (remove BR2_PACKAGE_XLIB_LIBXINERAMA, use xinerama={0,1}).

Kind regards,
Petr

#2 lore raw

PATCH 1/1 feh: libcurl is optional not mandatory

In reply to Fabrice Fontaine

Hello,

Quoted 5 lines · Fabrice Fontaine
---
 package/feh/Config.in |  1 -
 package/feh/feh.mk    | 14 +++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com