package/cifs-utils: add optional support for keyutils

PATCH New Bernd Kuhls 3 participants 15 messages Feb 21, 2016

lore

Share & tools

lore

Bernd Kuhls

author

2016-02-21 10:51 UTC #0 lore raw

PATCH 1/7 package/cifs-utils: add optional support for keyutils

When keyutils was compiled before, cifs-utils will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/cifscreds | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libkeyutils.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/cifs-utils/cifs-utils.mk | 4 ++++
 1 file changed, 4 insertions(+)

package/cifs-utils/cifs-utils.mk +4 -0

index e668b08..89358b1 100644
@@ -14,6 +14,10 @@ ifeq ($(BR2_STATIC_LIBS),y)
 CIFS_UTILS_CONF_OPTS += --disable-pie
 endif
 
+ifeq ($(BR2_PACKAGE_KEYUTILS),y)
+CIFS_UTILS_DEPENDENCIES += keyutils
+endif
+
 define CIFS_UTILS_NO_WERROR
 	$(SED) 's/-Werror//' $(@D)/Makefile.in
 endef

Signature · 1 line

2.7.0

Bernd Kuhls

author

2016-02-21 10:51 UTC #1 lore raw

PATCH 2/7 package/imagemagick: add optional support for lcms2

When lcms2 was compiled before, imagemagick will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/identify | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libMagickCore-6.Q16.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libMagickWand-6.Q16.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [liblcms2.so.2]
[...]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/imagemagick/imagemagick.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/imagemagick/imagemagick.mk +7 -0

index eee567e..8fc9532 100644
@@ -60,6 +60,13 @@ else
 IMAGEMAGICK_CONF_OPTS += --without-jpeg
 endif
 
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+IMAGEMAGICK_CONF_OPTS += --with-lcms
+IMAGEMAGICK_DEPENDENCIES += lcms2
+else
+IMAGEMAGICK_CONF_OPTS += --without-lcms
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 IMAGEMAGICK_CONF_OPTS += --with-png
 IMAGEMAGICK_DEPENDENCIES += libpng

Signature · 1 line

2.7.0

Thomas Petazzoni

Applied

2016-02-21 13:51 UTC #2 lore raw

PATCH 2/7 package/imagemagick: add optional support for lcms2

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

When lcms2 was compiled before, imagemagick will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/identify | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libMagickCore-6.Q16.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libMagickWand-6.Q16.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [liblcms2.so.2]
[...]

Quoted 4 lines

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/imagemagick/imagemagick.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2016-02-21 10:51 UTC #3 lore raw

PATCH 3/7 package/cairo: add optional support for lzo

In reply to Bernd Kuhls

When lzo was compiled before, cairo will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/cairo-sphinx | grep NEEDED | sort
[...]
 0x0000000000000001 (NEEDED)             Shared library: [liblzo2.so.2]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/cairo/cairo.mk | 3 +++
 1 file changed, 3 insertions(+)

package/cairo/cairo.mk +3 -0

index 205250d..49cf921 100644
@@ -142,6 +142,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_TEE),y)
 CAIRO_CONF_OPTS += --enable-tee
+ifeq ($(BR2_PACKAGE_LZO),y)
+CAIRO_DEPENDENCIES += lzo
+endif
 else
 CAIRO_CONF_OPTS += --disable-tee
 endif

Signature · 1 line

2.7.0

Arnout Vandecappelle

2016-02-21 12:48 UTC #4 lore raw

PATCH 3/7 package/cairo: add optional support for lzo

Quoted 16 lines · Bernd Kuhls

When lzo was compiled before, cairo will use it as optional dependency:
$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/cairo-sphinx | grep NEEDED | sort
[...]
 0x0000000000000001 (NEEDED)             Shared library: [liblzo2.so.2]
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/cairo/cairo.mk | 3 +++
 1 file changed, 3 insertions(+)
package/cairo/cairo.mk +0 -0
index 205250d..49cf921 100644

package/cairo/cairo.mk endif · line 147

Quoted 6 lines

package/cairo/cairo.mk +3 -0

@@ -142,6 +142,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_TEE),y)
 CAIRO_CONF_OPTS += --enable-tee
+ifeq ($(BR2_PACKAGE_LZO),y)
+CAIRO_DEPENDENCIES += lzo
+endif

I don't see why this would only be in the --enable-tee case.

In fact, it looks like it is rather bound to the script option than to the tee
option (at least, when looking at the source). But just to be safe I'd put this dependency outside of any conditions.

Regards,
Arnout

Quoted 4 lines

package/cairo/cairo.mk +0 -0

 else
 CAIRO_CONF_OPTS += --disable-tee
 endif

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Thomas Petazzoni

2016-02-21 13:51 UTC #5 lore raw

PATCH 3/7 package/cairo: add optional support for lzo

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls

When lzo was compiled before, cairo will use it as optional dependency:
$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/cairo-sphinx | grep NEEDED | sort
[...]
 0x0000000000000001 (NEEDED)             Shared library: [liblzo2.so.2]
Signed-off-by Bernd Kuhls <[email protected]>

I've marked this patch as Changes Requested, following the feedback from Arnout.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2016-02-21 10:51 UTC #6 lore raw

PATCH 4/7 package/libfm: add optional support for libexif

In reply to Bernd Kuhls

When libexif was compiled before, libfm will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libfm.so.4.0.3 | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libexif.so.12]
[...]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/libfm/libfm.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/libfm/libfm.mk +7 -0

index f0888b7..e8410d0 100644
@@ -12,4 +12,11 @@ LIBFM_LICENSE = GPLv2+, LGPLv2.1+
 LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
 LIBFM_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_LIBEXIF),y)
+LIBFM_CONF_OPTS += --enable-exif
+LIBFM_DEPENDENCIES += libexif
+else
+LIBFM_CONF_OPTS += --disable-exif
+endif
+
 $(eval $(autotools-package))

Signature · 1 line

2.7.0

Thomas Petazzoni

Applied

2016-02-21 13:51 UTC #7 lore raw

PATCH 4/7 package/libfm: add optional support for libexif

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

When libexif was compiled before, libfm will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libfm.so.4.0.3 | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libexif.so.12]
[...]

Quoted 4 lines

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libfm/libfm.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2016-02-21 10:51 UTC #8 lore raw

PATCH 5/7 package/dvdauthor: add optional support for libfribidi

In reply to Bernd Kuhls

When libfribidi was compiled before, dvdauthor will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/spumux | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libexpat.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfontconfig.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfreetype.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libfribidi.so.0]
[...]

The build system offers no option to en-/disable libfribidi support:
https://github.com/ldo/dvdauthor/blob/master/configure.ac#L83

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/dvdauthor/dvdauthor.mk | 4 ++++
 1 file changed, 4 insertions(+)

package/dvdauthor/dvdauthor.mk +4 -0

index be006f1..6b90c43 100644
@@ -34,6 +34,10 @@ ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 DVDAUTHOR_DEPENDENCIES += fontconfig
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+DVDAUTHOR_DEPENDENCIES += libfribidi
+endif
+
 ifeq ($(BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR),y)
 DVDAUTHOR_DEPENDENCIES += libdvdread
 DVDAUTHOR_CONF_OPTS += --enable-dvdunauthor

Signature · 1 line

2.7.0

Thomas Petazzoni

Applied

2016-02-21 13:51 UTC #9 lore raw

PATCH 5/7 package/dvdauthor: add optional support for libfribidi

Dear Bernd Kuhls,

Quoted 12 lines · Bernd Kuhls

When libfribidi was compiled before, dvdauthor will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/spumux | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libexpat.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfontconfig.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfreetype.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libfribidi.so.0]
[...]

Quoted 7 lines

The build system offers no option to en-/disable libfribidi support:
https://github.com/ldo/dvdauthor/blob/master/configure.ac#L83
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/dvdauthor/dvdauthor.mk | 4 ++++
 1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2016-02-21 10:51 UTC #10 lore raw

PATCH 6/7 package/sdl_sound: add optional support for libmodplug

In reply to Bernd Kuhls

When libmodplug was compiled before, sdl_sound will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libSDL_sound-1.0.so.1.0.2 | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libmodplug.so.1]
[...]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/sdl_sound/sdl_sound.mk | 4 ++++
 1 file changed, 4 insertions(+)

package/sdl_sound/sdl_sound.mk +4 -0

index 416f381..0e7f44d 100644
@@ -21,6 +21,10 @@ ifeq ($(BR2_PACKAGE_FLAC),y)
 SDL_SOUND_DEPENDENCIES += flac # is only used if ogg is also enabled
 endif
 
+ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
+SDL_SOUND_DEPENDENCIES += libmodplug
+endif
+
 ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
 SDL_SOUND_DEPENDENCIES += libvorbis
 endif

Signature · 1 line

2.7.0

Thomas Petazzoni

2016-02-21 13:52 UTC #11 lore raw

PATCH 6/7 package/sdl_sound: add optional support for libmodplug

Dear Bernd Kuhls,

package/sdl_sound/sdl_sound.mk ifeq ($(BR2_PACKAGE_FLAC),y) · line 26

Quoted 3 lines · Bernd Kuhls

package/sdl_sound/sdl_sound.mk +3 -0

+ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
+SDL_SOUND_DEPENDENCIES += libmodplug
+endif

Please use the --enable/--disable options, thanks! :-)

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2016-02-21 10:51 UTC #12 lore raw

PATCH 7/7 package/sdl_sound: FLAC support depends on libogg

In reply to Bernd Kuhls

For the flac package itself libogg is an optional dependency, but for flac support in sdl_sound libogg is mandatory:
http://hg.icculus.org/icculus/SDL_sound/file/394e3ec86164/configure.in#l263

To avoid compiling flac when libogg is disabled change the if-clause in this package to reflect the real dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libSDL_sound-1.0.so.1.0.2 | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libFLAC.so.8]
 0x0000000000000001 (NEEDED)             Shared library: [libmodplug.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libm.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libogg.so.0]
[...]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/sdl_sound/sdl_sound.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/sdl_sound/sdl_sound.mk +2 -2

index 0e7f44d..01753bd 100644
@@ -17,8 +17,8 @@ SDL_SOUND_DEPENDENCIES += libiconv
 endif
 
 # optional dependencies
-ifeq ($(BR2_PACKAGE_FLAC),y)
-SDL_SOUND_DEPENDENCIES += flac # is only used if ogg is also enabled
+ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBOGG),yy)
+SDL_SOUND_DEPENDENCIES += flac libogg
 endif
 
 ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)

Signature · 1 line

2.7.0

Thomas Petazzoni

2016-02-21 13:52 UTC #13 lore raw

PATCH 7/7 package/sdl_sound: FLAC support depends on libogg

Dear Bernd Kuhls,

package/sdl_sound/sdl_sound.mk SDL_SOUND_DEPENDENCIES += libiconv · line 22

Quoted 6 lines · Bernd Kuhls

 # optional dependencies

package/sdl_sound/sdl_sound.mk +2 -2

-ifeq ($(BR2_PACKAGE_FLAC),y)
-SDL_SOUND_DEPENDENCIES += flac # is only used if ogg is also enabled
+ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBOGG),yy)
+SDL_SOUND_DEPENDENCIES += flac libogg
 endif

Ditto, please use the --enable/--disable options, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2016-02-21 13:45 UTC #14 lore raw

PATCH 1/7 package/cifs-utils: add optional support for keyutils

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 11 lines · Bernd Kuhls

When keyutils was compiled before, cifs-utils will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/cifscreds | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libkeyutils.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/cifs-utils/cifs-utils.mk | 4 ++++
 1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com