summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flx/wdd/Manifest14
-rw-r--r--flx/wdd/files/0.1.34-remove-strip-diet.diff50
-rw-r--r--flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff15
-rw-r--r--flx/wdd/files/0.1.34-warning-cast.diff30
-rw-r--r--flx/wdd/files/0.1.34-warning-implicit-declaration.diff14
-rw-r--r--flx/wdd/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch149
-rw-r--r--flx/wdd/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch56
-rw-r--r--flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch149
-rw-r--r--flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch56
-rw-r--r--flx/wdd/files/9999-remove-strip-diet.diff45
-rw-r--r--flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff24
-rw-r--r--flx/wdd/wdd-0.1.35.ebuild (renamed from flx/wdd/wdd-0.1.34-r2.ebuild)6
-rw-r--r--flx/wdd/wdd-9999.ebuild4
13 files changed, 420 insertions, 192 deletions
diff --git a/flx/wdd/Manifest b/flx/wdd/Manifest
index 95835805..d802dc3e 100644
--- a/flx/wdd/Manifest
+++ b/flx/wdd/Manifest
@@ -1,11 +1,9 @@
-AUX 0.1.34-remove-strip-diet.diff 1558 SHA256 16b19327d1c8487f3badefb2c5ad714f020b0fe805aeab2d1e500d61cb2b774b WHIRLPOOL 819dac4e550c13ec6c7ba86bdb17d4525237c3fd1dc8275cbfd1c798b95c3f01bada25b66607ce63d94d56accd7b95d476376aa721dcd8a3275991bc989a067b
-AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
-AUX 0.1.34-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a
-AUX 0.1.34-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9
-AUX 9999-remove-strip-diet.diff 1475 SHA256 90dfb592c73c7f1b0e8608418af5bcd829577c7b50cf676c4816990d77ef26c5 WHIRLPOOL 26b41d73386121f0c6273bd5d05da73814a0678e899137126f4c696dd0faf319fed81b7e50acd30ea2a0d4d90028482fa61ac2b4225282d9650693113286406a
-AUX 9999-respect-CFLAGS-LDFLAGS.diff 768 SHA256 0ae2ca40da7bedf0d2d64e05ae7d5ad0aa2e970a3334d842e8ff9fe4d172fd2a WHIRLPOOL 1c0e3236aee5ce3eb92b0f4c389ec97c167c73aeab4fe3c3b853a0009ce376fa58aedb372224054f41af04b33748f15f00e11da70f5a08e6ba5d5523ae318064
+AUX 0.1.35-MEDIUM-Remove-strip-and-uclibc.patch 4720 SHA256 c605c0e1d38dd051736f074e6c02646c29f95e6138e2532a8efe82ec0bce1fa9 WHIRLPOOL 8db8edda4e9f55f3add670a2c77d9e6e431d64e8459c743f0829a86e5d50bd47854a968d27677aeb6c6c7c18fc33184e28844893a2db5454a69fdcf23e1b52f7
+AUX 0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch 1772 SHA256 5be60935a419d85831b1be2e6562128bb982b7e4a161550dad9110e77c0e84e6 WHIRLPOOL 628578cad6730c4e26d80e24e3b1fa4d5127b20a090c4219c1516c73d75eb1f034c458f6f71f8944fab0e6fe11f103c2ad3e0abb39dd918f3fa58505494afb25
+AUX 9999-MEDIUM-Remove-strip-and-uclibc.patch 4720 SHA256 c605c0e1d38dd051736f074e6c02646c29f95e6138e2532a8efe82ec0bce1fa9 WHIRLPOOL 8db8edda4e9f55f3add670a2c77d9e6e431d64e8459c743f0829a86e5d50bd47854a968d27677aeb6c6c7c18fc33184e28844893a2db5454a69fdcf23e1b52f7
+AUX 9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch 1772 SHA256 5be60935a419d85831b1be2e6562128bb982b7e4a161550dad9110e77c0e84e6 WHIRLPOOL 628578cad6730c4e26d80e24e3b1fa4d5127b20a090c4219c1516c73d75eb1f034c458f6f71f8944fab0e6fe11f103c2ad3e0abb39dd918f3fa58505494afb25
AUX wdd.confd 63 SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 WHIRLPOOL ff4487a3e0c178de715361eb7be56899d1614e211751b041a529ed9f7d01519d164b67cb0a26c47a129bbeeafccc634f007c50706e67bc19e630e6caf46cd15c
AUX wdd.initd 637 SHA256 9e6b3e0db80b0e62f4056a2f68572c1ca57b3809c8e71cfe714b3c2f02bce44f WHIRLPOOL 8fdb8709cb9072b9cf7b8b64863a71efcd858a0d28659d8be8d73ea8da99389a8e52d828ebf5ff269dfa49a2d14e4e03d038469a79032be6c6a0da48857f02dc
-EBUILD wdd-0.1.34-r2.ebuild 825 SHA256 0cfc82bd6d25a46c0ae95669d5a4dacbf4ebefcf9d57d13d572431673e999ade WHIRLPOOL b7d58ebc10f05cf07ecab911b02e559d0d745e8396c49137600d8855f1d7ce24d85ce5d5ad5e52e6de8f1ac58b8184234de9c75b7d5ce8acc62b04820778d9a5
-EBUILD wdd-9999.ebuild 678 SHA256 c4030cfecb4bb56544f9327db76f9efe980d6b032f51963d7cc7f3d9464778d0 WHIRLPOOL 02a2d445f96881de3f234f8b564958bf224f4d1ca774781df2000bc0a7d36f69c8cf4a5c9c3038d263e7b597c4aae4a93ce512d8622d7ce0c6075d70a7293ef8
+EBUILD wdd-0.1.35.ebuild 743 SHA256 9dfc7cfbd46b84469e16e1a3aa2c5f809fe68060ba14942c215f83bf04a47299 WHIRLPOOL b1ddf2bb97752fff7cc25aae392bc6701d0ab0da13dcef2969dc1c70b2bbb1961422f1488f70d720212cf3b81e2da54999b62f94896b98253dec4ab2d430e2b5
+EBUILD wdd-9999.ebuild 704 SHA256 0ed44a38594ce4d5f2abe89ebaa9edc07d5df0b6d8e55f57d4ee7824e551c9f2 WHIRLPOOL 36d97119bfd67c10f4053e7873c4fa11797804ff8c526985c9bb8a69a2f99b8189319b519bb1529c7003bc8c3bf0cd3a820f257fe274a83009a71df0600502db
MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/wdd/files/0.1.34-remove-strip-diet.diff b/flx/wdd/files/0.1.34-remove-strip-diet.diff
deleted file mode 100644
index 166a3809..00000000
--- a/flx/wdd/files/0.1.34-remove-strip-diet.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/include/rules.make b/include/rules.make
-index 99bff82..f373aad 100644
---- a/include/rules.make
-+++ b/include/rules.make
-@@ -1,30 +1,16 @@
- CC ?= gcc
--STRIP ?= strip
--OBJDUMP ?= objdump
--SSTRIP ?= sstrip
--DIET ?= diet
--
--CC_ORIG := $(CC)
--override CC := $(DIET) $(CC)
-
- CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
- #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
--LDFLAGS=-s -Wl,--gc-sections
-+LDFLAGS=-Wl,--gc-sections
-
- all: $(OBJS)
-
- %: %.c
- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
-- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
-- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
-- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
-- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
-
- %-debug: %.c
- $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $<
-- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
-- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
-- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
-
- clean:
- @rm -f *.[ao] *~ core
-diff --git a/wd/Makefile b/wd/Makefile
-index ed8a82c..e41685a 100644
---- a/wd/Makefile
-+++ b/wd/Makefile
-@@ -1,9 +1,3 @@
- OBJS=wdd
- include ../include/rules.make
- CFLAGS+=-fomit-frame-pointer
--
--%: %.c
-- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
-- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
-- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
-- #$(SSTRIP) $@
diff --git a/flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index 8ac81836..00000000
--- a/flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/rules.make b/include/rules.make
-index f373aad..1f95cd1 100644
---- a/include/rules.make
-+++ b/include/rules.make
-@@ -1,8 +1,8 @@
- CC ?= gcc
-
--CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
-+CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
- #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
--LDFLAGS=-Wl,--gc-sections
-+LDFLAGS += -Wl,--gc-sections
-
- all: $(OBJS)
-
diff --git a/flx/wdd/files/0.1.34-warning-cast.diff b/flx/wdd/files/0.1.34-warning-cast.diff
deleted file mode 100644
index c4a1c7b8..00000000
--- a/flx/wdd/files/0.1.34-warning-cast.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/wd/wdd.c b/wd/wdd.c
-index c48758c..0519eb0 100644
---- a/wd/wdd.c
-+++ b/wd/wdd.c
-@@ -9,6 +9,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/wait.h>
-+#include <unistd.h>
-
- const char dev_wd_str[] = "/dev/watchdog"; /* standard entry */
- const char dev_misc_str[] = "/dev/misc/watchdog"; /* devfs entry */
-@@ -22,7 +23,7 @@ const char root_str[] = "/";
- static inline void try_malloc() {
- void *heap;
-
-- heap = (void*)sbrk(NULL);
-+ heap = sbrk(0);
- if (brk(heap + 4096))
- exit(1);
- memset(heap, 0, 4096);
-@@ -56,7 +57,7 @@ static inline int try_stat(const char *file, int do_exit) {
- void *heap;
- int ret;
-
-- heap = (void*)sbrk(NULL);
-+ heap = sbrk(0);
- if (brk(heap + sizeof (struct stat)))
- exit(1);
- memset(heap, 0, sizeof (struct stat));
diff --git a/flx/wdd/files/0.1.34-warning-implicit-declaration.diff b/flx/wdd/files/0.1.34-warning-implicit-declaration.diff
deleted file mode 100644
index 8839d1bc..00000000
--- a/flx/wdd/files/0.1.34-warning-implicit-declaration.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/wd/wdd.c b/wd/wdd.c
-index 4468178..c48758c 100644
---- a/wd/wdd.c
-+++ b/wd/wdd.c
-@@ -6,6 +6,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/wait.h>
-
- const char dev_wd_str[] = "/dev/watchdog"; /* standard entry */
- const char dev_misc_str[] = "/dev/misc/watchdog"; /* devfs entry */
diff --git a/flx/wdd/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch b/flx/wdd/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch
new file mode 100644
index 00000000..6ffe6b44
--- /dev/null
+++ b/flx/wdd/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch
@@ -0,0 +1,149 @@
+From caa62e8ba16c340aafd45375ec99f48261e62abf Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 27 May 2013 22:36:39 +0200
+Subject: [PATCH 1/2] MEDIUM: Remove strip and uclibc
+
+---
+ flx/Makefile | 1 -
+ ifenslave/Makefile | 3 ---
+ include/rules.make | 16 +---------------
+ lcd/Makefile | 3 ---
+ mii/Makefile | 3 ---
+ mktmp/Makefile | 3 ---
+ remount/Makefile | 3 ---
+ signfs/Makefile | 1 -
+ wd/Makefile | 3 ---
+ 9 files changed, 1 insertion(+), 35 deletions(-)
+
+diff --git a/flx/Makefile b/flx/Makefile
+index 68ecb4c..408c9b5 100644
+--- a/flx/Makefile
++++ b/flx/Makefile
+@@ -39,7 +39,6 @@ all: $(NAME)
+
+ $(NAME): $(OBJ)
+ $(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
+-# strip -R .note -R .comment signfs
+
+ clean:
+ @$(RM) -vf $(NAME) $(OBJ) $(LIBTOOLS:.c=.o) *~ core *.bak
+diff --git a/ifenslave/Makefile b/ifenslave/Makefile
+index 7ba3dc7..14fd640 100644
+--- a/ifenslave/Makefile
++++ b/ifenslave/Makefile
+@@ -13,9 +13,6 @@ ifenslave:
+
+ ifenslave%: ifenslave%.o
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- # sstrip $@
+
+ %.o: %.c
+ $(CC) $(CFLAGS) -c -o $@ $<
+diff --git a/include/rules.make b/include/rules.make
+index 715db29..f373aad 100644
+--- a/include/rules.make
++++ b/include/rules.make
+@@ -1,30 +1,16 @@
+ CC ?= gcc
+-STRIP ?= strip
+-OBJDUMP ?= objdump
+-SSTRIP ?= sstrip
+-UCLIBC ?= uclibc
+-
+-CC_ORIG := $(CC)
+-override CC := $(UCLIBC) $(CC) -Os
+
+ CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
+ #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
+-LDFLAGS=-s -Wl,--gc-sections
++LDFLAGS=-Wl,--gc-sections
+
+ all: $(OBJS)
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
+- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
+
+ %-debug: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
+
+ clean:
+ @rm -f *.[ao] *~ core
+diff --git a/lcd/Makefile b/lcd/Makefile
+index 71d861f..4de920f 100644
+--- a/lcd/Makefile
++++ b/lcd/Makefile
+@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- #$(SSTRIP) $@
+diff --git a/mii/Makefile b/mii/Makefile
+index 791f6b9..21d64d3 100644
+--- a/mii/Makefile
++++ b/mii/Makefile
+@@ -7,9 +7,6 @@ all: $(OBJS)
+
+ %-diag: %-diag.o libmii.o
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- #$(SSTRIP) $@
+
+ %.o: %.c
+ $(CC) -DLIBMII $(CFLAGS) -c -o $@ $<
+diff --git a/mktmp/Makefile b/mktmp/Makefile
+index 2188b91..ef4b083 100644
+--- a/mktmp/Makefile
++++ b/mktmp/Makefile
+@@ -4,6 +4,3 @@ include ../include/rules.make
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- #$(SSTRIP) $@
+diff --git a/remount/Makefile b/remount/Makefile
+index 5aa2491..54a79ad 100644
+--- a/remount/Makefile
++++ b/remount/Makefile
+@@ -7,6 +7,3 @@ remountw : remountr
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
+diff --git a/signfs/Makefile b/signfs/Makefile
+index f50b301..d4214c6 100644
+--- a/signfs/Makefile
++++ b/signfs/Makefile
+@@ -35,7 +35,6 @@ LIBTOOLS=md5.c libtools.c others.c
+
+ $(NAME): libtools.a $(OBJ)
+ $(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
+- #strip -R .note -R .comment signfs
+
+ libtools.a: $(LIBTOOLS:.c=.o)
+ $(AR) -r libtools.a $(LIBTOOLS:.c=.o)
+diff --git a/wd/Makefile b/wd/Makefile
+index 6f1fa72..eaf857a 100644
+--- a/wd/Makefile
++++ b/wd/Makefile
+@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -W -Wall -U_FORTIFY_SOURCE -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
diff --git a/flx/wdd/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/wdd/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
new file mode 100644
index 00000000..dec2fc8d
--- /dev/null
+++ b/flx/wdd/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
@@ -0,0 +1,56 @@
+From 25a9b5d4cd1b57c81e697ff7e54bf9121e8bbfa4 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 27 May 2013 22:36:39 +0200
+Subject: [PATCH 2/2] MEDIUM: Respect CFLAGS and LDFLAGS
+
+---
+ flx/Makefile | 4 ++--
+ include/rules.make | 5 ++---
+ signfs/Makefile | 4 ++--
+ 3 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/flx/Makefile b/flx/Makefile
+index 408c9b5..09e25b4 100644
+--- a/flx/Makefile
++++ b/flx/Makefile
+@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
+ output.c output_file.c
+ OBJ=$(SRC:.c=.o)
+ COPTS=-O2 -fno-strict-aliasing
+-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
+-LDFLAGS=-L. -Wl,--gc-sections
++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
++LDFLAGS += -L. -Wl,--gc-sections
+
+ all: $(NAME)
+
+diff --git a/include/rules.make b/include/rules.make
+index f373aad..02240e0 100644
+--- a/include/rules.make
++++ b/include/rules.make
+@@ -1,8 +1,7 @@
+ CC ?= gcc
+
+-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
+-#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
+-LDFLAGS=-Wl,--gc-sections
++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
++LDFLAGS += -Wl,--gc-sections
+
+ all: $(OBJS)
+
+diff --git a/signfs/Makefile b/signfs/Makefile
+index d4214c6..ab03992 100644
+--- a/signfs/Makefile
++++ b/signfs/Makefile
+@@ -29,8 +29,8 @@ NAME=signfs
+ SRC=main.c signfs.c structure.c
+ OBJ=$(SRC:.c=.o)
+ COPTS=-Os -march=i386
+-CFLAGS=$(COPTS) -Wall
+-LDFLAGS=-L. -ltools
++CFLAGS += -Wall
++LDFLAGS += -L. -ltools
+ LIBTOOLS=md5.c libtools.c others.c
+
+ $(NAME): libtools.a $(OBJ)
diff --git a/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch b/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch
new file mode 100644
index 00000000..6ffe6b44
--- /dev/null
+++ b/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch
@@ -0,0 +1,149 @@
+From caa62e8ba16c340aafd45375ec99f48261e62abf Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 27 May 2013 22:36:39 +0200
+Subject: [PATCH 1/2] MEDIUM: Remove strip and uclibc
+
+---
+ flx/Makefile | 1 -
+ ifenslave/Makefile | 3 ---
+ include/rules.make | 16 +---------------
+ lcd/Makefile | 3 ---
+ mii/Makefile | 3 ---
+ mktmp/Makefile | 3 ---
+ remount/Makefile | 3 ---
+ signfs/Makefile | 1 -
+ wd/Makefile | 3 ---
+ 9 files changed, 1 insertion(+), 35 deletions(-)
+
+diff --git a/flx/Makefile b/flx/Makefile
+index 68ecb4c..408c9b5 100644
+--- a/flx/Makefile
++++ b/flx/Makefile
+@@ -39,7 +39,6 @@ all: $(NAME)
+
+ $(NAME): $(OBJ)
+ $(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
+-# strip -R .note -R .comment signfs
+
+ clean:
+ @$(RM) -vf $(NAME) $(OBJ) $(LIBTOOLS:.c=.o) *~ core *.bak
+diff --git a/ifenslave/Makefile b/ifenslave/Makefile
+index 7ba3dc7..14fd640 100644
+--- a/ifenslave/Makefile
++++ b/ifenslave/Makefile
+@@ -13,9 +13,6 @@ ifenslave:
+
+ ifenslave%: ifenslave%.o
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- # sstrip $@
+
+ %.o: %.c
+ $(CC) $(CFLAGS) -c -o $@ $<
+diff --git a/include/rules.make b/include/rules.make
+index 715db29..f373aad 100644
+--- a/include/rules.make
++++ b/include/rules.make
+@@ -1,30 +1,16 @@
+ CC ?= gcc
+-STRIP ?= strip
+-OBJDUMP ?= objdump
+-SSTRIP ?= sstrip
+-UCLIBC ?= uclibc
+-
+-CC_ORIG := $(CC)
+-override CC := $(UCLIBC) $(CC) -Os
+
+ CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
+ #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
+-LDFLAGS=-s -Wl,--gc-sections
++LDFLAGS=-Wl,--gc-sections
+
+ all: $(OBJS)
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
+- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
+
+ %-debug: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
+
+ clean:
+ @rm -f *.[ao] *~ core
+diff --git a/lcd/Makefile b/lcd/Makefile
+index 71d861f..4de920f 100644
+--- a/lcd/Makefile
++++ b/lcd/Makefile
+@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- #$(SSTRIP) $@
+diff --git a/mii/Makefile b/mii/Makefile
+index 791f6b9..21d64d3 100644
+--- a/mii/Makefile
++++ b/mii/Makefile
+@@ -7,9 +7,6 @@ all: $(OBJS)
+
+ %-diag: %-diag.o libmii.o
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- #$(SSTRIP) $@
+
+ %.o: %.c
+ $(CC) -DLIBMII $(CFLAGS) -c -o $@ $<
+diff --git a/mktmp/Makefile b/mktmp/Makefile
+index 2188b91..ef4b083 100644
+--- a/mktmp/Makefile
++++ b/mktmp/Makefile
+@@ -4,6 +4,3 @@ include ../include/rules.make
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- #$(SSTRIP) $@
+diff --git a/remount/Makefile b/remount/Makefile
+index 5aa2491..54a79ad 100644
+--- a/remount/Makefile
++++ b/remount/Makefile
+@@ -7,6 +7,3 @@ remountw : remountr
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
+diff --git a/signfs/Makefile b/signfs/Makefile
+index f50b301..d4214c6 100644
+--- a/signfs/Makefile
++++ b/signfs/Makefile
+@@ -35,7 +35,6 @@ LIBTOOLS=md5.c libtools.c others.c
+
+ $(NAME): libtools.a $(OBJ)
+ $(CC) -o $(NAME) $(OBJ) $(LDFLAGS)
+- #strip -R .note -R .comment signfs
+
+ libtools.a: $(LIBTOOLS:.c=.o)
+ $(AR) -r libtools.a $(LIBTOOLS:.c=.o)
+diff --git a/wd/Makefile b/wd/Makefile
+index 6f1fa72..eaf857a 100644
+--- a/wd/Makefile
++++ b/wd/Makefile
+@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer
+
+ %: %.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -W -Wall -U_FORTIFY_SOURCE -o $@ $<
+- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
+- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
+- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
diff --git a/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
new file mode 100644
index 00000000..dec2fc8d
--- /dev/null
+++ b/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
@@ -0,0 +1,56 @@
+From 25a9b5d4cd1b57c81e697ff7e54bf9121e8bbfa4 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 27 May 2013 22:36:39 +0200
+Subject: [PATCH 2/2] MEDIUM: Respect CFLAGS and LDFLAGS
+
+---
+ flx/Makefile | 4 ++--
+ include/rules.make | 5 ++---
+ signfs/Makefile | 4 ++--
+ 3 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/flx/Makefile b/flx/Makefile
+index 408c9b5..09e25b4 100644
+--- a/flx/Makefile
++++ b/flx/Makefile
+@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
+ output.c output_file.c
+ OBJ=$(SRC:.c=.o)
+ COPTS=-O2 -fno-strict-aliasing
+-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
+-LDFLAGS=-L. -Wl,--gc-sections
++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
++LDFLAGS += -L. -Wl,--gc-sections
+
+ all: $(NAME)
+
+diff --git a/include/rules.make b/include/rules.make
+index f373aad..02240e0 100644
+--- a/include/rules.make
++++ b/include/rules.make
+@@ -1,8 +1,7 @@
+ CC ?= gcc
+
+-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
+-#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
+-LDFLAGS=-Wl,--gc-sections
++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
++LDFLAGS += -Wl,--gc-sections
+
+ all: $(OBJS)
+
+diff --git a/signfs/Makefile b/signfs/Makefile
+index d4214c6..ab03992 100644
+--- a/signfs/Makefile
++++ b/signfs/Makefile
+@@ -29,8 +29,8 @@ NAME=signfs
+ SRC=main.c signfs.c structure.c
+ OBJ=$(SRC:.c=.o)
+ COPTS=-Os -march=i386
+-CFLAGS=$(COPTS) -Wall
+-LDFLAGS=-L. -ltools
++CFLAGS += -Wall
++LDFLAGS += -L. -ltools
+ LIBTOOLS=md5.c libtools.c others.c
+
+ $(NAME): libtools.a $(OBJ)
diff --git a/flx/wdd/files/9999-remove-strip-diet.diff b/flx/wdd/files/9999-remove-strip-diet.diff
deleted file mode 100644
index ffbbb0f5..00000000
--- a/flx/wdd/files/9999-remove-strip-diet.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-From e0fa5f0e5e772c91bd38be344f9d8162ed913da8 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon, 27 May 2013 22:36:39 +0200
-Subject: [PATCH] MEDIUM: Remove strip and uclibc
-
----
- include/rules.make | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/include/rules.make b/include/rules.make
-index 715db29..ac19c79 100644
---- a/include/rules.make
-+++ b/include/rules.make
-@@ -1,30 +1,17 @@
- CC ?= gcc
--STRIP ?= strip
--OBJDUMP ?= objdump
--SSTRIP ?= sstrip
--UCLIBC ?= uclibc
--
--CC_ORIG := $(CC)
--override CC := $(UCLIBC) $(CC) -Os
-
- CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
- #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
--LDFLAGS=-s -Wl,--gc-sections
-+LDFLAGS=-Wl,--gc-sections
-
- all: $(OBJS)
-
- %: %.c
- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
-- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
-- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
-- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
-
- %-debug: %.c
- $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $<
-- $(STRIP) -x --strip-unneeded -R .comment -R .note $@
-- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
-- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
-
- clean:
- @rm -f *.[ao] *~ core
diff --git a/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index eee82589..00000000
--- a/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From fec67f5e0511469c50bfdd984ab9f3c5399dacad Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon, 27 May 2013 22:36:39 +0200
-Subject: [PATCH] MEDIUM: Respect CFLAGS and LDFLAGS
-
----
- include/rules.make | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/include/rules.make b/include/rules.make
-index ac19c79..5aecf0a 100644
---- a/include/rules.make
-+++ b/include/rules.make
-@@ -1,8 +1,7 @@
- CC ?= gcc
-
--CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
--#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
--LDFLAGS=-Wl,--gc-sections
-+CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
-+LDFLAGS += -Wl,--gc-sections
-
- all: $(OBJS)
-
diff --git a/flx/wdd/wdd-0.1.34-r2.ebuild b/flx/wdd/wdd-0.1.35.ebuild
index f2ac746d..3849fb0c 100644
--- a/flx/wdd/wdd-0.1.34-r2.ebuild
+++ b/flx/wdd/wdd-0.1.35.ebuild
@@ -18,10 +18,8 @@ IUSE=""
src_prepare () {
default
- epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
- epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
- epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
- epatch "${FILESDIR}/${PV}-warning-cast.diff"
+ epatch "${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch"
+ epatch "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
tc-export CC
}
diff --git a/flx/wdd/wdd-9999.ebuild b/flx/wdd/wdd-9999.ebuild
index ec7df6fa..5064b5f9 100644
--- a/flx/wdd/wdd-9999.ebuild
+++ b/flx/wdd/wdd-9999.ebuild
@@ -17,8 +17,8 @@ IUSE=""
src_prepare () {
default
- epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
- epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
+ epatch "${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch"
+ epatch "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
tc-export CC
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:23:00 +0000