Skip to contentSkip to conversation

package/exiv2: really disable samples

PATCH New Fabrice Fontaine 3 participants 5 messages Jul 13, 2020 – Jul 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/exiv2: really disable samples

EXIV2_ENABLE_BUILD_SAMPLES has been renamed into EXIV2_BUILD_SAMPLES since version 0.27 and
https://github.com/Exiv2/exiv2/commit/60d436c96960fa314e2d12d017440253ce280d51

---
 package/exiv2/exiv2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/exiv2/exiv2.mk +1 -1
index 7f38473609..fa19a76282 100644
@@ -10,7 +10,7 @@ EXIV2_INSTALL_STAGING = YES
 EXIV2_LICENSE = GPL-2.0+
 EXIV2_LICENSE_FILES = COPYING
 
-EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF
+EXIV2_CONF_OPTS += -DEXIV2_BUILD_SAMPLES=OFF
 
 # The following CMake variable disables a TRY_RUN call in the -pthread
 # test which is not allowed when cross-compiling.
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/2 package/exiv2: drop unrecognized variable

EXIV2_ENABLE_LIBXMP has been dropped since version 0.27 and
https://github.com/Exiv2/exiv2/commit/2784b1f7f7ddcc66211e6cf492de1588aa6093d9

---
 package/exiv2/exiv2.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/exiv2/exiv2.mk +2 -2
index fa19a76282..78b9c2e425 100644
@@ -30,10 +30,10 @@ EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_EXIV2_XMP),y)
-EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON
+EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON
 EXIV2_DEPENDENCIES += expat
 else
-EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF
+EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF
 endif
 
 EXIV2_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
Signature · 1 line
2.27.0
#3 lore raw

PATCH 1/2 package/exiv2: really disable samples

In reply to Fabrice Fontaine
Quoted 8 lines · On Mon, 13 Jul 2020 23:40:22 +0200 Fabrice Fontaine…

EXIV2_ENABLE_BUILD_SAMPLES has been renamed into EXIV2_BUILD_SAMPLES since version 0.27 and
https://github.com/Exiv2/exiv2/commit/60d436c96960fa314e2d12d017440253ce280d51

---
 package/exiv2/exiv2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/2 package/exiv2: really disable samples

In reply to Fabrice Fontaine
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

EXIV2_ENABLE_BUILD_SAMPLES has been renamed into EXIV2_BUILD_SAMPLES since version 0.27 and
https://github.com/Exiv2/exiv2/commit/60d436c96960fa314e2d12d017440253ce280d51

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard