From 6f3d750400120c496a2ee8d510f86c796f03c4c2 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Wed, 7 Sep 2016 22:20:10 +0100 Subject: flx/remount: Version bump Package-Manager: portage-2.2.28 RepoMan-Options: --force --- flx/remount/Manifest | 15 +-- flx/remount/files/0.1.34-remove-strip-diet.diff | 61 --------- .../files/0.1.34-respect-CFLAGS-LDFLAGS.diff | 15 --- flx/remount/files/0.1.34-warning-cast.diff | 23 ---- .../files/0.1.34-warning-implicit-declaration.diff | 11 -- .../0.1.35-MEDIUM-Remove-strip-and-uclibc.patch | 149 +++++++++++++++++++++ .../0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch | 56 ++++++++ .../9999-MEDIUM-Remove-strip-and-uclibc.patch | 149 +++++++++++++++++++++ .../9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch | 56 ++++++++ flx/remount/files/9999-remove-strip-diet.diff | 45 ------- flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff | 24 ---- flx/remount/files/9999-warning-cast.diff | 23 ---- flx/remount/remount-0.1.34.ebuild | 36 ----- flx/remount/remount-0.1.35.ebuild | 34 +++++ flx/remount/remount-9999.ebuild | 5 +- 15 files changed, 452 insertions(+), 250 deletions(-) delete mode 100644 flx/remount/files/0.1.34-remove-strip-diet.diff delete mode 100644 flx/remount/files/0.1.34-respect-CFLAGS-LDFLAGS.diff delete mode 100644 flx/remount/files/0.1.34-warning-cast.diff delete mode 100644 flx/remount/files/0.1.34-warning-implicit-declaration.diff create mode 100644 flx/remount/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch create mode 100644 flx/remount/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch create mode 100644 flx/remount/files/9999-MEDIUM-Remove-strip-and-uclibc.patch create mode 100644 flx/remount/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch delete mode 100644 flx/remount/files/9999-remove-strip-diet.diff delete mode 100644 flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff delete mode 100644 flx/remount/files/9999-warning-cast.diff delete mode 100644 flx/remount/remount-0.1.34.ebuild create mode 100644 flx/remount/remount-0.1.35.ebuild (limited to 'flx') diff --git a/flx/remount/Manifest b/flx/remount/Manifest index c228ba2d..73a76333 100644 --- a/flx/remount/Manifest +++ b/flx/remount/Manifest @@ -1,10 +1,7 @@ -AUX 0.1.34-remove-strip-diet.diff 1924 SHA256 b870b2d12347d2ec27bd060d72c997b3abe67fc47b5c27cd597510c69b92ffaa WHIRLPOOL cd6eda3b5770fc3cc585372ada7ce0c0d57ebbcfbc69f72fa0d218cc16cc021438ea11ac444464290308b73dd0c1648ec16fbce5f736c0ea1374304a894e18ea -AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2 -AUX 0.1.34-warning-cast.diff 550 SHA256 49050466db1280ad8a3e9c3c0c56e0ac8623d5fd3f8e00577ce9341f49e6992f WHIRLPOOL fd383522d153d24edf224ae129683a463c187603b924c571c609dd069fb600cf93d593429d855b2ef5ebf6fc2f53e287d332a7de63c2d4124b5667fe9403c709 -AUX 0.1.34-warning-implicit-declaration.diff 292 SHA256 db1cd3f07b6a0bad1a197d231832d01fab49f2237384feea076e7fc613254d59 WHIRLPOOL c76157034e00854d26bda86684c167677cad9a04f09d84112079ceac946359329ee89c04dab04cfc6569204509e85b2f810b7c4d435a9d110ce55716a0177037 -AUX 9999-remove-strip-diet.diff 1475 SHA256 90dfb592c73c7f1b0e8608418af5bcd829577c7b50cf676c4816990d77ef26c5 WHIRLPOOL 26b41d73386121f0c6273bd5d05da73814a0678e899137126f4c696dd0faf319fed81b7e50acd30ea2a0d4d90028482fa61ac2b4225282d9650693113286406a -AUX 9999-respect-CFLAGS-LDFLAGS.diff 768 SHA256 0ae2ca40da7bedf0d2d64e05ae7d5ad0aa2e970a3334d842e8ff9fe4d172fd2a WHIRLPOOL 1c0e3236aee5ce3eb92b0f4c389ec97c167c73aeab4fe3c3b853a0009ce376fa58aedb372224054f41af04b33748f15f00e11da70f5a08e6ba5d5523ae318064 -AUX 9999-warning-cast.diff 550 SHA256 49050466db1280ad8a3e9c3c0c56e0ac8623d5fd3f8e00577ce9341f49e6992f WHIRLPOOL fd383522d153d24edf224ae129683a463c187603b924c571c609dd069fb600cf93d593429d855b2ef5ebf6fc2f53e287d332a7de63c2d4124b5667fe9403c709 -EBUILD remount-0.1.34.ebuild 761 SHA256 fd7c38a793812a9a8579ab738bb4a6ea77937b17d71d5bf8bc6154af024cbabc WHIRLPOOL 53ab89001ade0ff7b8df7d65575f75c095ff12235913485df30b52fc3240d8d02bf4113748f0f7901c8136a6dd79944ebeeeddb1f63b082bb1e6bca683af2ba4 -EBUILD remount-9999.ebuild 669 SHA256 a5a56f6595ffc6240733ca6d0fe1942c983f556cc57a663a3010a6df59721e78 WHIRLPOOL e985b6f3c48eeacb62c498528696f7d9b5be701dad8517ff629b63f752c2bd652375f34119a687790ad8afd563cd9674b3c8e405bf79d31e3147eb33182d9975 +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 +EBUILD remount-0.1.35.ebuild 679 SHA256 f6121cc38cb510d732977d649c14605443b1d904fb78032eca766a8742728b35 WHIRLPOOL 8332db98e40eb49646a82e1f439556693c4dcf2e651a5afb3f8bebc3617adbe86db452598e648f0df38d181f884127e99690f49033f6b71527626a97f77a4903 +EBUILD remount-9999.ebuild 649 SHA256 0a811befd2a3c5d0be4d5781a43227684a6e2bc13f9d0f2aedc7f3816458d1d9 WHIRLPOOL 651333691648a0cdfd3f0bbeaa26a00be509efa902767cef131e2b538285bcd146fc61358953c95460d63fef406c27d97b3f0c3c5a04c862b14c6dea32d1c9f5 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b diff --git a/flx/remount/files/0.1.34-remove-strip-diet.diff b/flx/remount/files/0.1.34-remove-strip-diet.diff deleted file mode 100644 index 414295d0..00000000 --- a/flx/remount/files/0.1.34-remove-strip-diet.diff +++ /dev/null @@ -1,61 +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..8350b33 100644 ---- a/wd/Makefile -+++ b/wd/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/remount/Makefile b/remount/Makefile -index 740f38f..3887b5f 100644 ---- a/remount/Makefile -+++ b/remount/Makefile -@@ -4,9 +4,3 @@ CFLAGS+=-fomit-frame-pointer - - remountw : remountr - ln -s $^ $@ -- --%: %.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/remount/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/remount/files/0.1.34-respect-CFLAGS-LDFLAGS.diff deleted file mode 100644 index 8ac81836..00000000 --- a/flx/remount/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/remount/files/0.1.34-warning-cast.diff b/flx/remount/files/0.1.34-warning-cast.diff deleted file mode 100644 index 97e86393..00000000 --- a/flx/remount/files/0.1.34-warning-cast.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/remount/remountr.c b/remount/remountr.c -index 2a38f22..13c270d 100644 ---- a/remount/remountr.c -+++ b/remount/remountr.c -@@ -12,15 +12,15 @@ int main (int argc, char **argv) { - char *flag, *mntpnt; - - if (argv[0][strlen(argv[0])-1] == 'w') -- flag = wo_str; -+ flag = (char *)wo_str; - else -- flag = ro_str; -+ flag = (char *)ro_str; - - setreuid(0, 0); - if (argc > 1) - mntpnt = argv[1]; - else -- mntpnt = slash_str; -+ mntpnt = (char *)slash_str; - - return execl(mount_str, mount_str, flag, remount_str, mntpnt, NULL); - } diff --git a/flx/remount/files/0.1.34-warning-implicit-declaration.diff b/flx/remount/files/0.1.34-warning-implicit-declaration.diff deleted file mode 100644 index ac469e99..00000000 --- a/flx/remount/files/0.1.34-warning-implicit-declaration.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/remount/remountr.c b/remount/remountr.c -index f45c39a..2a38f22 100644 ---- a/remount/remountr.c -+++ b/remount/remountr.c -@@ -1,4 +1,6 @@ - #include -+#include -+#include - - const char mount_str[] = "/bin/mount"; - const char remount_str[] = "remount"; diff --git a/flx/remount/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch b/flx/remount/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch new file mode 100644 index 00000000..6ffe6b44 --- /dev/null +++ b/flx/remount/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 +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/remount/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/remount/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch new file mode 100644 index 00000000..dec2fc8d --- /dev/null +++ b/flx/remount/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 +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/remount/files/9999-MEDIUM-Remove-strip-and-uclibc.patch b/flx/remount/files/9999-MEDIUM-Remove-strip-and-uclibc.patch new file mode 100644 index 00000000..6ffe6b44 --- /dev/null +++ b/flx/remount/files/9999-MEDIUM-Remove-strip-and-uclibc.patch @@ -0,0 +1,149 @@ +From caa62e8ba16c340aafd45375ec99f48261e62abf Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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/remount/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/remount/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch new file mode 100644 index 00000000..dec2fc8d --- /dev/null +++ b/flx/remount/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch @@ -0,0 +1,56 @@ +From 25a9b5d4cd1b57c81e697ff7e54bf9121e8bbfa4 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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/remount/files/9999-remove-strip-diet.diff b/flx/remount/files/9999-remove-strip-diet.diff deleted file mode 100644 index ffbbb0f5..00000000 --- a/flx/remount/files/9999-remove-strip-diet.diff +++ /dev/null @@ -1,45 +0,0 @@ -From e0fa5f0e5e772c91bd38be344f9d8162ed913da8 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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/remount/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff deleted file mode 100644 index eee82589..00000000 --- a/flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff +++ /dev/null @@ -1,24 +0,0 @@ -From fec67f5e0511469c50bfdd984ab9f3c5399dacad Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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/remount/files/9999-warning-cast.diff b/flx/remount/files/9999-warning-cast.diff deleted file mode 100644 index 97e86393..00000000 --- a/flx/remount/files/9999-warning-cast.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/remount/remountr.c b/remount/remountr.c -index 2a38f22..13c270d 100644 ---- a/remount/remountr.c -+++ b/remount/remountr.c -@@ -12,15 +12,15 @@ int main (int argc, char **argv) { - char *flag, *mntpnt; - - if (argv[0][strlen(argv[0])-1] == 'w') -- flag = wo_str; -+ flag = (char *)wo_str; - else -- flag = ro_str; -+ flag = (char *)ro_str; - - setreuid(0, 0); - if (argc > 1) - mntpnt = argv[1]; - else -- mntpnt = slash_str; -+ mntpnt = (char *)slash_str; - - return execl(mount_str, mount_str, flag, remount_str, mntpnt, NULL); - } diff --git a/flx/remount/remount-0.1.34.ebuild b/flx/remount/remount-0.1.34.ebuild deleted file mode 100644 index 4fe5b21d..00000000 --- a/flx/remount/remount-0.1.34.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit git-r3 toolchain-funcs eutils - -DESCRIPTION="Formilux Tools" -HOMEPAGE="http://git.formilux.org/?p=dist/src/flxutils.git" -EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" -EGIT_COMMIT="v${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -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" - - tc-export CC -} - -src_compile () { - emake -C remount -} - -src_install () { - dobin remount/remountr - dobin remount/remountw -} diff --git a/flx/remount/remount-0.1.35.ebuild b/flx/remount/remount-0.1.35.ebuild new file mode 100644 index 00000000..56456233 --- /dev/null +++ b/flx/remount/remount-0.1.35.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit git-r3 toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://git.formilux.org/?p=dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +src_prepare () { + default + + epatch "${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch" + epatch "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch" + + tc-export CC +} + +src_compile () { + emake -C remount +} + +src_install () { + dobin remount/remountr + dobin remount/remountw +} diff --git a/flx/remount/remount-9999.ebuild b/flx/remount/remount-9999.ebuild index 7ed8e034..0864d8ae 100644 --- a/flx/remount/remount-9999.ebuild +++ b/flx/remount/remount-9999.ebuild @@ -17,9 +17,8 @@ IUSE="" src_prepare () { default - epatch "${FILESDIR}/${PV}-remove-strip-diet.diff" - epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.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 } -- cgit v1.2.3