summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 19:40:22 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 19:40:24 +0200
commitbd48b8940bef84b08ae6e20e622b839c2ec25d6b (patch)
tree0eed3535ee63bd577de19109be81e24da89226d1
parenta828921ccf912224c3f9ae213f6ac2bcda5039fd (diff)
downloadptxdist-bd48b8940bef84b08ae6e20e622b839c2ec25d6b.tar.gz
host-cdrkit: version bump 1.1.10 -> 1.1.11
And fix building with gcc-10. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/cdrkit_1.1.11.orig/0001-fix-building-with-gcc-10.patch27
-rw-r--r--patches/cdrkit_1.1.11.orig/series4
-rw-r--r--rules/host-cdrkit.make4
3 files changed, 33 insertions, 2 deletions
diff --git a/patches/cdrkit_1.1.11.orig/0001-fix-building-with-gcc-10.patch b/patches/cdrkit_1.1.11.orig/0001-fix-building-with-gcc-10.patch
new file mode 100644
index 0000000..acc7a87
--- /dev/null
+++ b/patches/cdrkit_1.1.11.orig/0001-fix-building-with-gcc-10.patch
@@ -0,0 +1,27 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 24 May 2020 19:38:18 +0200
+Subject: [PATCH] fix building with gcc 10
+
+Without this, building with gcc-10 fails with:
+
+/usr/bin/ld: CMakeFiles/genisoimage.dir/apple.o:.../genisoimage/geniso
+image.h:379: multiple definition of `outfile'; CMakeFiles/genisoimage.dir/genisoimage.o:.../genisoimage/genisoimage.h:379: first defined here
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ genisoimage/genisoimage.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h
+index bbedfb08da6a..82c859bc93e8 100644
+--- a/genisoimage/genisoimage.h
++++ b/genisoimage/genisoimage.h
+@@ -376,7 +376,7 @@ extern int use_fileversion;
+ extern int split_SL_component;
+ extern int split_SL_field;
+ extern char *trans_tbl;
+-char *outfile;
++extern char *outfile;
+
+ #define JMAX 64 /* maximum Joliet file name length (spec) */
+ #define JLONGMAX 103 /* out of spec Joliet file name length */
diff --git a/patches/cdrkit_1.1.11.orig/series b/patches/cdrkit_1.1.11.orig/series
new file mode 100644
index 0000000..1baeb7a
--- /dev/null
+++ b/patches/cdrkit_1.1.11.orig/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-building-with-gcc-10.patch
+# f817eeeb20f0ddcd4bda72b610a77de9 - git-ptx-patches magic
diff --git a/rules/host-cdrkit.make b/rules/host-cdrkit.make
index dd98ffa..1719a28 100644
--- a/rules/host-cdrkit.make
+++ b/rules/host-cdrkit.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CDRKIT) += host-cdrkit
#
# Paths and names
#
-HOST_CDRKIT_VERSION := 1.1.10
-HOST_CDRKIT_MD5 := 3c25505d567113c269dc6e71640646d8
+HOST_CDRKIT_VERSION := 1.1.11
+HOST_CDRKIT_MD5 := efe08e2f3ca478486037b053acd512e9
HOST_CDRKIT := cdrkit_$(HOST_CDRKIT_VERSION).orig
HOST_CDRKIT_SUFFIX := tar.gz
HOST_CDRKIT_URL := http://snapshot.debian.org/archive/debian/20101109T151711Z/pool/main/c/cdrkit/$(HOST_CDRKIT).$(HOST_CDRKIT_SUFFIX)