summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flx/flx/Manifest12
-rw-r--r--flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff15
-rw-r--r--flx/flx/files/0.1.34-warning-cast.diff255
-rw-r--r--flx/flx/files/0.1.34-warning-implicit-declaration.diff58
-rw-r--r--flx/flx/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch149
-rw-r--r--flx/flx/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch56
-rw-r--r--flx/flx/files/9999-MEDIUM-Remove-strip-and-uclibc.patch149
-rw-r--r--flx/flx/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch56
-rw-r--r--flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff27
-rw-r--r--flx/flx/flx-0.1.35.ebuild (renamed from flx/flx/flx-0.1.34.ebuild)4
-rw-r--r--flx/flx/flx-9999.ebuild3
11 files changed, 420 insertions, 364 deletions
diff --git a/flx/flx/Manifest b/flx/flx/Manifest
index fa34e104..64754013 100644
--- a/flx/flx/Manifest
+++ b/flx/flx/Manifest
@@ -1,7 +1,7 @@
-AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55
-AUX 0.1.34-warning-cast.diff 9513 SHA256 4bb4801f530869cb5e1bfecfa5cb007b4b5e5b1de1e25404f1c107135025a165 WHIRLPOOL 1cb86d258df028e7c46f10d8a5866f32565e359f1cfc644cadd46478de140b3f3ebc1c42a764056ca301c27b519907290ca77e7a277f0064cffba9d391b5d3a1
-AUX 0.1.34-warning-implicit-declaration.diff 1147 SHA256 610c41f21175e369bfe1185b59b875744506b4d5ec2fcdd529f7d3beb8d64d29 WHIRLPOOL 98483417447ab1a1d61facc32f65af5bf4ec70a99983592d4088d18f62840a5e35b9d31b95451a3f835b2eb3d40b12928ec52205f25bf7ae830867ffa46fecc4
-AUX 9999-respect-CFLAGS-LDFLAGS.diff 858 SHA256 9acbe7eaf5e8900153c78c891fd698fcf0b98a23d9a09335f3df43cb8e82c9e8 WHIRLPOOL 5558622a3241f9a8a9fc5d5215f652cd6b0481ca29df7c19e753188fd97ca1ac495965e9394f3e46437b3360b10acf3b14be181d12d37fb55f76ba061313039e
-EBUILD flx-0.1.34.ebuild 738 SHA256 4364104811a2dda858f7ed5daab84254bd1e97bbe0dfa839d52e6918874a6311 WHIRLPOOL 87365476ecf85a33c463041c1de0e0530d401e949ce8ed456a1bf62d07ef284b79fa0740e9e5c615774c10b13d22957956010545db2e3c44d8a06d29da2f843a
-EBUILD flx-9999.ebuild 646 SHA256 80f0999840aceed3f99da662499bc75c663c69d46156ceead15f0d16f44ce2e6 WHIRLPOOL 0c85c8e87640945afdf5f1769f122b1da01436e5b461f9c20378534aab28098a12e5364967de0443202e3a204807ad34e6da90ba9d4dd2f9876709d00e713cd0
+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 flx-0.1.35.ebuild 753 SHA256 ac475bec664d02c648a3388dc8b4d2803d457664cf8e49c734a700e193c93180 WHIRLPOOL 3fae558a3898e9fcfe1cfc46ca1b18b9e6cc4a1f57c7c2e6654c89a93b8d4f50d402a59d8f0bb99e997ed8999e99ae4816f5ff70e68c3a9acc1e0451c85cfb31
+EBUILD flx-9999.ebuild 723 SHA256 e4ecc449f2a0f598a2fe62fe61240b30963699d75594ac6efea944bb9514e312 WHIRLPOOL a60f95e16d7141c2196d8790da4921044f84856dad8b29a6e5bd8d38495489d6b56f7e4bceb1b583b638dac40cf5661936d0eff459fd845c70ee04ba34baba07
MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index 54f85b98..00000000
--- a/flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/flx/Makefile b/flx/Makefile
-index 6bee331..7cb9fd2 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
--CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
--LDFLAGS=-L. -Wl,--gc-sections
-+CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
-+LDFLAGS += -Wl,--gc-sections
-
- all: $(NAME)
-
diff --git a/flx/flx/files/0.1.34-warning-cast.diff b/flx/flx/files/0.1.34-warning-cast.diff
deleted file mode 100644
index 9c45d9af..00000000
--- a/flx/flx/files/0.1.34-warning-cast.diff
+++ /dev/null
@@ -1,255 +0,0 @@
-diff --git a/flx/check.c b/flx/check.c
-index 9589c5e..3f3e26a 100644
---- a/flx/check.c
-+++ b/flx/check.c
-@@ -384,25 +384,25 @@ t_file_diff *fct_free_diff_desc(void *data, t_file_diff *desc) {
-
- char *build_diff_line(char *path, char *filename, t_file_diff *info) {
- static char tmp[BUFFER_LENGTH];
-- static char opath[BUFFER_LENGTH];
-+ static unsigned char opath[BUFFER_LENGTH];
- char *s = tmp;
-- char *ppath;
-+ unsigned char *ppath;
-
- *s = 0;
- if (info->diff == 0) {
- ppath = opath;
-- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str);
-- if (Rewrite_Src1) ppath += sprintf(ppath, "%s/", Rewrite_Src1);
-- sprintf(ppath, "%s", path);
-+ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str);
-+ if (Rewrite_Src1) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1);
-+ sprintf((char *)ppath, "%s", path);
- s += sprintf(s, "= %s", build_line(opath, filename, info->src1));
- return (tmp);
- }
-
- if (info->src1 && IS(Options, SHOW_OLD)) {
- ppath = opath;
-- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str);
-- if (Rewrite_Src1) ppath += sprintf(ppath, "%s/", Rewrite_Src1);
-- sprintf(ppath, "%s", path);
-+ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str);
-+ if (Rewrite_Src1) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1);
-+ sprintf((char *)ppath, "%s", path);
-
- if (!info->src2)
- s += sprintf(s, "- %s", build_line(opath, filename, info->src1));
-@@ -412,9 +412,9 @@ char *build_diff_line(char *path, char *filename, t_file_diff *info) {
- }
- if (info->src2 && IS(Options, SHOW_NEW)) {
- ppath = opath;
-- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str);
-- if (Rewrite_Src2) ppath += sprintf(ppath, "%s/", Rewrite_Src2);
-- sprintf(ppath, "%s", path);
-+ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str);
-+ if (Rewrite_Src2) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src2);
-+ sprintf((char *)ppath, "%s", path);
-
- if (!info->src1)
- s += sprintf(s, "+ %s", build_line(opath, filename, info->src2));
-diff --git a/flx/fct1.c b/flx/fct1.c
-index c074a7a..e9ade63 100644
---- a/flx/fct1.c
-+++ b/flx/fct1.c
-@@ -38,14 +38,14 @@ t_file_desc *complete_info_from_file(char *path, t_file_desc *desc, int flag) {
- desc->md5 = checksum_md5_from_file(path);
- else if (S_ISLNK(stat.st_mode) && !desc->link) {
- /* get link and md5 associed */
-- char temp[BUFFER_LENGTH];
-+ unsigned char temp[BUFFER_LENGTH];
- int l;
-
-- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) {
-+ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) {
- PFERROR("readlink(%s)", path);
- } else {
- temp[l] = 0;
-- desc->link = strdup(temp);
-+ desc->link = (unsigned char *)strdup((char *)temp);
- desc->md5 = checksum_md5_from_data(temp, l);
- }
- }
-@@ -81,7 +81,7 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path)
- diff |= DIFF_TIME; /* modification times diff */
- }
- if (DIFF(LINK) && S_ISLNK(f1->stat.st_mode) && S_ISLNK(f2->stat.st_mode)) {
-- char temp[BUFFER_LENGTH];
-+ unsigned char temp[BUFFER_LENGTH];
- int l;
-
- if (f1->link != f2->link) {
-@@ -89,18 +89,18 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path)
- if (!path) diff |= DIFF_LINK;
- else {
- /* rebuild link and link's checksum */
-- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) {
-+ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) {
- PFERROR("readlink(%s)",path);
- } else {
- temp[l] = 0;
-- if (!f1->link) f1->link = strdup(temp);
-- if (!f2->link) f2->link = strdup(temp);
-+ if (!f1->link) f1->link = (unsigned char *)strdup((char *)temp);
-+ if (!f2->link) f2->link = (unsigned char *)strdup((char *)temp);
- if (!f1->md5) f1->md5 = checksum_md5_from_data(temp, l);
- if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l);
- }
- }
- }
-- if (!(diff & DIFF_LINK) && strcmp(f1->link, f2->link))
-+ if (!(diff & DIFF_LINK) && strcmp((char *)f1->link, (char *)f2->link))
- diff |= DIFF_LINK; /* links differ */
- }
- }
-@@ -223,10 +223,10 @@ int browse_over_path(char *path, PROTO_FS(*fct), void *data) {
-
-
- /* build an MD5 checksum from data in file */
--char *checksum_md5_from_file(char *file) {
-+unsigned char *checksum_md5_from_file(char *file) {
- int fd;
- ssize_t size;
-- char *checksum_md5 = NULL, blk[BUFFER_LENGTH];
-+ unsigned char *checksum_md5 = NULL, blk[BUFFER_LENGTH];
- MD5_CTX md5_ctx;
-
- if ((fd = open(file, O_RDONLY)) < 0 ) {
-@@ -247,8 +247,8 @@ char *checksum_md5_from_file(char *file) {
- }
-
- /* build an MD5 checksum from a string */
--char *checksum_md5_from_data(char *data, int len) {
-- char *checksum_md5 = 0;
-+unsigned char *checksum_md5_from_data(unsigned char *data, int len) {
-+ unsigned char *checksum_md5 = 0;
- MD5_CTX md5_ctx;
-
- MD5_Init(&md5_ctx);
-@@ -310,7 +310,7 @@ int mkdir_with_parent(char *pathname, mode_t mode) {
- }
-
- /* return formatted info into a static string */
--char *build_line(char *path, char *filename, t_file_desc *info) {
-+char *build_line(unsigned char *path, char *filename, t_file_desc *info) {
- struct stat *st = &(info->stat);
- static char blk[BUFFER_LENGTH], tmp[64];
- int s;
-diff --git a/flx/flx.h b/flx/flx.h
-index 3315ded..7030102 100644
---- a/flx/flx.h
-+++ b/flx/flx.h
-@@ -216,11 +216,11 @@ struct s_dtree {
-
-
- extern int browse_over_path(char *path, void *(*fct)(), void *data) ;
--extern char *checksum_md5_from_file(char *file) ;
--extern char *checksum_md5_from_data(char *data, int len) ;
-+extern unsigned char *checksum_md5_from_file(char *file) ;
-+extern unsigned char *checksum_md5_from_data(unsigned char *data, int len) ;
- extern char *end_field(char *line) ;
- extern int mkdir_with_parent(char *pathname, mode_t mode) ;
--extern char *build_line(char *path, char *filename, t_file_desc *info) ;
-+extern char *build_line(unsigned char *path, char *filename, t_file_desc *info) ;
- extern char *show_filename(char *path, char *filename, t_file_desc *info) ;
- extern void dump_tree(t_ft *tree) ;
- extern int dump_diff_tree(t_dtree *tree);
-diff --git a/flx/input_file.c b/flx/input_file.c
-index ec50c02..5dc8e80 100644
---- a/flx/input_file.c
-+++ b/flx/input_file.c
-@@ -132,7 +132,7 @@ t_file_desc *fill_from_signfs_line(char **tab, char **rpath, t_file_desc **desc)
- if (rpath) *rpath = p1;
- break;
- case 8: /* link */
-- (*desc)->link = strdup(p1);
-+ (*desc)->link = (unsigned char *)strdup(p1);
- break;
- }
- }
-diff --git a/flx/input_fs.c b/flx/input_fs.c
-index e64f9da..3a35759 100644
---- a/flx/input_fs.c
-+++ b/flx/input_fs.c
-@@ -40,14 +40,14 @@ static t_file_desc *complete_info_from_fs(char *path, t_file_desc *desc) {
- desc->md5 = checksum_md5_from_file(path);
- else if (S_ISLNK(stat.st_mode) && !desc->link) {
- /* get link and md5 associed */
-- char temp[BUFFER_LENGTH];
-+ unsigned char temp[BUFFER_LENGTH];
- int l;
-
-- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) {
-+ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) {
- PFERROR("readlink(%s)", path);
- } else {
- temp[l] = 0;
-- desc->link = strdup(temp);
-+ desc->link = (unsigned char *)strdup((char *)temp);
- desc->md5 = checksum_md5_from_data(temp, l);
- }
- }
-diff --git a/flx/utils.c b/flx/utils.c
-index 16aaad2..090e314 100644
---- a/flx/utils.c
-+++ b/flx/utils.c
-@@ -10,7 +10,7 @@
-
- #include "utils.h"
-
--static char bigbuffer[BUFFLEN];
-+static unsigned char bigbuffer[BUFFLEN];
-
- POOL_INIT(p2void);
-
-@@ -121,8 +121,8 @@ char *backslashed_strmchr(char *s, char *mc) {
- }
-
- /* return the string with characters 'toback' backslashed */
--char *backslashed_str(char *s, char *toback) {
-- char *pbuff = bigbuffer;
-+unsigned char *backslashed_str(char *s, char *toback) {
-+ unsigned char *pbuff = bigbuffer;
- int len = 0;
-
- while (*s && len < (BUFFLEN-1)) {
-@@ -136,8 +136,8 @@ char *backslashed_str(char *s, char *toback) {
- }
-
- /* escape unprintable char with its hexadecimal value (url encode form) */
--char *escape_str(char *s) {
-- char *pbuff = bigbuffer;
-+unsigned char *escape_str(unsigned char *s) {
-+ unsigned char *pbuff = bigbuffer;
- int len = 0;
-
- while (*s && len < (BUFFLEN-4)) {
-@@ -158,8 +158,8 @@ char *escape_str(char *s) {
- }
-
- /* unescape string from %xx string form */
--char *unescape_str(char *s) {
-- char *pbuff = bigbuffer;
-+unsigned char *unescape_str(char *s) {
-+ unsigned char *pbuff = bigbuffer;
- int len = 0;
-
- while (*s && len < (BUFFLEN-1)) {
-diff --git a/flx/utils.h b/flx/utils.h
-index 984fc7a..707e620 100644
---- a/flx/utils.h
-+++ b/flx/utils.h
-@@ -186,9 +186,9 @@ int fatal_error(char *,...);
- int pferror(char *,...);
- char *backslashed_strchr(char *s, char c);
- char *backslashed_strmchr(char *s, char *mc);
--char *backslashed_str(char *, char *toback);
-+unsigned char *backslashed_str(char *, char *toback);
- void *push_str_sorted(void *ptr, char *str);
--char *escape_str(char *s);
--char *unescape_str(char *s);
-+unsigned char *escape_str(unsigned char *s);
-+unsigned char *unescape_str(char *s);
-
- #endif /* __UTILS_H__ */
diff --git a/flx/flx/files/0.1.34-warning-implicit-declaration.diff b/flx/flx/files/0.1.34-warning-implicit-declaration.diff
deleted file mode 100644
index 6cbc45bf..00000000
--- a/flx/flx/files/0.1.34-warning-implicit-declaration.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/flx/arg.c b/flx/arg.c
-index d82d2d1..8b7c112 100644
---- a/flx/arg.c
-+++ b/flx/arg.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <stdlib.h>
-
- #include "flx.h"
- #include "arg.h"
-diff --git a/flx/check.c b/flx/check.c
-index 0a425c3..9589c5e 100644
---- a/flx/check.c
-+++ b/flx/check.c
-@@ -23,6 +23,7 @@
-
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
-
- #include "flx.h"
- #include "check.h"
-diff --git a/flx/input.c b/flx/input.c
-index 182fa83..5e9ecbc 100644
---- a/flx/input.c
-+++ b/flx/input.c
-@@ -1,4 +1,6 @@
- #include <string.h>
-+#include <stdlib.h>
-+
- #include "utils.h"
- #include "source_type.h"
- #include "input.h"
-diff --git a/flx/output.c b/flx/output.c
-index 7898fc8..801bccc 100644
---- a/flx/output.c
-+++ b/flx/output.c
-@@ -1,4 +1,6 @@
- #include <string.h>
-+#include <stdlib.h>
-+
- #include "utils.h"
- #include "flx.h"
- #include "output.h"
-diff --git a/flx/utils.c b/flx/utils.c
-index 6b0272a..16aaad2 100644
---- a/flx/utils.c
-+++ b/flx/utils.c
-@@ -6,6 +6,7 @@
- #include <fcntl.h>
- #include <stdarg.h>
- #include <ctype.h>
-+#include <stdlib.h>
-
- #include "utils.h"
-
diff --git a/flx/flx/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch b/flx/flx/files/0.1.35-MEDIUM-Remove-strip-and-uclibc.patch
new file mode 100644
index 00000000..6ffe6b44
--- /dev/null
+++ b/flx/flx/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/flx/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/flx/files/0.1.35-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
new file mode 100644
index 00000000..dec2fc8d
--- /dev/null
+++ b/flx/flx/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/flx/files/9999-MEDIUM-Remove-strip-and-uclibc.patch b/flx/flx/files/9999-MEDIUM-Remove-strip-and-uclibc.patch
new file mode 100644
index 00000000..6ffe6b44
--- /dev/null
+++ b/flx/flx/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/flx/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/flx/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
new file mode 100644
index 00000000..dec2fc8d
--- /dev/null
+++ b/flx/flx/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/flx/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index efe73339..00000000
--- a/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2932a6d7bfc0d1bd7fdb303c5594010424b33378 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon May 27 22:36:39 2013 +0200
-Subject: [PATCH] MEDIUM: Respect CFLAGS and LDFLAGS
-
----
- flx/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/flx/Makefile b/flx/Makefile
-index 68ecb4c..274cd94 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)
-
---
-2.7.3
-
diff --git a/flx/flx/flx-0.1.34.ebuild b/flx/flx/flx-0.1.35.ebuild
index ad8fb026..24eeb804 100644
--- a/flx/flx/flx-0.1.34.ebuild
+++ b/flx/flx/flx-0.1.35.ebuild
@@ -21,8 +21,8 @@ RDEPEND="${DEPEND}"
src_prepare () {
default
- epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
- epatch "${FILESDIR}/${PV}-warning-implicit-declaration.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/flx/flx-9999.ebuild b/flx/flx/flx-9999.ebuild
index fbc52bc0..32616317 100644
--- a/flx/flx/flx-9999.ebuild
+++ b/flx/flx/flx-9999.ebuild
@@ -20,7 +20,8 @@ RDEPEND="${DEPEND}"
src_prepare () {
default
- 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:25:12 +0000