Skip to contentSkip to conversation

package/cloop: needs _GNU_SOURCE

PATCH New Fabrice Fontaine 2 participants 5 messages Aug 1, 2019 – Aug 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/cloop: needs _GNU_SOURCE

host-cloop needs _GNU_SOURCE for loff_t otherwise build fails with gcc 8.3.0 on:
extract_compressed_fs.c: In function 'main':
extract_compressed_fs.c:55:2: error: unknown type name 'loff_t'; did you mean 'off_t'?
loff_t *offsets;

Fixes:
- No autobuilder failures

---
 package/cloop/cloop.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/cloop/cloop.mk +2 -1
index ad50d0a94a..585f422ce3 100644
@@ -13,7 +13,8 @@ CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
 HOST_CLOOP_DEPENDENCIES = host-zlib
 
 define HOST_CLOOP_BUILD_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes
+	$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes \
+		CFLAGS="$(HOST_CFLAGS) -D_GNU_SOURCE"
 endef
 
 define HOST_CLOOP_INSTALL_CMDS
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/cloop: bump to version 3.14.1.2

- Remove patch, it is not needed anymore as CFLAGS/LDFLAGS are now correctly passed to extract_compressed_fs. CFLAGS/LDFLAGS are not passed to cloop_suspend but it isn't built. Moreover original CFLAGS are lost but this is acceptable)
- Switch site to http://snapshot.debian.org/archive/debian as
http://debian-knoppix.alioth.debian.org/packages/sources/cloop is not available anymore
- Add hash for license files

---
 package/cloop/0001-cflags.patch | 30 ------------------------------
 package/cloop/cloop.hash        |  8 ++++++--
 package/cloop/cloop.mk          |  6 +++---
 3 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 package/cloop/0001-cflags.patch
package/cloop/0001-cflags.patch deleted +0 -30
deleted file mode 100644
index c421dd7f8b..0000000000
@@ -1,30 +0,0 @@
-Take into account the CFLAGS/LDFLAGS passed in the environment.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: host-cloop-2.634-1/Makefile
-===================================================================
---- host-cloop-2.634-1.orig/Makefile	2010-12-16 09:17:52.826555645 +0100
-+++ host-cloop-2.634-1/Makefile	2010-12-16 09:18:57.208713338 +0100
-@@ -15,7 +15,7 @@
- endif
- 
- ifdef APPSONLY
--CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer 
-+CLOOP_CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer 
- endif
- 
- KERNOBJ:=compressed_loop.o
-@@ -53,10 +53,10 @@
- 	( cd advancecomp-1.15 ; ./configure && $(MAKE) advfs )
- 
- extract_compressed_fs: extract_compressed_fs.c
--	$(CC) -Wall -O2 -s -o $@ $< -lz
-+	$(CC) $(CFLAGS) $(CLOOP_CFLAGS) $(LDFLAGS) -Wall -O2 -s -o $@ $< -lz
- 
- cloop_suspend: cloop_suspend.o
--	$(CC) -o $@ $<
-+	$(CC) $(CFLAGS) $(CLOOP_CFLAGS) $(LDFLAGS) -o $@ $<
- 
- clean:
- 	rm -rf create_compressed_fs extract_compressed_fs zoom *.o *.ko Module.symvers .cloop* .compressed_loop.* .tmp*
package/cloop/cloop.hash +6 -2
index 9acbceb05d..7af1a9594d 100644
@@ -1,2 +1,6 @@
-# From http://debian-knoppix.alioth.debian.org/packages/sources/cloop/cloop_2.634-1.dsc
-sha256	d6d03e2368e19f9c6c3a313e9c34cf0620d129ce26132a8805580d953769dbbd	cloop_2.634-1.tar.gz
+# From http://snapshot.debian.org/archive/debian/20150503T155713Z/pool/main/c/cloop/cloop_3.14.1.2.dsc
+sha256	ac344225b3a5c4ddbb0d4b20cd4874798b51427b707b53e2ee9fbdada7497c95	cloop_3.14.1.2.tar.xz
+
+# Hash for license files
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	advancecomp-1.15/COPYING
+sha256	1b1f89e94e131e259b9e334565c5c3500d4b8aa755b75c3f145ddcdff3b89124	README
package/cloop/cloop.mk +3 -3
index 585f422ce3..046d98c862 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CLOOP_VERSION = 2.634-1
-CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.gz
-CLOOP_SITE = http://debian-knoppix.alioth.debian.org/packages/sources/cloop
+CLOOP_VERSION = 3.14.1.2
+CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.xz
+CLOOP_SITE = http://snapshot.debian.org/archive/debian/20150503T155713Z/pool/main/c/cloop
 CLOOP_LICENSE = GPL-2.0 (module), GPL-2.0+ (advancecomp)
 CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 package/cloop: bump to version 3.14.1.2

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

- Remove patch, it is not needed anymore as CFLAGS/LDFLAGS are now correctly passed to extract_compressed_fs. CFLAGS/LDFLAGS are not passed to cloop_suspend but it isn't built. Moreover original CFLAGS are lost but this is acceptable)
- Switch site to http://snapshot.debian.org/archive/debian as
http://debian-knoppix.alioth.debian.org/packages/sources/cloop is not available anymore
- Add hash for license files

Quoted 1 line

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/cloop: needs _GNU_SOURCE

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

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

host-cloop needs _GNU_SOURCE for loff_t otherwise build fails with gcc 8.3.0 on:
extract_compressed_fs.c: In function 'main':
extract_compressed_fs.c:55:2: error: unknown type name 'loff_t'; did you mean 'off_t'?
loff_t *offsets;

Quoted 4 lines

Fixes:
- No autobuilder failures

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 package/cloop: needs _GNU_SOURCE

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

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

host-cloop needs _GNU_SOURCE for loff_t otherwise build fails with gcc 8.3.0 on:
extract_compressed_fs.c: In function 'main':
extract_compressed_fs.c:55:2: error: unknown type name 'loff_t'; did you mean 'off_t'?
loff_t *offsets;

Quoted 4 lines

Fixes:
- No autobuilder failures

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard