diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2017-04-22 23:10:44 +0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-04-26 09:58:49 +0200 |
| commit | 0a0524876b2872d345a9517c169f29ddb72851e6 (patch) | |
| tree | b4cbea47268a0efab0fa9cf962a7aab078348d6b | |
| parent | 002d9ed3541caf4dd7087f97166d79d4e6988b49 (diff) | |
| download | buildroot-0a0524876b2872d345a9517c169f29ddb72851e6.tar.gz buildroot-0a0524876b2872d345a9517c169f29ddb72851e6.zip | |
xorriso: disable libcdio
xorriso and libcdio define identically named symbols. This breaks static
linking.
Besides, upstream suggested that on Linux the built-in libburn adapter is much
better tested than libcdio.
Disable libcdio.
Fixes:
http://autobuild.buildroot.net/results/430/430a6b548fcc311f20ea71cecaa11fafac1d5a19/
http://autobuild.buildroot.net/results/a5d/a5d0f8bec0d39e48f6dfe4ecc07fe0ca3c6bd70a/
Cc: Steve Kenton <skenton@ou.edu>
Suggested-by: Thomas Schmitt <scdbackup@gmx.net>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Steve Kenton <skenton@ou.edu>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/xorriso/xorriso.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk index b205580430..1f095911f8 100644 --- a/package/xorriso/xorriso.mk +++ b/package/xorriso/xorriso.mk @@ -18,19 +18,14 @@ HOST_XORRISO_CONF_OPTS = \ --disable-libedit \ --disable-libacl +# libcdio doesn't make sense for Linux +# http://lists.gnu.org/archive/html/bug-xorriso/2017-04/msg00004.html +XORRISO_CONF_OPTS = --disable-libcdio + ifeq ($(BR2_PACKAGE_LIBICONV),y) XORRISO_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBCDIO),y) -XORRISO_DEPENDENCIES += host-pkgconf libcdio -XORRISO_CONF_OPTS += \ - --enable-pkg-check-modules \ - --enable-libcdio -else -XORRISO_CONF_OPTS += --disable-libcdio -endif - ifeq ($(BR2_PACKAGE_READLINE),y) XORRISO_DEPENDENCIES += readline XORRISO_CONF_OPTS += --enable-libreadline |
