summaryrefslogtreecommitdiff
path: root/flx/wdd
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2014-01-10 23:35:56 +0100
committerBertrand Jacquin <beber@meleeweb.net>2014-01-10 23:37:49 +0100
commite790f4dfc9044e8dfce1c7d79255e14e91998fe3 (patch)
tree62eee7064d084acae9d8f04b879a6c3fdd273df8 /flx/wdd
parentflx/remount: Update HOMEPAGE, add live ebuild (diff)
downloadportage-e790f4dfc9044e8dfce1c7d79255e14e91998fe3.tar.xz
flx/wdd: Update HOMEPAGE, add live ebuild
Package-Manager: portage-2.2.8
Diffstat (limited to 'flx/wdd')
-rw-r--r--flx/wdd/Manifest7
-rw-r--r--flx/wdd/files/9999-remove-strip-diet.diff50
-rw-r--r--flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff15
-rw-r--r--flx/wdd/files/9999-warning-cast.diff30
-rw-r--r--flx/wdd/files/9999-warning-implicit-declaration.diff14
-rw-r--r--flx/wdd/wdd-0.1.34.ebuild17
-rw-r--r--flx/wdd/wdd-9999.ebuild37
7 files changed, 159 insertions, 11 deletions
diff --git a/flx/wdd/Manifest b/flx/wdd/Manifest
index 4a0bd28c..86dd049d 100644
--- a/flx/wdd/Manifest
+++ b/flx/wdd/Manifest
@@ -2,8 +2,13 @@ AUX 0.1.34-remove-strip-diet.diff 1558 SHA256 16b19327d1c8487f3badefb2c5ad714f02
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 1558 SHA256 16b19327d1c8487f3badefb2c5ad714f020b0fe805aeab2d1e500d61cb2b774b WHIRLPOOL 819dac4e550c13ec6c7ba86bdb17d4525237c3fd1dc8275cbfd1c798b95c3f01bada25b66607ce63d94d56accd7b95d476376aa721dcd8a3275991bc989a067b
+AUX 9999-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
+AUX 9999-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a
+AUX 9999-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9
AUX wdd.confd 63 SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 WHIRLPOOL ff4487a3e0c178de715361eb7be56899d1614e211751b041a529ed9f7d01519d164b67cb0a26c47a129bbeeafccc634f007c50706e67bc19e630e6caf46cd15c
AUX wdd.initd 413 SHA256 41b52446d2b513a945e84a12fc303d2b2c75e1f31c8ce33e1dde23d395947d17 WHIRLPOOL d5dddf3b9dc4eb3ca779eff408861de85fcfd57f2f3f3233d97fb9292a97ecacb6243988b9a73582faeed9084c3f9e595a4ae143dd5d3bed529437bc0b37cde5
-EBUILD wdd-0.1.34.ebuild 816 SHA256 da4fc7e54b900e4673862da399620acbc7f812cd41d548c3f65daa41d448937e WHIRLPOOL 3fcd880f7e6ecd6dc99756d06b227ec28f1e9f9112bd9230310b6650d5deec2f686e17db4a6f5c5b7e5a7fb04416ae9127e7a0964858084312a7a7889e96efe7
+EBUILD wdd-0.1.34.ebuild 820 SHA256 569c0525ef5a8e0a096de760fda0414c8a52f81563020b1b76a81424aaed9591 WHIRLPOOL 772d8f65e13b597613e01a9130d061cd21577b5f0ac38a2f2a096aa4e48aeeecc84a0c3af0f9e5a410e01515049c7f9dfba5074158411fc4bfea450918df6e2d
+EBUILD wdd-9999.ebuild 781 SHA256 ae60fc2eb6bc5d1b8d164eeb175897908edefb4d7d35b26585038389bead5acf WHIRLPOOL 111050de1f7774084f0ddd18505ee487aa6915d96427281258116f15361c667dd027eece6fd65d58004830a8a01a3e7e9888ff56bfaa4d754130efbebf5a6b99
MISC ChangeLog 1314 SHA256 351c87758bc20f3d524049e5a78bdbc5b56d1af5c0ee87a8a77403aaf0cfd711 WHIRLPOOL 4b315f22de59f2a82d4e8abd47ea7101409e0fa87997a00563c51938687fde5ff4cb6936b8294806fd2c5448f00cc2fe00b94faaa70016ad3f20aeec1e7395b1
MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/flx/wdd/files/9999-remove-strip-diet.diff b/flx/wdd/files/9999-remove-strip-diet.diff
new file mode 100644
index 00000000..166a3809
--- /dev/null
+++ b/flx/wdd/files/9999-remove-strip-diet.diff
@@ -0,0 +1,50 @@
+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/9999-respect-CFLAGS-LDFLAGS.diff b/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
new file mode 100644
index 00000000..8ac81836
--- /dev/null
+++ b/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
@@ -0,0 +1,15 @@
+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/9999-warning-cast.diff b/flx/wdd/files/9999-warning-cast.diff
new file mode 100644
index 00000000..c4a1c7b8
--- /dev/null
+++ b/flx/wdd/files/9999-warning-cast.diff
@@ -0,0 +1,30 @@
+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/9999-warning-implicit-declaration.diff b/flx/wdd/files/9999-warning-implicit-declaration.diff
new file mode 100644
index 00000000..8839d1bc
--- /dev/null
+++ b/flx/wdd/files/9999-warning-implicit-declaration.diff
@@ -0,0 +1,14 @@
+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/wdd-0.1.34.ebuild b/flx/wdd/wdd-0.1.34.ebuild
index b19b906e..be479cdc 100644
--- a/flx/wdd/wdd-0.1.34.ebuild
+++ b/flx/wdd/wdd-0.1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,7 +6,7 @@ EAPI=5
inherit git-2 eutils
DESCRIPTION="Formilux Tools"
-HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git"
+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}"
@@ -15,8 +15,7 @@ SLOT="0"
KEYWORDS="amd64 x86 mips arm"
IUSE=""
-src_prepare ()
-{
+src_prepare () {
epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
@@ -25,17 +24,15 @@ src_prepare ()
tc-export CC
}
-src_compile ()
-{
+src_compile () {
emake -C wd
}
-src_install ()
-{
+src_install () {
into /
dosbin wd/wdd
doman wd/wdd.8
- newinitd "${FILESDIR}/wdd.initd" wdd
- newconfd "${FILESDIR}/wdd.confd" wdd
+ newinitd "${FILESDIR}/wdd.initd" "${PN}"
+ newconfd "${FILESDIR}/wdd.confd" "${PN}"
}
diff --git a/flx/wdd/wdd-9999.ebuild b/flx/wdd/wdd-9999.ebuild
new file mode 100644
index 00000000..6b6350cc
--- /dev/null
+++ b/flx/wdd/wdd-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit git-2 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+src_prepare () {
+ 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 wd
+}
+
+src_install () {
+ into /
+ dosbin wd/wdd
+ doman wd/wdd.8
+
+ newinitd "${FILESDIR}/wdd.initd" "${PN}"
+ newconfd "${FILESDIR}/wdd.confd" "${PN}"
+}